From be3def55c8643a8c9b9683f7c826e3601005ada9 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Fri, 23 Oct 2020 17:35:53 +0000 Subject: 2020-10-23T17:30:01Z --- AstroFloyd.html | 16 ++- AstroFloyd.txt | 9 +- AzP.html | 44 +++++-- AzP.txt | 16 ++- Drauthius.html | 16 ++- Drauthius.txt | 9 +- DuPol.html | 50 ++------ DuPol.txt | 29 ++--- FireBurn.html | 46 +++++-- FireBurn.txt | 19 ++- HomeAssistantRepository.html | 66 ++-------- HomeAssistantRepository.txt | 27 +--- R_Overlay.html | 4 +- R_Overlay.txt | 4 +- activehome.html | 20 ++- activehome.txt | 12 +- alexcepoi.html | 24 ++-- alexcepoi.txt | 13 +- aluco.html | 24 ++-- aluco.txt | 13 +- anarchy.html | 24 ++-- anarchy.txt | 13 +- anaximander.html | 28 +++-- anaximander.txt | 17 +-- anders-larsson.html | 4 +- anders-larsson.txt | 2 +- andjscott.html | 4 +- andjscott.txt | 2 +- andrey_utkin.html | 4 +- andrey_utkin.txt | 2 +- andy.html | 34 +++-- andy.txt | 20 +-- anomen.html | 4 +- anomen.txt | 2 +- anyc.html | 4 +- anyc.txt | 2 +- apriluwu.html | 4 +- apriluwu.txt | 2 +- archenroot.html | 4 +- archenroot.txt | 2 +- argent-main.html | 4 +- argent-main.txt | 2 +- arx-libertatis.html | 10 +- arx-libertatis.txt | 4 +- atom.html | 52 ++++---- atom.txt | 5 +- audio-overlay.html | 46 ++++--- audio-overlay.txt | 3 +- average.html | 46 +++---- average.txt | 6 +- awesome.html | 8 +- awesome.txt | 2 +- axs.html | 36 +++--- axs.txt | 17 ++- barnowl.html | 10 +- barnowl.txt | 4 +- barzog-overlay.html | 10 +- barzog-overlay.txt | 4 +- beatussum-overlay.html | 54 ++++---- beatussum-overlay.txt | 5 +- benzene-overlay.html | 54 ++++---- benzene-overlay.txt | 5 +- bes.html | 54 ++++---- bes.txt | 5 +- bezerker.html | 54 ++++---- bezerker.txt | 5 +- bibletime.html | 46 +++---- bibletime.txt | 20 +-- binaryden.html | 58 ++++----- binaryden.txt | 5 - bircoph.html | 58 ++++----- bircoph.txt | 31 +++-- bitcetera.html | 58 ++++----- bitcetera.txt | 5 - bitcoin.html | 58 ++++----- bitcoin.txt | 5 - bleeding-edge.html | 60 ++++----- bleeding-edge.txt | 32 +++-- blender-gentoo-logo.html | 52 +++----- blender-gentoo-logo.txt | 21 +--- bliss-overlay.html | 58 ++++----- bliss-overlay.txt | 5 - bloody.html | 58 ++++----- bloody.txt | 5 - bobwya.html | 58 ++++----- bobwya.txt | 5 - bombo82.html | 58 ++++----- bombo82.txt | 5 - booboo.html | 64 ++++------ booboo.txt | 7 -- brave-overlay.html | 62 ++++----- brave-overlay.txt | 6 - bright.html | 62 ++++----- bright.txt | 6 - brother-overlay.html | 64 ++++------ brother-overlay.txt | 7 -- bubba.html | 62 ++++----- bubba.txt | 6 - bumblebee.html | 66 ++++------ bumblebee.txt | 8 -- buzden.html | 66 ++++------ buzden.txt | 8 -- c2p-overlay.html | 66 ++++------ c2p-overlay.txt | 8 -- calculate.html | 66 ++++------ calculate.txt | 7 -- canutethegreat-overlay.html | 66 ++++------ canutethegreat-overlay.txt | 8 -- causelay.html | 70 ++++------- causelay.txt | 8 -- ceamac.html | 66 ++++------ ceamac.txt | 9 -- cg.html | 68 ++++------ cg.txt | 9 -- chrisadr.html | 66 ++++------ chrisadr.txt | 9 -- chrytoo.html | 66 ++++------ chrytoo.txt | 9 -- chutzpah.html | 64 +++------- chutzpah.txt | 30 ++--- chymeric.html | 66 ++++------ chymeric.txt | 13 +- cj-overlay.html | 68 ++++------ cj-overlay.txt | 11 -- concaveoverlay.html | 68 ++++------ concaveoverlay.txt | 11 -- crocket-overlay.html | 68 ++++------ crocket-overlay.txt | 11 -- crossdev.html | 68 ++++------ crossdev.txt | 11 -- cynede.html | 68 ++++------ cynede.txt | 11 -- dMaggot.html | 72 ++++------- dMaggot.txt | 40 +++--- darkelf.html | 62 ++------- darkelf.txt | 35 ++---- darthgandalf-overlay.html | 68 ++++------ darthgandalf-overlay.txt | 11 -- deadbeef-overlay.html | 70 ++++------- deadbeef-overlay.txt | 13 -- decent-im.html | 68 ++++------ decent-im.txt | 10 -- deepin.html | 68 ++++------ deepin.txt | 12 -- defiance.html | 68 ++++------ defiance.txt | 12 -- delicious-absurdities.html | 68 ++++------ delicious-absurdities.txt | 12 -- deter.html | 70 ++++------- deter.txt | 12 -- dev1990-overlay.html | 72 ++++------- dev1990-overlay.txt | 14 --- devpump-gor.html | 72 ++++------- devpump-gor.txt | 14 --- didactic-duck.html | 72 ++++------- didactic-duck.txt | 14 --- dilfridge.html | 68 ++-------- dilfridge.txt | 35 +----- displacer.html | 68 ++-------- displacer.txt | 35 +----- distros.html | 70 ++++------- distros.txt | 13 -- djc.html | 70 ++++------- djc.txt | 13 -- dlang.html | 70 ++++------- dlang.txt | 13 -- dmchurch.html | 70 ++++------- dmchurch.txt | 13 -- docker.html | 104 ++++++---------- docker.txt | 13 -- dotnet.html | 70 ++++------- dotnet.txt | 13 -- drdim.html | 70 ++++------- drdim.txt | 13 -- dwfreed.html | 74 ++++------- dwfreed.txt | 15 --- dwosky.html | 74 ++++------- dwosky.txt | 15 --- earshark.html | 72 ++++------- earshark.txt | 13 -- eclipse.html | 72 ++++------- eclipse.txt | 11 -- edgets.html | 72 ++++------- edgets.txt | 12 -- eigenlay.html | 72 ++++------- eigenlay.txt | 12 -- einflay.html | 72 ++++------- einflay.txt | 11 -- ejabberd.html | 72 ++++------- ejabberd.txt | 12 -- elementary.html | 72 ++++------- elementary.txt | 12 -- elopez-r-overlay.html | 72 ++++------- elopez-r-overlay.txt | 12 -- emacs.html | 70 ++--------- emacs.txt | 34 +---- enlightenment-live.html | 72 ++++------- enlightenment-live.txt | 12 -- ennui.html | 84 ++++--------- ennui.txt | 22 +--- equaeghe.html | 72 ++++------- equaeghe.txt | 12 -- erayd.html | 72 ++++------- erayd.txt | 12 -- ethereum.html | 72 ++++------- ethereum.txt | 12 -- eugene-bright.html | 72 ++++------- eugene-bright.txt | 12 -- ext-devlibs.html | 46 ++----- ext-devlibs.txt | 13 -- farmboy0.html | 74 ++++------- farmboy0.txt | 13 -- fem-overlay.html | 74 ++++------- fem-overlay.txt | 13 -- ferki.html | 74 ++++------- ferki.txt | 13 -- fidonet.html | 82 +++++------- fidonet.txt | 13 -- fkmclane.html | 80 ++++-------- fkmclane.txt | 14 --- flammie.html | 74 ++++------- flammie.txt | 13 -- flavour.html | 74 ++++------- flavour.txt | 14 --- flewkey-overlay.html | 74 ++++------- flewkey-overlay.txt | 13 -- flightsim.html | 74 ++++------- flightsim.txt | 13 -- floppym.html | 74 ++++------- floppym.txt | 13 -- flow.html | 74 ++++------- flow.txt | 13 -- flussence.html | 74 ++++------- flussence.txt | 13 -- fol4.html | 76 ++++-------- fol4.txt | 14 --- foo-overlay.html | 74 ++++------- foo-overlay.txt | 14 --- fordfrog.html | 74 ++--------- fordfrog.txt | 37 +----- fowlay.html | 74 ++++------- fowlay.txt | 14 --- foxiverlay.html | 74 ++++------- foxiverlay.txt | 14 --- freeswitch.html | 84 +++++-------- freeswitch.txt | 14 --- fritteli.html | 76 ++++-------- fritteli.txt | 15 --- frostyx.html | 80 ++++-------- frostyx.txt | 15 --- frr-gentoo.html | 76 ++++-------- frr-gentoo.txt | 15 --- fusion809.html | 102 ++++++--------- fusion809.txt | 31 ++--- fuverlay.html | 76 ++++-------- fuverlay.txt | 15 --- gamarouns.html | 76 ++++-------- gamarouns.txt | 15 --- gambas-overlay.html | 76 ++++-------- gambas-overlay.txt | 15 --- gamerlay.html | 88 ++++--------- gamerlay.txt | 48 +++---- gcarq.html | 76 ++++-------- gcarq.txt | 15 --- genthree.html | 76 ++++-------- genthree.txt | 15 --- gentoo-clang.html | 76 ++++-------- gentoo-clang.txt | 14 --- gentoo-mate.html | 80 +++--------- gentoo-mate.txt | 38 +----- gentoo-playground.html | 82 ++++-------- gentoo-playground.txt | 15 --- gentoo-zh.html | 76 ++++-------- gentoo-zh.txt | 14 --- gentoo.html | 262 ++++++++++----------------------------- gentoo.txt | 85 ++++++++----- gerislay.html | 82 +++--------- gerislay.txt | 38 +----- gig.html | 76 ++++-------- gig.txt | 14 --- gitlab.html | 82 ++++-------- gitlab.txt | 17 --- glarbs-overlay.html | 82 ++++-------- glarbs-overlay.txt | 17 --- glicOne.html | 92 +++++--------- glicOne.txt | 18 --- gnome-next.html | 84 ++++--------- gnome-next.txt | 18 --- gnome.html | 102 ++++----------- gnome.txt | 54 +++----- gnuradio.html | 84 ++++--------- gnuradio.txt | 18 --- gnustep.html | 94 +++----------- gnustep.txt | 43 +------ gnux32.html | 84 ++++--------- gnux32.txt | 17 --- go-overlay.html | 86 ++++--------- go-overlay.txt | 18 --- godin.html | 88 ++++--------- godin.txt | 19 --- goris.html | 100 +++------------ goris.txt | 46 +------ graaff.html | 100 +++------------ graaff.txt | 46 +------ grub2-themes.html | 112 ++++------------- grub2-themes.txt | 58 +++------ gsview-overlay.html | 88 ++++--------- gsview-overlay.txt | 19 --- guru.html | 118 +++++++----------- guru.txt | 79 +++++------- haarp.html | 88 ++++--------- haarp.txt | 19 --- hamper-overlay.html | 92 ++++---------- hamper-overlay.txt | 21 ---- han.html | 92 ++++---------- han.txt | 21 ---- hangul-typing.html | 92 ++++---------- hangul-typing.txt | 21 ---- haskell.html | 92 ++++---------- haskell.txt | 21 ---- heindsight.html | 92 ++++---------- heindsight.txt | 21 ---- hering-overlay.html | 92 ++++---------- hering-overlay.txt | 21 ---- hexedit-overlay.html | 92 ++++---------- hexedit-overlay.txt | 19 --- hhvm.html | 102 +++++---------- hhvm.txt | 19 --- hibiscus.html | 108 +++------------- hibiscus.txt | 46 +------ holgersson-overlay.html | 92 ++++---------- holgersson-overlay.txt | 19 --- hossie.html | 92 ++++---------- hossie.txt | 19 --- ikelos.html | 108 +++------------- ikelos.txt | 46 +------ imaging.html | 94 ++++---------- imaging.txt | 20 --- index.html | 183 +++++++++++++++++---------- interactive-fiction.html | 94 ++++---------- interactive-fiction.txt | 20 --- ixit.html | 94 ++++---------- ixit.txt | 20 --- jacendi-overlay.html | 94 ++++---------- jacendi-overlay.txt | 20 --- jamesbroadhead.html | 110 ++++------------ jamesbroadhead.txt | 46 +------ java.html | 112 ++++------------- java.txt | 47 +------ jboro-overlay.html | 96 +++++--------- jboro-overlay.txt | 20 --- jkolo.html | 96 +++++--------- jkolo.txt | 20 --- jm-overlay.html | 96 ++++---------- jm-overlay.txt | 21 ---- jmbsvicetto.html | 126 +++++-------------- jmbsvicetto.txt | 63 +++------- jmesmon.html | 110 +++++----------- jmesmon.txt | 21 ---- johnmh.html | 98 ++++----------- johnmh.txt | 22 ---- johu.html | 130 +++++-------------- johu.txt | 65 +++------- jollheef-overlay.html | 104 +++++----------- jollheef-overlay.txt | 22 ---- jorgicio.html | 98 +++++---------- jorgicio.txt | 21 ---- jsteward.html | 96 +++++--------- jsteward.txt | 20 --- junkdrawer.html | 96 +++++--------- junkdrawer.txt | 20 --- k_f.html | 110 ++++++---------- k_f.txt | 20 --- kaa.html | 96 +++++--------- kaa.txt | 20 --- kde.html | 116 ++++------------- kde.txt | 49 +------- keepbot-overlay.html | 98 +++++---------- keepbot-overlay.txt | 21 ---- khoverlay.html | 98 +++++---------- khoverlay.txt | 21 ---- klondike.html | 130 +++++-------------- klondike.txt | 64 +++------- konsolebox.html | 98 +++++---------- konsolebox.txt | 21 ---- lacimarsik-overlay.html | 102 +++++---------- lacimarsik-overlay.txt | 23 ---- lanodanOverlay.html | 98 ++++----------- lanodanOverlay.txt | 22 ---- laurentb.html | 98 ++++----------- laurentb.txt | 22 ---- leechcraft.html | 98 +++++---------- leechcraft.txt | 21 ---- leio.html | 120 +++--------------- leio.txt | 53 +------- leonardohn.html | 100 ++++----------- leonardohn.txt | 23 ---- levenkov.html | 100 ++++----------- levenkov.txt | 23 ---- librepilot.html | 100 ++++----------- librepilot.txt | 23 ---- libressl.html | 134 +++++--------------- libressl.txt | 67 +++------- linux-be.html | 100 ++++----------- linux-be.txt | 23 ---- linuxunderground-overlay.html | 100 ++++----------- linuxunderground-overlay.txt | 23 ---- linxon.html | 100 ++++----------- linxon.txt | 23 ---- lisp.html | 124 +++--------------- lisp.txt | 55 +------- lmiphay.html | 100 ++++----------- lmiphay.txt | 24 ---- lordvan.html | 94 ++++---------- lordvan.txt | 20 --- lto-overlay.html | 84 ++++--------- lto-overlay.txt | 15 --- lua.html | 84 ++++--------- lua.txt | 15 --- luke-jr.html | 84 ++++--------- luke-jr.txt | 15 --- luxifer.html | 84 ++++--------- luxifer.txt | 15 --- lxde-gtk3.html | 90 +++++--------- lxde-gtk3.txt | 15 --- maekke.html | 96 ++++---------- maekke.txt | 26 +--- maggu2810-overlay.html | 80 ++++-------- maggu2810-overlay.txt | 14 --- mate-de-gentoo.html | 80 ++++-------- mate-de-gentoo.txt | 14 --- matrix.html | 82 +++--------- matrix.txt | 36 +----- megacoffee.html | 80 ++++-------- megacoffee.txt | 14 --- menelkir.html | 80 ++++-------- menelkir.txt | 14 --- metahax.html | 80 ++++-------- metahax.txt | 14 --- mgorny.html | 92 ++++---------- mgorny.txt | 25 +--- milos-rs.html | 82 ++++-------- milos-rs.txt | 15 --- miramir.html | 82 ++++-------- miramir.txt | 15 --- mkeyoverlay.html | 82 ++---------- mkeyoverlay.txt | 28 ----- mklich.html | 96 ++++---------- mklich.txt | 49 +++----- mkr-overlay.html | 80 ++++-------- mkr-overlay.txt | 14 --- moaxcp.html | 80 ++++-------- moaxcp.txt | 14 --- moexiami.html | 80 ++++-------- moexiami.txt | 14 --- moltonel.html | 80 ++++-------- moltonel.txt | 14 --- monero.html | 80 ++++-------- monero.txt | 13 -- mozilla.html | 82 +++++------- mozilla.txt | 13 -- mschiff.html | 92 ++++---------- mschiff.txt | 23 +--- multilib-portage.html | 80 ++++-------- multilib-portage.txt | 14 --- musl-clang.html | 72 ++++------- musl-clang.txt | 14 +-- musl.html | 78 +++--------- musl.txt | 33 +---- mv.html | 84 ++++--------- mv.txt | 43 +++---- mva.html | 76 ++++-------- mva.txt | 11 -- myov.html | 74 ++++------- myov.txt | 11 -- mysql.html | 88 ++++--------- mysql.txt | 45 +++---- nelson-graca.html | 76 ++++-------- nelson-graca.txt | 12 -- nest.html | 76 ++++-------- nest.txt | 11 -- nextoo.html | 80 +++++------- nextoo.txt | 12 -- nico.html | 80 +++--------- nico.txt | 33 +---- nix-guix.html | 80 ++++-------- nix-guix.txt | 14 --- np-hardass-overlay.html | 80 ++++-------- np-hardass-overlay.txt | 14 --- nx.html | 92 +++++--------- nx.txt | 46 +++---- oboeverlay.html | 86 +++++-------- oboeverlay.txt | 13 -- observer.html | 78 ++++-------- observer.txt | 13 -- octave.html | 78 ++++-------- octave.txt | 13 -- octopus.html | 78 ++++-------- octopus.txt | 13 -- oddlama.html | 100 ++++----------- oddlama.txt | 26 +--- olifre.html | 80 ++++-------- olifre.txt | 15 --- openclonk.html | 80 ++++-------- openclonk.txt | 14 --- openwrt.html | 80 ++++-------- openwrt.txt | 14 --- optmzr.html | 80 ++++-------- optmzr.txt | 15 --- oubliette.html | 80 ++++-------- oubliette.txt | 15 --- palemoon.html | 78 ++++-------- palemoon.txt | 13 -- palmer.html | 96 +++++--------- palmer.txt | 47 +++---- panther.html | 78 ++++-------- panther.txt | 13 -- pdilung.html | 78 ++++-------- pdilung.txt | 14 +-- pentoo.html | 78 ++++++------ pentoo.txt | 25 ++-- perl-experimental-snapshots.html | 78 ++++-------- perl-experimental-snapshots.txt | 14 +-- perl-experimental.html | 78 ++++-------- perl-experimental.txt | 14 +-- petkovich.html | 76 ++++-------- petkovich.txt | 13 +- pf4public.html | 76 ++++-------- pf4public.txt | 13 +- pg_overlay.html | 76 ++++-------- pg_overlay.txt | 13 +- phackerlay.html | 76 ++++-------- phackerlay.txt | 13 +- pholthaus-overlay.html | 76 ++++-------- pholthaus-overlay.txt | 14 +-- pica-pica.html | 76 ++++-------- pica-pica.txt | 14 +-- picarica-overlay.html | 76 ++++-------- picarica-overlay.txt | 14 +-- pigfoot.html | 84 ++++--------- pigfoot.txt | 41 ++---- piniverlay.html | 76 ++++-------- piniverlay.txt | 14 +-- pinkbyte.html | 76 ++++-------- pinkbyte.txt | 14 +-- pixlra.html | 94 ++++---------- pixlra.txt | 27 +--- pkalin.html | 76 ++++-------- pkalin.txt | 14 +-- plex-overlay.html | 76 +++++------- plex-overlay.txt | 24 ++-- poly-c.html | 130 ++++++++----------- poly-c.txt | 16 +-- posativ.html | 78 ++++-------- posativ.txt | 15 +-- powerman.html | 74 ++++------- powerman.txt | 14 +-- ppfeufer-gentoo-overlay.html | 74 ++++------- ppfeufer-gentoo-overlay.txt | 14 +-- pross.html | 76 ++++-------- pross.txt | 13 +- pyfa.html | 74 ++++------- pyfa.txt | 13 +- python.html | 70 +++-------- python.txt | 33 ++--- qemu-init.html | 74 ++++------- qemu-init.txt | 13 +- qgp.html | 74 ++++------- qgp.txt | 13 +- qownnotes-overlay.html | 74 ++++------- qownnotes-overlay.txt | 13 +- qsx.html | 74 ++++------- qsx.txt | 13 +- qt.html | 84 ++++--------- qt.txt | 22 +--- quarks.html | 72 ++++------- quarks.txt | 12 +- qwin-overlay.html | 76 ++++-------- qwin-overlay.txt | 13 +- rafaelmartins.html | 74 ++++------- rafaelmartins.txt | 13 +- rage.html | 74 ++++------- rage.txt | 13 +- raiagent.html | 70 ++++------- raiagent.txt | 11 +- rasdark.html | 72 ++++------- rasdark.txt | 12 +- raw.html | 74 +++++------ raw.txt | 10 +- rdnetto-overlay.html | 68 ++++------ rdnetto-overlay.txt | 9 +- reagentoo.html | 70 ++++------- reagentoo.txt | 10 +- rebutia.html | 58 +++------ rebutia.txt | 28 ++--- regina-gentoo.html | 68 ++++------ regina-gentoo.txt | 9 +- ricerlay.html | 68 ++++------ ricerlay.txt | 9 +- rich0.html | 68 ++++------ rich0.txt | 9 +- ring-overlay.html | 68 ++++------ ring-overlay.txt | 9 +- rion.html | 68 ++++------ rion.txt | 9 +- riru.html | 70 ++++------- riru.txt | 10 +- robert7k.html | 68 ++++------ robert7k.txt | 11 +- ros-overlay.html | 68 ++++------ ros-overlay.txt | 11 +- roslin.html | 70 ++++------- roslin.txt | 12 +- rpm.html | 68 ++++------ rpm.txt | 11 +- ruby.html | 74 ++++------- ruby.txt | 40 +++--- rukruk.html | 68 ++++------ rukruk.txt | 11 +- rust.html | 68 ++++------ rust.txt | 11 +- sabayon-distro.html | 68 ++++------ sabayon-distro.txt | 11 +- sabayon.html | 68 ++++------ sabayon.txt | 11 +- sage-on-gentoo.html | 70 ++++------- sage-on-gentoo.txt | 12 +- salfter.html | 74 ++++------- salfter.txt | 13 +- sam_c.html | 72 ++++------- sam_c.txt | 13 +- sarnex-overlay.html | 72 ++++------- sarnex-overlay.txt | 13 +- sattvik.html | 68 +++------- sattvik.txt | 34 ++--- science.html | 68 +++------- science.txt | 36 ++---- scrill.html | 72 ++++------- scrill.txt | 13 +- seadep.html | 72 ++++------- seadep.txt | 13 +- seden.html | 72 +++-------- seden.txt | 36 ++---- seeds.html | 76 ++++-------- seeds.txt | 13 +- setkeh.html | 72 ++++------- setkeh.txt | 13 +- sevcsik.html | 72 ++++------- sevcsik.txt | 13 +- sft.html | 72 ++++------- sft.txt | 13 +- sgs.html | 78 ++++-------- sgs.txt | 16 +-- shnurise.html | 168 ++++++++++++------------- shnurise.txt | 28 ++--- sihnon.html | 78 ++++-------- sihnon.txt | 16 +-- simonvanderveldt.html | 76 ++++-------- simonvanderveldt.txt | 15 +-- sinustrom.html | 76 ++++-------- sinustrom.txt | 14 +-- sk-overlay.html | 76 ++++-------- sk-overlay.txt | 14 +-- slonko.html | 74 ++++------- slonko.txt | 13 +- slyfox.html | 74 ++++------- slyfox.txt | 13 +- snapd.html | 72 ++++------- snapd.txt | 12 +- soft.html | 66 +++------- soft.txt | 23 +--- sogo-connector.html | 78 ++++-------- sogo-connector.txt | 42 +++---- soltys.html | 72 ++++------- soltys.txt | 12 +- sorinp.html | 72 ++++------- sorinp.txt | 12 +- sorrow.html | 72 ++++------- sorrow.txt | 12 +- sortsmill.html | 68 +++------- sortsmill.txt | 24 +--- spikyatlinux.html | 72 ++++------- spikyatlinux.txt | 12 +- sping.html | 72 ++++------- sping.txt | 12 +- squeezebox.html | 70 +++-------- squeezebox.txt | 33 ++--- src_prepare-overlay.html | 150 ++++++++++++++-------- src_prepare-overlay.txt | 80 +++++++----- ssnb.html | 84 ++++--------- ssnb.txt | 45 +++---- sspreitz.html | 76 ++++-------- sspreitz.txt | 14 +-- steam-overlay.html | 76 ++++-------- steam-overlay.txt | 14 +-- stefantalpalaru.html | 76 ++++-------- stefantalpalaru.txt | 14 +-- stha09.html | 74 ++++------- stha09.txt | 13 +- stowe-verlay.html | 74 ++++------- stowe-verlay.txt | 13 +- strohel.html | 76 ++++-------- strohel.txt | 14 +-- stuff.html | 72 ++++------- stuff.txt | 13 +- sublime-text.html | 72 ++++------- sublime-text.txt | 12 +- summary.json | 2 +- superposition.html | 76 ++++-------- superposition.txt | 42 +++---- swegener.html | 106 +++++++--------- swegener.txt | 14 +-- tabinol.html | 72 ++++------- tabinol.txt | 12 +- tamiko.html | 70 +++-------- tamiko.txt | 33 ++--- tante.html | 72 ++++------- tante.txt | 12 +- tarantool.html | 70 ++++------- tarantool.txt | 11 +- tastytea.html | 86 +++++-------- tastytea.txt | 22 +--- telans.html | 72 ++++------- telans.txt | 12 +- tengine-overlay.html | 72 ++++------- tengine-overlay.txt | 12 +- tf201.html | 74 ++++------- tf201.txt | 13 +- tgbugs-overlay.html | 74 ++++------- tgbugs-overlay.txt | 14 +-- thabairne.html | 76 ++++-------- thabairne.txt | 13 +- thegreatmcpain.html | 76 ++++-------- thegreatmcpain.txt | 13 +- timboudreau.html | 94 ++++++-------- timboudreau.txt | 14 +-- tmacedo.html | 76 ++++-------- tmacedo.txt | 14 +-- tocaro.html | 74 +++-------- tocaro.txt | 36 ++---- toniz4-overlay.html | 76 ++++-------- toniz4-overlay.txt | 14 +-- toolchain.html | 82 ++++-------- toolchain.txt | 45 +++---- torbrowser.html | 74 ++++------- torbrowser.txt | 13 +- tranquility.html | 86 ++++--------- tranquility.txt | 47 +++---- triquetra.html | 84 ++++--------- triquetra.txt | 41 ++---- trolltoo.html | 78 ++++-------- trolltoo.txt | 15 +-- tryton.html | 54 +++----- tryton.txt | 15 +-- twister.html | 78 ++++-------- twister.txt | 16 +-- twitch153.html | 82 ++++-------- twitch153.txt | 16 +-- ulm.html | 86 +++---------- ulm.txt | 41 ++---- ultrabug.html | 90 +++----------- ultrabug.txt | 43 ++----- unity-gentoo.html | 82 ++++-------- unity-gentoo.txt | 18 +-- usenet-overlay.html | 84 ++++--------- usenet-overlay.txt | 19 +-- vaca.html | 106 ++++++---------- vaca.txt | 19 +-- vampire.html | 84 ++++--------- vampire.txt | 18 +-- vapoursynth.html | 84 ++++--------- vapoursynth.txt | 18 +-- vayerx.html | 84 ++++--------- vayerx.txt | 17 +-- vdr-devel.html | 96 ++++---------- vdr-devel.txt | 52 +++----- vifino-overlay.html | 82 ++++-------- vifino-overlay.txt | 17 +-- vklimovs.html | 82 ++++-------- vklimovs.txt | 17 +-- vmacs.html | 88 +++---------- vmacs.txt | 42 ++----- vortex.html | 82 ++++-------- vortex.txt | 16 +-- vowstar.html | 84 ++++--------- vowstar.txt | 19 +-- voyageur.html | 84 +++++-------- voyageur.txt | 18 +-- waebbl.html | 84 +++++-------- waebbl.txt | 18 +-- wayland-desktop.html | 84 +++++-------- wayland-desktop.txt | 18 +-- wbrana.html | 96 +++++--------- wbrana.txt | 28 +---- wdzierzan.html | 90 +++----------- wdzierzan.txt | 45 ++----- webos.html | 84 +++++-------- webos.txt | 18 +-- weuxel.html | 84 +++++-------- weuxel.txt | 18 +-- what4-java.html | 84 ++++--------- what4-java.txt | 19 +-- wichtounet.html | 84 ++++--------- wichtounet.txt | 19 +-- wine.html | 102 +++++---------- wine.txt | 55 +++----- winny.html | 84 +++++-------- winny.txt | 18 +-- wjn-overlay.html | 86 +++++-------- wjn-overlay.txt | 18 +-- wuodan.html | 84 +++++-------- wuodan.txt | 18 +-- x11.html | 106 +++++----------- x11.txt | 56 +++------ xdch47.html | 86 +++++-------- xdch47.txt | 19 +-- xelnor.html | 88 +++++-------- xelnor.txt | 20 +-- xoreos.html | 86 +++++-------- xoreos.txt | 19 +-- xtreemfs.html | 90 +++++--------- xtreemfs.txt | 19 +-- xwing.html | 116 +++++++++-------- xwing.txt | 48 ++++--- yandex.html | 86 +++++-------- yandex.txt | 19 +-- yarik-overlay.html | 88 +++++-------- yarik-overlay.txt | 19 +-- ycUygB1.html | 88 +++++-------- ycUygB1.txt | 19 +-- yoreek.html | 104 +++++----------- yoreek.txt | 55 +++----- youbroketheinternet.html | 86 +++++-------- youbroketheinternet.txt | 18 +-- yurij-overlay.html | 86 ++++--------- yurij-overlay.txt | 20 +-- yuzu-overlay.html | 86 ++++--------- yuzu-overlay.txt | 20 +-- zerodaysfordays.html | 82 ++++-------- zerodaysfordays.txt | 18 +-- zoobab.html | 86 +++++-------- zoobab.txt | 18 +-- zscheile.html | 82 ++++-------- zscheile.txt | 18 +-- zugaina.html | 86 +++++-------- zugaina.txt | 24 +--- zx2c4.html | 82 ++++-------- zx2c4.txt | 20 +-- zyrenth.html | 82 ++++-------- zyrenth.txt | 20 +-- 850 files changed, 11748 insertions(+), 29193 deletions(-) diff --git a/AstroFloyd.html b/AstroFloyd.html index d4fd4c31ed7c..e275787ae373 100644 --- a/AstroFloyd.html +++ b/AstroFloyd.html @@ -46,14 +46,20 @@ 18
Cloning into '/var/lib/repo-mirror-ci/sync/AstroFloyd'...
- 19
fatal: unable to access 'https://anongit.gentoo.org/git/user/AstroFloyd.git/': The requested URL returned error: 504
+            19
*** syncing AstroFloyd
 

-            20
*** syncing AstroFloyd
+            20
*** synced AstroFloyd
 

-            21
!!! failed syncing AstroFloyd
+            21
 * Sync succeeded
+

+            22
$ git log --format=%ci -1
+

+            23
$ git show -q --pretty=format:%G? HEAD
+

+            24
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 AstroFloyd
+

+            25
 * Cache regenerated successfully
 

-            22
 * Sync failed with 1
-
[FATAL]
 
         
     
diff --git a/AstroFloyd.txt b/AstroFloyd.txt
index 96578b502c58..b3b437d36870 100644
--- a/AstroFloyd.txt
+++ b/AstroFloyd.txt
@@ -16,7 +16,10 @@
  * Adding new repository
 $ pmaint sync AstroFloyd
 Cloning into '/var/lib/repo-mirror-ci/sync/AstroFloyd'...
-fatal: unable to access 'https://anongit.gentoo.org/git/user/AstroFloyd.git/': The requested URL returned error: 504
 *** syncing AstroFloyd
-!!! failed syncing AstroFloyd
- * Sync failed with 1
+*** synced AstroFloyd
+ * Sync succeeded
+$ git log --format=%ci -1
+$ git show -q --pretty=format:%G? HEAD
+$ pmaint regen --use-local-desc --pkg-desc-index -t 1 AstroFloyd
+ * Cache regenerated successfully
diff --git a/AzP.html b/AzP.html
index 6e29708237d9..4804854f749d 100644
--- a/AzP.html
+++ b/AzP.html
@@ -38,25 +38,49 @@
 

             14
 'status': 'unofficial'}
 

-            15
 * Adding new repository
+            15
$ pmaint sync AzP
 

-            16
$ pmaint sync AzP
+            16
warning: Pulling without specifying how to reconcile divergent branches is
 

-            17
Cloning into '/var/lib/repo-mirror-ci/sync/AzP'...
+            17
discouraged. You can squelch this message by running one of the following
 

-            18
*** syncing AzP
+            18
commands sometime before your next pull:
 

-            19
*** synced AzP
+            19
 

-            20
 * Sync succeeded
+            20
  git config pull.rebase false  # merge (the default strategy)
 

-            21
$ git log --format=%ci -1
+            21
  git config pull.rebase true   # rebase
 

-            22
$ git show -q --pretty=format:%G? HEAD
+            22
  git config pull.ff only       # fast-forward only
 

-            23
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 AzP
+            23
 

-            24
 * Cache regenerated successfully
+            24
You can replace "git config" with "git config --global" to set a default
+

+            25
preference for all repositories. You can also pass --rebase, --no-rebase,
+

+            26
or --ff-only on the command line to override the configured default per
+

+            27
invocation.
+

+            28
+

+            29
Already up to date.
+

+            30
*** syncing AzP
+

+            31
*** synced AzP
+

+            32
 * Sync succeeded
+

+            33
$ git log --format=%ci -1
+

+            34
$ git show -q --pretty=format:%G? HEAD
+

+            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 AzP
+

+            36
 * Cache regenerated successfully
 

 
         
diff --git a/AzP.txt b/AzP.txt
index 43453c28a13b..b5d62dfa1f17 100644
--- a/AzP.txt
+++ b/AzP.txt
@@ -12,9 +12,21 @@
             {'type': 'git',
              'uri': 'git+ssh://git@git.gentoo.org/user/AzP.git'}],
  'status': 'unofficial'}
- * Adding new repository
 $ pmaint sync AzP
-Cloning into '/var/lib/repo-mirror-ci/sync/AzP'...
+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.
+
+Already up to date.
 *** syncing AzP
 *** synced AzP
  * Sync succeeded
diff --git a/Drauthius.html b/Drauthius.html
index ae1934f92fc6..24273a849dde 100644
--- a/Drauthius.html
+++ b/Drauthius.html
@@ -46,14 +46,20 @@
 

             18
Cloning into '/var/lib/repo-mirror-ci/sync/Drauthius'...
 

-            19
fatal: unable to access 'https://anongit.gentoo.org/git/repo/user/Drauthius.git/': The requested URL returned error: 504
+            19
*** syncing Drauthius
 

-            20
*** syncing Drauthius
+            20
*** synced Drauthius
 

-            21
!!! failed syncing Drauthius
+            21
 * Sync succeeded
+

+            22
$ git log --format=%ci -1
+

+            23
$ git show -q --pretty=format:%G? HEAD
+

+            24
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 Drauthius
+

+            25
 * Cache regenerated successfully
 

-            22
 * Sync failed with 1
-
[FATAL]
 
         
     
diff --git a/Drauthius.txt b/Drauthius.txt
index fb24549cbe8c..40784134d54c 100644
--- a/Drauthius.txt
+++ b/Drauthius.txt
@@ -16,7 +16,10 @@
  * Adding new repository
 $ pmaint sync Drauthius
 Cloning into '/var/lib/repo-mirror-ci/sync/Drauthius'...
-fatal: unable to access 'https://anongit.gentoo.org/git/repo/user/Drauthius.git/': The requested URL returned error: 504
 *** syncing Drauthius
-!!! failed syncing Drauthius
- * Sync failed with 1
+*** synced Drauthius
+ * Sync succeeded
+$ git log --format=%ci -1
+$ git show -q --pretty=format:%G? HEAD
+$ pmaint regen --use-local-desc --pkg-desc-index -t 1 Drauthius
+ * Cache regenerated successfully
diff --git a/DuPol.html b/DuPol.html
index 36199fac0f44..ab096368bac0 100644
--- a/DuPol.html
+++ b/DuPol.html
@@ -34,55 +34,25 @@
 

             12
 'status': 'unofficial'}
 

-            13
$ pmaint sync DuPol
+            13
 * Adding new repository
 

-            14
warning: Pulling without specifying how to reconcile divergent branches is
+            14
$ pmaint sync DuPol
 

-            15
discouraged. You can squelch this message by running one of the following
+            15
Cloning into '/var/lib/repo-mirror-ci/sync/DuPol'...
 

-            16
commands sometime before your next pull:
+            16
*** syncing DuPol
 

-            17
+            17
*** synced DuPol
 

-            18
  git config pull.rebase false  # merge (the default strategy)
+            18
 * Sync succeeded
 

-            19
  git config pull.rebase true   # rebase
+            19
$ git log --format=%ci -1
 

-            20
  git config pull.ff only       # fast-forward only
+            20
$ git show -q --pretty=format:%G? HEAD
 

-            21
+            21
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 DuPol
 

-            22
You can replace "git config" with "git config --global" to set a default
-

-            23
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            24
or --ff-only on the command line to override the configured default per
-

-            25
invocation.
-

-            26
-

-            27
fatal: unable to access 'https://anongit.gentoo.org/git/user/DuPol.git/': The requested URL returned error: 504
-

-            28
*** syncing DuPol
-

-            29
!!! failed syncing DuPol
-

-            30
 * Sync failed with 1
-
[FATAL]
-            31
 * Will try to re-create
-

-            32
$ pmaint sync DuPol
-

-            33
Cloning into '/var/lib/repo-mirror-ci/sync/DuPol'...
-

-            34
fatal: unable to access 'https://anongit.gentoo.org/git/user/DuPol.git/': The requested URL returned error: 502
-

-            35
*** syncing DuPol
-

-            36
!!! failed syncing DuPol
-

-            37
 * Sync failed again with 1, removing
+            22
 * Cache regenerated successfully
 

 
         
diff --git a/DuPol.txt b/DuPol.txt
index d7a7f8352b0a..738c81bed078 100644
--- a/DuPol.txt
+++ b/DuPol.txt
@@ -10,28 +10,13 @@
             {'type': 'git',
              'uri': 'git+ssh://git@git.gentoo.org/user/DuPol.git'}],
  'status': 'unofficial'}
-$ pmaint sync DuPol
-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.
-
-fatal: unable to access 'https://anongit.gentoo.org/git/user/DuPol.git/': The requested URL returned error: 504
-*** syncing DuPol
-!!! failed syncing DuPol
- * Sync failed with 1
- * Will try to re-create
+ * Adding new repository
 $ pmaint sync DuPol
 Cloning into '/var/lib/repo-mirror-ci/sync/DuPol'...
-fatal: unable to access 'https://anongit.gentoo.org/git/user/DuPol.git/': The requested URL returned error: 502
 *** syncing DuPol
-!!! failed syncing DuPol
- * Sync failed again with 1, removing
+*** synced DuPol
+ * Sync succeeded
+$ git log --format=%ci -1
+$ git show -q --pretty=format:%G? HEAD
+$ pmaint regen --use-local-desc --pkg-desc-index -t 1 DuPol
+ * Cache regenerated successfully
diff --git a/FireBurn.html b/FireBurn.html
index 009211a5621a..709acaf9eb13 100644
--- a/FireBurn.html
+++ b/FireBurn.html
@@ -60,31 +60,53 @@
 

             25
From git://github.com/FireBurn/Overlay
 

-            26
   d78a535..235d307  master     -> origin/master
+            26
   235d307..8d44bee  master     -> origin/master
 

-            27
Updating d78a535..235d307
+            27
Updating 235d307..8d44bee
 

             28
Fast-forward
 

-            29
 app-emulation/dxvk/metadata.xml | 4 ++--
+            29
 dev-lang/duktape/Manifest                |  3 ++
 

-            30
 1 file changed, 2 insertions(+), 2 deletions(-)
+            30
 dev-lang/duktape/duktape-2.4.0.ebuild    | 47 ++++++++++++++++++++++++++++
 

-            31
*** syncing FireBurn
+            31
 dev-lang/duktape/duktape-2.5.0-r1.ebuild | 53 ++++++++++++++++++++++++++++++++
 

-            32
*** synced FireBurn
+            32
 dev-lang/duktape/duktape-2.6.0.ebuild    | 53 ++++++++++++++++++++++++++++++++
 

-            33
 * Sync succeeded
+            33
 dev-lang/duktape/files/duktape.pc        | 10 ++++++
 

-            34
$ git log --format=%ci -1
+            34
 dev-lang/duktape/metadata.xml            | 11 +++++++
 

-            35
$ git show -q --pretty=format:%G? HEAD
+            35
 6 files changed, 177 insertions(+)
 

-            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 FireBurn
+            36
 create mode 100644 dev-lang/duktape/Manifest
 

-            37
 * sys-auth/polkit: failed parsing metadata.xml: Entity 'auml' not defined, line 6, column 28 (metadata.xml, line 6)
+            37
 create mode 100644 dev-lang/duktape/duktape-2.4.0.ebuild
+

+            38
 create mode 100644 dev-lang/duktape/duktape-2.5.0-r1.ebuild
+

+            39
 create mode 100644 dev-lang/duktape/duktape-2.6.0.ebuild
+

+            40
 create mode 100644 dev-lang/duktape/files/duktape.pc
+

+            41
 create mode 100644 dev-lang/duktape/metadata.xml
+

+            42
*** syncing FireBurn
+

+            43
*** synced FireBurn
+

+            44
 * Sync succeeded
+

+            45
$ git log --format=%ci -1
+

+            46
$ git show -q --pretty=format:%G? HEAD
+

+            47
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 FireBurn
+

+            48
 * sys-auth/polkit: failed parsing metadata.xml: Entity 'auml' not defined, line 6, column 28 (metadata.xml, line 6)
 
[FATAL]
-            38
 * Cache regen failed with 1
+            49
 * Cache regen failed with 1
 

 
         
diff --git a/FireBurn.txt b/FireBurn.txt
index c1df6c24b595..a41b3565d4bd 100644
--- a/FireBurn.txt
+++ b/FireBurn.txt
@@ -23,11 +23,22 @@ or --ff-only on the command line to override the configured default per
 invocation.
 
 From git://github.com/FireBurn/Overlay
-   d78a535..235d307  master     -> origin/master
-Updating d78a535..235d307
+   235d307..8d44bee  master     -> origin/master
+Updating 235d307..8d44bee
 Fast-forward
- app-emulation/dxvk/metadata.xml | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ dev-lang/duktape/Manifest                |  3 ++
+ dev-lang/duktape/duktape-2.4.0.ebuild    | 47 ++++++++++++++++++++++++++++
+ dev-lang/duktape/duktape-2.5.0-r1.ebuild | 53 ++++++++++++++++++++++++++++++++
+ dev-lang/duktape/duktape-2.6.0.ebuild    | 53 ++++++++++++++++++++++++++++++++
+ dev-lang/duktape/files/duktape.pc        | 10 ++++++
+ dev-lang/duktape/metadata.xml            | 11 +++++++
+ 6 files changed, 177 insertions(+)
+ create mode 100644 dev-lang/duktape/Manifest
+ create mode 100644 dev-lang/duktape/duktape-2.4.0.ebuild
+ create mode 100644 dev-lang/duktape/duktape-2.5.0-r1.ebuild
+ create mode 100644 dev-lang/duktape/duktape-2.6.0.ebuild
+ create mode 100644 dev-lang/duktape/files/duktape.pc
+ create mode 100644 dev-lang/duktape/metadata.xml
 *** syncing FireBurn
 *** synced FireBurn
  * Sync succeeded
diff --git a/HomeAssistantRepository.html b/HomeAssistantRepository.html
index a5a6ba727e36..9ca02d4ac25a 100644
--- a/HomeAssistantRepository.html
+++ b/HomeAssistantRepository.html
@@ -64,71 +64,21 @@
 

             27
 

-            28
From https://git.edevau.net/onkelbeh/HomeAssistantRepository
+            28
Already up to date.
 

-            29
   e6897b3c..abd542aa  master         -> origin/master
+            29
*** syncing HomeAssistantRepository
 

-            30
 * [new tag]           v0.117.0_beta2 -> v0.117.0_beta2
+            30
*** synced HomeAssistantRepository
 

-            31
Updating e6897b3c..abd542aa
+            31
 * Sync succeeded
 

-            32
Fast-forward
+            32
$ git log --format=%ci -1
 

-            33
 CHANGELOG.txt                                      |   5 +
+            33
$ git show -q --pretty=format:%G? HEAD
 

-            34
 app-misc/homeassistant-full/Manifest               |   6 +-
+            34
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 HomeAssistantRepository
 

-            35
 .../homeassistant-full-0.117.0_beta2.ebuild        | 925 +++++++++++++++++++++
-

-            36
 .../homeassistant-full-9999.ebuild                 |  12 +-
-

-            37
 app-misc/homeassistant-full/metadata.xml           |  47 +-
-

-            38
 app-misc/homeassistant-min/Manifest                |   2 +
-

-            39
 .../homeassistant-min-0.117.0_beta2.ebuild         | 224 +++++
-

-            40
 app-misc/homeassistant/Manifest                    |   4 +-
-

-            41
 .../homeassistant-0.117.0_beta2.ebuild             | 438 ++++++++++
-

-            42
 app-misc/homeassistant/metadata.xml                |   2 +-
-

-            43
 dev-python/home-assistant-frontend/Manifest        |   2 +
-

-            44
 .../home-assistant-frontend-20201021.2.ebuild      |  30 +
-

-            45
 dev-python/zigpy-deconz/Manifest                   |   4 +-
-

-            46
 dev-python/zigpy-deconz/zigpy-deconz-0.10.0.ebuild |   6 +
-

-            47
 dev-python/zigpy-deconz/zigpy-deconz-0.11.0.ebuild |  37 +
-

-            48
 15 files changed, 1709 insertions(+), 35 deletions(-)
-

-            49
 create mode 100644 app-misc/homeassistant-full/homeassistant-full-0.117.0_beta2.ebuild
-

-            50
 create mode 100644 app-misc/homeassistant-min/homeassistant-min-0.117.0_beta2.ebuild
-

-            51
 create mode 100644 app-misc/homeassistant/homeassistant-0.117.0_beta2.ebuild
-

-            52
 create mode 100644 dev-python/home-assistant-frontend/home-assistant-frontend-20201021.2.ebuild
-

-            53
 create mode 100644 dev-python/zigpy-deconz/zigpy-deconz-0.11.0.ebuild
-

-            54
*** syncing HomeAssistantRepository
-

-            55
*** synced HomeAssistantRepository
-

-            56
 * Sync succeeded
-

-            57
$ git log --format=%ci -1
-

-            58
$ git show -q --pretty=format:%G? HEAD
-

-            59
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 HomeAssistantRepository
-

-            60
 * Cache regenerated successfully
+            35
 * Cache regenerated successfully
 

 
         
diff --git a/HomeAssistantRepository.txt b/HomeAssistantRepository.txt
index 6700263090e9..a08bcd2d8a37 100644
--- a/HomeAssistantRepository.txt
+++ b/HomeAssistantRepository.txt
@@ -25,32 +25,7 @@ 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://git.edevau.net/onkelbeh/HomeAssistantRepository
-   e6897b3c..abd542aa  master         -> origin/master
- * [new tag]           v0.117.0_beta2 -> v0.117.0_beta2
-Updating e6897b3c..abd542aa
-Fast-forward
- CHANGELOG.txt                                      |   5 +
- app-misc/homeassistant-full/Manifest               |   6 +-
- .../homeassistant-full-0.117.0_beta2.ebuild        | 925 +++++++++++++++++++++
- .../homeassistant-full-9999.ebuild                 |  12 +-
- app-misc/homeassistant-full/metadata.xml           |  47 +-
- app-misc/homeassistant-min/Manifest                |   2 +
- .../homeassistant-min-0.117.0_beta2.ebuild         | 224 +++++
- app-misc/homeassistant/Manifest                    |   4 +-
- .../homeassistant-0.117.0_beta2.ebuild             | 438 ++++++++++
- app-misc/homeassistant/metadata.xml                |   2 +-
- dev-python/home-assistant-frontend/Manifest        |   2 +
- .../home-assistant-frontend-20201021.2.ebuild      |  30 +
- dev-python/zigpy-deconz/Manifest                   |   4 +-
- dev-python/zigpy-deconz/zigpy-deconz-0.10.0.ebuild |   6 +
- dev-python/zigpy-deconz/zigpy-deconz-0.11.0.ebuild |  37 +
- 15 files changed, 1709 insertions(+), 35 deletions(-)
- create mode 100644 app-misc/homeassistant-full/homeassistant-full-0.117.0_beta2.ebuild
- create mode 100644 app-misc/homeassistant-min/homeassistant-min-0.117.0_beta2.ebuild
- create mode 100644 app-misc/homeassistant/homeassistant-0.117.0_beta2.ebuild
- create mode 100644 dev-python/home-assistant-frontend/home-assistant-frontend-20201021.2.ebuild
- create mode 100644 dev-python/zigpy-deconz/zigpy-deconz-0.11.0.ebuild
+Already up to date.
 *** syncing HomeAssistantRepository
 *** synced HomeAssistantRepository
  * Sync succeeded
diff --git a/R_Overlay.html b/R_Overlay.html
index cda8e053f201..b8915f8f1344 100644
--- a/R_Overlay.html
+++ b/R_Overlay.html
@@ -56,13 +56,13 @@
 

             23
File list transfer time: 0.000 seconds
 

-            24
Total bytes sent: 22.27K
+            24
Total bytes sent: 22.41K
 

             25
Total bytes received: 3.56M
 

             26
 

-            27
sent 22.27K bytes  received 3.56M bytes  1.43M bytes/sec
+            27
sent 22.41K bytes  received 3.56M bytes  1.43M bytes/sec
 

             28
total size is 96.03M  speedup is 26.82
 

diff --git a/R_Overlay.txt b/R_Overlay.txt
index a3d3130e05d5..b3c23b11d8ad 100644
--- a/R_Overlay.txt
+++ b/R_Overlay.txt
@@ -21,10 +21,10 @@ Matched data: 0 bytes
 File list size: 2.88M
 File list generation time: 0.001 seconds
 File list transfer time: 0.000 seconds
-Total bytes sent: 22.27K
+Total bytes sent: 22.41K
 Total bytes received: 3.56M
 
-sent 22.27K bytes  received 3.56M bytes  1.43M bytes/sec
+sent 22.41K bytes  received 3.56M bytes  1.43M bytes/sec
 total size is 96.03M  speedup is 26.82
 *** syncing R_Overlay
 *** synced R_Overlay
diff --git a/activehome.html b/activehome.html
index 898af16afb59..8aec1dd4c29c 100644
--- a/activehome.html
+++ b/activehome.html
@@ -50,20 +50,28 @@
 

             20
$ pmaint sync activehome
 

-            21
WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

             22
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            23
Cloning into '/var/lib/repo-mirror-ci/sync/activehome'...
+            23
WARNING:pkgcore:DuPol repo at '/var/lib/repo-mirror-ci/sync/DuPol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            24
fatal: unable to access 'https://anongit.gentoo.org/git/user/activehome.git/': The requested URL returned error: 504
+            24
Cloning into '/var/lib/repo-mirror-ci/sync/activehome'...
 

             25
*** syncing activehome
 

-            26
!!! failed syncing activehome
+            26
*** synced activehome
+

+            27
 * Sync succeeded
+

+            28
$ git log --format=%ci -1
+

+            29
$ git show -q --pretty=format:%G? HEAD
+

+            30
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 activehome
+

+            31
 * Cache regenerated successfully
 

-            27
 * Sync failed with 1
-
[FATAL]
 
         
     
diff --git a/activehome.txt b/activehome.txt
index 95a6a26816a1..d51a9852ab0a 100644
--- a/activehome.txt
+++ b/activehome.txt
@@ -18,10 +18,14 @@
  'status': 'unofficial'}
  * Adding new repository
 $ pmaint sync activehome
-WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:DuPol repo at '/var/lib/repo-mirror-ci/sync/DuPol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 Cloning into '/var/lib/repo-mirror-ci/sync/activehome'...
-fatal: unable to access 'https://anongit.gentoo.org/git/user/activehome.git/': The requested URL returned error: 504
 *** syncing activehome
-!!! failed syncing activehome
- * Sync failed with 1
+*** synced activehome
+ * Sync succeeded
+$ git log --format=%ci -1
+$ git show -q --pretty=format:%G? HEAD
+$ pmaint regen --use-local-desc --pkg-desc-index -t 1 activehome
+ * Cache regenerated successfully
diff --git a/alexcepoi.html b/alexcepoi.html
index 3fc2b88beeb6..206039cfb76d 100644
--- a/alexcepoi.html
+++ b/alexcepoi.html
@@ -44,20 +44,30 @@
 

             17
$ pmaint sync alexcepoi
 

-            18
WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

             19
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
Cloning into '/var/lib/repo-mirror-ci/sync/alexcepoi'...
+            20
WARNING:pkgcore:DuPol repo at '/var/lib/repo-mirror-ci/sync/DuPol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
fatal: unable to access 'https://anongit.gentoo.org/git/user/alexcepoi.git/': The requested URL returned error: 504
+            21
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
*** syncing alexcepoi
+            22
Cloning into '/var/lib/repo-mirror-ci/sync/alexcepoi'...
 

-            23
!!! failed syncing alexcepoi
+            23
*** syncing alexcepoi
+

+            24
*** synced alexcepoi
+

+            25
 * Sync succeeded
+

+            26
$ git log --format=%ci -1
+

+            27
$ git show -q --pretty=format:%G? HEAD
+

+            28
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 alexcepoi
+

+            29
 * Cache regenerated successfully
 

-            24
 * Sync failed with 1
-
[FATAL]
 
         
     
diff --git a/alexcepoi.txt b/alexcepoi.txt
index 5b51c78b72d2..7aff2e52c408 100644
--- a/alexcepoi.txt
+++ b/alexcepoi.txt
@@ -15,10 +15,15 @@
  'status': 'unofficial'}
  * Adding new repository
 $ pmaint sync alexcepoi
-WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:DuPol repo at '/var/lib/repo-mirror-ci/sync/DuPol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 Cloning into '/var/lib/repo-mirror-ci/sync/alexcepoi'...
-fatal: unable to access 'https://anongit.gentoo.org/git/user/alexcepoi.git/': The requested URL returned error: 504
 *** syncing alexcepoi
-!!! failed syncing alexcepoi
- * Sync failed with 1
+*** synced alexcepoi
+ * Sync succeeded
+$ git log --format=%ci -1
+$ git show -q --pretty=format:%G? HEAD
+$ pmaint regen --use-local-desc --pkg-desc-index -t 1 alexcepoi
+ * Cache regenerated successfully
diff --git a/aluco.html b/aluco.html
index e620ded6a9e4..c455fdcd50e2 100644
--- a/aluco.html
+++ b/aluco.html
@@ -42,20 +42,30 @@
 

             16
$ pmaint sync aluco
 

-            17
WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

             18
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
Cloning into '/var/lib/repo-mirror-ci/sync/aluco'...
+            19
WARNING:pkgcore:DuPol repo at '/var/lib/repo-mirror-ci/sync/DuPol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
fatal: unable to access 'https://anongit.gentoo.org/git/user/aluco.git/': The requested URL returned error: 504
+            20
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
*** syncing aluco
+            21
Cloning into '/var/lib/repo-mirror-ci/sync/aluco'...
 

-            22
!!! failed syncing aluco
+            22
*** syncing aluco
+

+            23
*** synced aluco
+

+            24
 * Sync succeeded
+

+            25
$ git log --format=%ci -1
+

+            26
$ git show -q --pretty=format:%G? HEAD
+

+            27
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 aluco
+

+            28
 * Cache regenerated successfully
 

-            23
 * Sync failed with 1
-
[FATAL]
 
         
     
diff --git a/aluco.txt b/aluco.txt
index 70dfca076301..e22d5ba299dc 100644
--- a/aluco.txt
+++ b/aluco.txt
@@ -14,10 +14,15 @@
  'status': 'unofficial'}
  * Adding new repository
 $ pmaint sync aluco
-WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:DuPol repo at '/var/lib/repo-mirror-ci/sync/DuPol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 Cloning into '/var/lib/repo-mirror-ci/sync/aluco'...
-fatal: unable to access 'https://anongit.gentoo.org/git/user/aluco.git/': The requested URL returned error: 504
 *** syncing aluco
-!!! failed syncing aluco
- * Sync failed with 1
+*** synced aluco
+ * Sync succeeded
+$ git log --format=%ci -1
+$ git show -q --pretty=format:%G? HEAD
+$ pmaint regen --use-local-desc --pkg-desc-index -t 1 aluco
+ * Cache regenerated successfully
diff --git a/anarchy.html b/anarchy.html
index d34ab40f1a9d..48ecf3c124bb 100644
--- a/anarchy.html
+++ b/anarchy.html
@@ -44,9 +44,9 @@
 

             17
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:DuPol repo at '/var/lib/repo-mirror-ci/sync/DuPol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

             20
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

@@ -56,9 +56,9 @@
 

             23
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            24
WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            25
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
WARNING:pkgcore:DuPol repo at '/var/lib/repo-mirror-ci/sync/DuPol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

             26
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

@@ -68,14 +68,20 @@
 

             29
Cloning into '/var/lib/repo-mirror-ci/sync/anarchy'...
 

-            30
fatal: unable to access 'https://anongit.gentoo.org/git/dev/anarchy.git/': The requested URL returned error: 504
+            30
*** syncing anarchy
 

-            31
*** syncing anarchy
+            31
*** synced anarchy
 

-            32
!!! failed syncing anarchy
+            32
 * Sync succeeded
+

+            33
$ git log --format=%ci -1
+

+            34
$ git show -q --pretty=format:%G? HEAD
+

+            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 anarchy
+

+            36
 * Cache regenerated successfully
 

-            33
 * Sync failed with 1
-
[FATAL]
 
         
     
diff --git a/anarchy.txt b/anarchy.txt
index 9b0ed4fa41a0..7ba1161c3f2d 100644
--- a/anarchy.txt
+++ b/anarchy.txt
@@ -15,19 +15,22 @@
  * Adding new repository
 $ pmaint sync anarchy
 WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:DuPol repo at '/var/lib/repo-mirror-ci/sync/DuPol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:DuPol repo at '/var/lib/repo-mirror-ci/sync/DuPol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 Cloning into '/var/lib/repo-mirror-ci/sync/anarchy'...
-fatal: unable to access 'https://anongit.gentoo.org/git/dev/anarchy.git/': The requested URL returned error: 504
 *** syncing anarchy
-!!! failed syncing anarchy
- * Sync failed with 1
+*** synced anarchy
+ * Sync succeeded
+$ git log --format=%ci -1
+$ git show -q --pretty=format:%G? HEAD
+$ pmaint regen --use-local-desc --pkg-desc-index -t 1 anarchy
+ * Cache regenerated successfully
diff --git a/anaximander.html b/anaximander.html
index 2759dfe2e43c..36bf206eb44b 100644
--- a/anaximander.html
+++ b/anaximander.html
@@ -46,9 +46,9 @@
 

             18
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:DuPol repo at '/var/lib/repo-mirror-ci/sync/DuPol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

             21
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

@@ -58,26 +58,28 @@
 

             24
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            25
WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
WARNING:pkgcore:DuPol repo at '/var/lib/repo-mirror-ci/sync/DuPol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            26
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            27
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            28
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
Cloning into '/var/lib/repo-mirror-ci/sync/anaximander'...
 

-            29
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
*** syncing anaximander
 

-            30
Cloning into '/var/lib/repo-mirror-ci/sync/anaximander'...
+            30
*** synced anaximander
 

-            31
fatal: unable to access 'https://anongit.gentoo.org/git/user/anaximander.git/': The requested URL returned error: 504
+            31
 * Sync succeeded
 

-            32
*** syncing anaximander
+            32
$ git log --format=%ci -1
 

-            33
!!! failed syncing anaximander
+            33
$ git show -q --pretty=format:%G? HEAD
+

+            34
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 anaximander
+

+            35
 * Cache regenerated successfully
 

-            34
 * Sync failed with 1
-
[FATAL]
 
         
     
diff --git a/anaximander.txt b/anaximander.txt
index b18bc32c933b..1a0cfbea6806 100644
--- a/anaximander.txt
+++ b/anaximander.txt
@@ -16,19 +16,20 @@
  * Adding new repository
 $ pmaint sync anaximander
 WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:DuPol repo at '/var/lib/repo-mirror-ci/sync/DuPol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:DuPol repo at '/var/lib/repo-mirror-ci/sync/DuPol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 Cloning into '/var/lib/repo-mirror-ci/sync/anaximander'...
-fatal: unable to access 'https://anongit.gentoo.org/git/user/anaximander.git/': The requested URL returned error: 504
 *** syncing anaximander
-!!! failed syncing anaximander
- * Sync failed with 1
+*** synced anaximander
+ * Sync succeeded
+$ git log --format=%ci -1
+$ git show -q --pretty=format:%G? HEAD
+$ pmaint regen --use-local-desc --pkg-desc-index -t 1 anaximander
+ * Cache regenerated successfully
diff --git a/anders-larsson.html b/anders-larsson.html
index 11f0197b75bb..3b6a8f5402d4 100644
--- a/anders-larsson.html
+++ b/anders-larsson.html
@@ -34,9 +34,9 @@
 

             12
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:DuPol repo at '/var/lib/repo-mirror-ci/sync/DuPol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

             15
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

diff --git a/anders-larsson.txt b/anders-larsson.txt
index 6a0177f01988..32e6b65d1b31 100644
--- a/anders-larsson.txt
+++ b/anders-larsson.txt
@@ -10,8 +10,8 @@
  'status': 'unofficial'}
 $ pmaint sync anders-larsson
 WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:DuPol repo at '/var/lib/repo-mirror-ci/sync/DuPol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
diff --git a/andjscott.html b/andjscott.html
index 5c17f2da39a1..e9e9c4aace35 100644
--- a/andjscott.html
+++ b/andjscott.html
@@ -30,9 +30,9 @@
 

             10
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            11
WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            11
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            12
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:DuPol repo at '/var/lib/repo-mirror-ci/sync/DuPol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

             13
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

diff --git a/andjscott.txt b/andjscott.txt
index 49ddd2d62e84..49825dc6a5f8 100644
--- a/andjscott.txt
+++ b/andjscott.txt
@@ -8,8 +8,8 @@
  'status': 'unofficial'}
 $ pmaint sync andjscott
 WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:DuPol repo at '/var/lib/repo-mirror-ci/sync/DuPol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
diff --git a/andrey_utkin.html b/andrey_utkin.html
index 57b67dfefe33..e6561aa450d4 100644
--- a/andrey_utkin.html
+++ b/andrey_utkin.html
@@ -40,9 +40,9 @@
 

             15
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:DuPol repo at '/var/lib/repo-mirror-ci/sync/DuPol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

             18
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

diff --git a/andrey_utkin.txt b/andrey_utkin.txt
index 07c919d65372..b53f2b71b521 100644
--- a/andrey_utkin.txt
+++ b/andrey_utkin.txt
@@ -13,8 +13,8 @@
  'status': 'official'}
 $ pmaint sync andrey_utkin
 WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:DuPol repo at '/var/lib/repo-mirror-ci/sync/DuPol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
diff --git a/andy.html b/andy.html
index d2e96958ae50..63ad0a580b19 100644
--- a/andy.html
+++ b/andy.html
@@ -40,9 +40,9 @@
 

             15
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:DuPol repo at '/var/lib/repo-mirror-ci/sync/DuPol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

             18
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

@@ -52,28 +52,36 @@
 

             21
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
WARNING:pkgcore:DuPol repo at '/var/lib/repo-mirror-ci/sync/DuPol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            23
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            24
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            25
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
Cloning into '/var/lib/repo-mirror-ci/sync/andy'...
 

-            26
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
*** syncing andy
 

-            27
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
*** synced andy
 

-            28
Cloning into '/var/lib/repo-mirror-ci/sync/andy'...
+            28
 * Sync succeeded
 

-            29
fatal: unable to access 'https://anongit.gentoo.org/git/user/andy.git/': The requested URL returned error: 504
+            29
$ git log --format=%ci -1
 

-            30
*** syncing andy
+            30
$ git show -q --pretty=format:%G? HEAD
 

-            31
!!! failed syncing andy
+            31
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 andy
 

-            32
 * Sync failed with 1
+            32
 * dev-vcs/git-remote-gcrypt-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
+            33
 * media-gfx/gfxtablet-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+
[FATAL]
+            34
 * media-libs/rsound-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+
[FATAL]
+            35
 * x11-misc/autorandr-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+
[FATAL]
+            36
 * Cache regen failed with 1
+

 
         
     
diff --git a/andy.txt b/andy.txt
index 75d2aa590027..78c7353014b3 100644
--- a/andy.txt
+++ b/andy.txt
@@ -13,20 +13,24 @@
  * Adding new repository
 $ pmaint sync andy
 WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:DuPol repo at '/var/lib/repo-mirror-ci/sync/DuPol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:DuPol repo at '/var/lib/repo-mirror-ci/sync/DuPol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 Cloning into '/var/lib/repo-mirror-ci/sync/andy'...
-fatal: unable to access 'https://anongit.gentoo.org/git/user/andy.git/': The requested URL returned error: 504
 *** syncing andy
-!!! failed syncing andy
- * Sync failed with 1
+*** synced andy
+ * Sync succeeded
+$ git log --format=%ci -1
+$ git show -q --pretty=format:%G? HEAD
+$ pmaint regen --use-local-desc --pkg-desc-index -t 1 andy
+ * dev-vcs/git-remote-gcrypt-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+ * media-gfx/gfxtablet-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+ * media-libs/rsound-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+ * x11-misc/autorandr-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+ * Cache regen failed with 1
diff --git a/anomen.html b/anomen.html
index e7888096f7d0..61dfbf3bb563 100644
--- a/anomen.html
+++ b/anomen.html
@@ -40,9 +40,9 @@
 

             15
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:DuPol repo at '/var/lib/repo-mirror-ci/sync/DuPol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

             18
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

diff --git a/anomen.txt b/anomen.txt
index 116932cf958d..7a9768ef08b4 100644
--- a/anomen.txt
+++ b/anomen.txt
@@ -13,8 +13,8 @@
  'status': 'unofficial'}
 $ pmaint sync anomen
 WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:DuPol repo at '/var/lib/repo-mirror-ci/sync/DuPol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
diff --git a/anyc.html b/anyc.html
index 3ff1b5eb5045..df9db0a7d8ee 100644
--- a/anyc.html
+++ b/anyc.html
@@ -38,9 +38,9 @@
 

             14
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:DuPol repo at '/var/lib/repo-mirror-ci/sync/DuPol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

             17
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

diff --git a/anyc.txt b/anyc.txt
index 0d62323edfae..3237d690bc89 100644
--- a/anyc.txt
+++ b/anyc.txt
@@ -12,8 +12,8 @@
  'status': 'unofficial'}
 $ pmaint sync anyc
 WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:DuPol repo at '/var/lib/repo-mirror-ci/sync/DuPol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
diff --git a/apriluwu.html b/apriluwu.html
index cbd12f50d398..82b692f9a7ef 100644
--- a/apriluwu.html
+++ b/apriluwu.html
@@ -40,9 +40,9 @@
 

             15
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:DuPol repo at '/var/lib/repo-mirror-ci/sync/DuPol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

             18
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

diff --git a/apriluwu.txt b/apriluwu.txt
index e0f396e84b98..4d2912a6118c 100644
--- a/apriluwu.txt
+++ b/apriluwu.txt
@@ -13,8 +13,8 @@
  'status': 'unofficial'}
 $ pmaint sync apriluwu
 WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:DuPol repo at '/var/lib/repo-mirror-ci/sync/DuPol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
diff --git a/archenroot.html b/archenroot.html
index 5e7c0a9b4748..ad2dd518481f 100644
--- a/archenroot.html
+++ b/archenroot.html
@@ -40,9 +40,9 @@
 

             15
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:DuPol repo at '/var/lib/repo-mirror-ci/sync/DuPol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

             18
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

diff --git a/archenroot.txt b/archenroot.txt
index a305ec87ea60..89f13149567b 100644
--- a/archenroot.txt
+++ b/archenroot.txt
@@ -13,8 +13,8 @@
  'status': 'unofficial'}
 $ pmaint sync archenroot
 WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:DuPol repo at '/var/lib/repo-mirror-ci/sync/DuPol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
diff --git a/argent-main.html b/argent-main.html
index 7058371bbab3..d2495698e2e5 100644
--- a/argent-main.html
+++ b/argent-main.html
@@ -36,9 +36,9 @@
 

             13
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:DuPol repo at '/var/lib/repo-mirror-ci/sync/DuPol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

             16
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

diff --git a/argent-main.txt b/argent-main.txt
index 0e810f81f6de..8d35143d1604 100644
--- a/argent-main.txt
+++ b/argent-main.txt
@@ -11,8 +11,8 @@
  'status': 'unofficial'}
 $ pmaint sync argent-main
 WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:DuPol repo at '/var/lib/repo-mirror-ci/sync/DuPol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
diff --git a/arx-libertatis.html b/arx-libertatis.html
index aa22d45c5d87..838925aa3d01 100644
--- a/arx-libertatis.html
+++ b/arx-libertatis.html
@@ -34,15 +34,15 @@
 

             12
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:DuPol repo at '/var/lib/repo-mirror-ci/sync/DuPol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

             18
warning: Pulling without specifying how to reconcile divergent branches is
 

diff --git a/arx-libertatis.txt b/arx-libertatis.txt
index 618113551d81..c573d90b4572 100644
--- a/arx-libertatis.txt
+++ b/arx-libertatis.txt
@@ -10,11 +10,11 @@
  'status': 'unofficial'}
 $ pmaint sync arx-libertatis
 WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:DuPol repo at '/var/lib/repo-mirror-ci/sync/DuPol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/atom.html b/atom.html
index f8d86c831a4a..0bc8edcc8ffb 100644
--- a/atom.html
+++ b/atom.html
@@ -36,57 +36,55 @@
 

             13
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:DuPol repo at '/var/lib/repo-mirror-ci/sync/DuPol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
warning: Pulling without specifying how to reconcile divergent branches is
 

-            19
warning: Pulling without specifying how to reconcile divergent branches is
+            19
discouraged. You can squelch this message by running one of the following
 

-            20
discouraged. You can squelch this message by running one of the following
+            20
commands sometime before your next pull:
 

-            21
commands sometime before your next pull:
+            21
 

-            22
+            22
  git config pull.rebase false  # merge (the default strategy)
 

-            23
  git config pull.rebase false  # merge (the default strategy)
+            23
  git config pull.rebase true   # rebase
 

-            24
  git config pull.rebase true   # rebase
+            24
  git config pull.ff only       # fast-forward only
 

-            25
  git config pull.ff only       # fast-forward only
+            25
 

-            26
+            26
You can replace "git config" with "git config --global" to set a default
 

-            27
You can replace "git config" with "git config --global" to set a default
+            27
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            28
preference for all repositories. You can also pass --rebase, --no-rebase,
+            28
or --ff-only on the command line to override the configured default per
 

-            29
or --ff-only on the command line to override the configured default per
+            29
invocation.
 

-            30
invocation.
+            30
 

-            31
+            31
Already up to date.
 

-            32
Already up to date.
+            32
*** syncing atom
 

-            33
*** syncing atom
+            33
*** synced atom
 

-            34
*** synced atom
+            34
 * Sync succeeded
 

-            35
 * Sync succeeded
+            35
$ git log --format=%ci -1
 

-            36
$ git log --format=%ci -1
+            36
$ git show -q --pretty=format:%G? HEAD
 

-            37
$ git show -q --pretty=format:%G? HEAD
+            37
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 atom
 

-            38
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 atom
-

-            39
 * Cache regenerated successfully
+            38
 * Cache regenerated successfully
 

 
         
diff --git a/atom.txt b/atom.txt
index 553c371ff243..566e19be67a7 100644
--- a/atom.txt
+++ b/atom.txt
@@ -11,11 +11,10 @@
  'status': 'unofficial'}
 $ pmaint sync atom
 WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:DuPol repo at '/var/lib/repo-mirror-ci/sync/DuPol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/audio-overlay.html b/audio-overlay.html
index adcb9481c83f..7fc7582229be 100644
--- a/audio-overlay.html
+++ b/audio-overlay.html
@@ -48,7 +48,7 @@
 

             19
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:DuPol repo at '/var/lib/repo-mirror-ci/sync/DuPol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

             21
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

@@ -56,49 +56,47 @@
 

             23
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            24
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
warning: Pulling without specifying how to reconcile divergent branches is
 

-            25
warning: Pulling without specifying how to reconcile divergent branches is
+            25
discouraged. You can squelch this message by running one of the following
 

-            26
discouraged. You can squelch this message by running one of the following
+            26
commands sometime before your next pull:
 

-            27
commands sometime before your next pull:
+            27
 

-            28
+            28
  git config pull.rebase false  # merge (the default strategy)
 

-            29
  git config pull.rebase false  # merge (the default strategy)
+            29
  git config pull.rebase true   # rebase
 

-            30
  git config pull.rebase true   # rebase
+            30
  git config pull.ff only       # fast-forward only
 

-            31
  git config pull.ff only       # fast-forward only
+            31
 

-            32
+            32
You can replace "git config" with "git config --global" to set a default
 

-            33
You can replace "git config" with "git config --global" to set a default
+            33
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            34
preference for all repositories. You can also pass --rebase, --no-rebase,
+            34
or --ff-only on the command line to override the configured default per
 

-            35
or --ff-only on the command line to override the configured default per
+            35
invocation.
 

-            36
invocation.
+            36
 

-            37
+            37
Already up to date.
 

-            38
Already up to date.
+            38
*** syncing audio-overlay
 

-            39
*** syncing audio-overlay
+            39
*** synced audio-overlay
 

-            40
*** synced audio-overlay
+            40
 * Sync succeeded
 

-            41
 * Sync succeeded
+            41
$ git log --format=%ci -1
 

-            42
$ git log --format=%ci -1
+            42
$ git show -q --pretty=format:%G? HEAD
 

-            43
$ git show -q --pretty=format:%G? HEAD
+            43
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 audio-overlay
 

-            44
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 audio-overlay
-

-            45
 * Cache regenerated successfully
+            44
 * Cache regenerated successfully
 

 
         
diff --git a/audio-overlay.txt b/audio-overlay.txt
index 4257e42eb8d1..b8ee46e93628 100644
--- a/audio-overlay.txt
+++ b/audio-overlay.txt
@@ -17,11 +17,10 @@
  'status': 'unofficial'}
 $ pmaint sync audio-overlay
 WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:DuPol repo at '/var/lib/repo-mirror-ci/sync/DuPol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/average.html b/average.html
index 74fc9f4ce6a6..39b32d7d3458 100644
--- a/average.html
+++ b/average.html
@@ -42,9 +42,9 @@
 

             16
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:DuPol repo at '/var/lib/repo-mirror-ci/sync/DuPol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

             19
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

@@ -52,47 +52,47 @@
 

             21
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
warning: Pulling without specifying how to reconcile divergent branches is
 

-            23
warning: Pulling without specifying how to reconcile divergent branches is
+            23
discouraged. You can squelch this message by running one of the following
 

-            24
discouraged. You can squelch this message by running one of the following
+            24
commands sometime before your next pull:
 

-            25
commands sometime before your next pull:
+            25
 

-            26
+            26
  git config pull.rebase false  # merge (the default strategy)
 

-            27
  git config pull.rebase false  # merge (the default strategy)
+            27
  git config pull.rebase true   # rebase
 

-            28
  git config pull.rebase true   # rebase
+            28
  git config pull.ff only       # fast-forward only
 

-            29
  git config pull.ff only       # fast-forward only
+            29
 

-            30
+            30
You can replace "git config" with "git config --global" to set a default
 

-            31
You can replace "git config" with "git config --global" to set a default
+            31
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            32
preference for all repositories. You can also pass --rebase, --no-rebase,
+            32
or --ff-only on the command line to override the configured default per
 

-            33
or --ff-only on the command line to override the configured default per
+            33
invocation.
 

-            34
invocation.
+            34
 

-            35
+            35
Already up to date.
 

-            36
Already up to date.
+            36
*** syncing average
 

-            37
*** syncing average
+            37
*** synced average
 

-            38
*** synced average
+            38
 * Sync succeeded
 

-            39
 * Sync succeeded
+            39
$ git log --format=%ci -1
 

-            40
$ git log --format=%ci -1
+            40
$ git show -q --pretty=format:%G? HEAD
 

-            41
$ git show -q --pretty=format:%G? HEAD
+            41
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 average
 

-            42
 * Invalid metadata, removing: Failed instantiating section 'average'
+            42
 * Cache regenerated successfully
 

 
         
diff --git a/average.txt b/average.txt
index 5701dfe1158b..6bb3440fa6ad 100644
--- a/average.txt
+++ b/average.txt
@@ -14,12 +14,11 @@
  'status': 'unofficial'}
 $ pmaint sync average
 WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:DuPol repo at '/var/lib/repo-mirror-ci/sync/DuPol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
@@ -39,4 +38,5 @@ Already up to date.
  * Sync succeeded
 $ git log --format=%ci -1
 $ git show -q --pretty=format:%G? HEAD
- * Invalid metadata, removing: Failed instantiating section 'average'
+$ pmaint regen --use-local-desc --pkg-desc-index -t 1 average
+ * Cache regenerated successfully
diff --git a/awesome.html b/awesome.html
index eb10146646d8..2886d793d434 100644
--- a/awesome.html
+++ b/awesome.html
@@ -36,13 +36,13 @@
 

             13
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:DuPol repo at '/var/lib/repo-mirror-ci/sync/DuPol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

             18
warning: Pulling without specifying how to reconcile divergent branches is
 

diff --git a/awesome.txt b/awesome.txt
index 67ed129325d5..538cf095ef2c 100644
--- a/awesome.txt
+++ b/awesome.txt
@@ -11,10 +11,10 @@
 $ pmaint sync awesome
 WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:DuPol repo at '/var/lib/repo-mirror-ci/sync/DuPol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/axs.html b/axs.html
index 663a565a761c..6b3def537800 100644
--- a/axs.html
+++ b/axs.html
@@ -44,42 +44,36 @@
 

             17
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:DuPol repo at '/var/lib/repo-mirror-ci/sync/DuPol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            23
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            24
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            25
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
Cloning into '/var/lib/repo-mirror-ci/sync/axs'...
 

-            26
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
*** syncing axs
 

-            27
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
*** synced axs
 

-            28
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
 * Sync succeeded
 

-            29
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
$ git log --format=%ci -1
 

-            30
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
$ git show -q --pretty=format:%G? HEAD
 

-            31
Cloning into '/var/lib/repo-mirror-ci/sync/axs'...
+            31
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 axs
 

-            32
fatal: unable to access 'https://anongit.gentoo.org/git/dev/axs.git/': The requested URL returned error: 504
+            32
 * Cache regenerated successfully
 

-            33
*** syncing axs
-

-            34
!!! failed syncing axs
-

-            35
 * Sync failed with 1
-
[FATAL]
 
         
     
diff --git a/axs.txt b/axs.txt
index 884c557ded98..9f9437bd21dc 100644
--- a/axs.txt
+++ b/axs.txt
@@ -15,13 +15,7 @@
 $ pmaint sync axs
 WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:DuPol repo at '/var/lib/repo-mirror-ci/sync/DuPol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
@@ -29,7 +23,10 @@ WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't
 WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 Cloning into '/var/lib/repo-mirror-ci/sync/axs'...
-fatal: unable to access 'https://anongit.gentoo.org/git/dev/axs.git/': The requested URL returned error: 504
 *** syncing axs
-!!! failed syncing axs
- * Sync failed with 1
+*** synced axs
+ * Sync succeeded
+$ git log --format=%ci -1
+$ git show -q --pretty=format:%G? HEAD
+$ pmaint regen --use-local-desc --pkg-desc-index -t 1 axs
+ * Cache regenerated successfully
diff --git a/barnowl.html b/barnowl.html
index 32131b212072..31d0f6d1d411 100644
--- a/barnowl.html
+++ b/barnowl.html
@@ -40,15 +40,15 @@
 

             15
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:DuPol repo at '/var/lib/repo-mirror-ci/sync/DuPol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

             21
warning: Pulling without specifying how to reconcile divergent branches is
 

diff --git a/barnowl.txt b/barnowl.txt
index 5ed49e963391..3d86bd092352 100644
--- a/barnowl.txt
+++ b/barnowl.txt
@@ -13,11 +13,11 @@
  'status': 'unofficial'}
 $ pmaint sync barnowl
 WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:DuPol repo at '/var/lib/repo-mirror-ci/sync/DuPol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/barzog-overlay.html b/barzog-overlay.html
index c6ef34383690..4f4ca7a99036 100644
--- a/barzog-overlay.html
+++ b/barzog-overlay.html
@@ -44,15 +44,15 @@
 

             17
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:DuPol repo at '/var/lib/repo-mirror-ci/sync/DuPol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

             23
warning: Pulling without specifying how to reconcile divergent branches is
 

diff --git a/barzog-overlay.txt b/barzog-overlay.txt
index 3d88aee56476..a044d3cd03ab 100644
--- a/barzog-overlay.txt
+++ b/barzog-overlay.txt
@@ -15,11 +15,11 @@
  'status': 'unofficial'}
 $ pmaint sync barzog-overlay
 WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:DuPol repo at '/var/lib/repo-mirror-ci/sync/DuPol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/beatussum-overlay.html b/beatussum-overlay.html
index 1ab1a44464bf..a2f860a62b3e 100644
--- a/beatussum-overlay.html
+++ b/beatussum-overlay.html
@@ -60,59 +60,53 @@
 

             25
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            26
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
WARNING:pkgcore:DuPol repo at '/var/lib/repo-mirror-ci/sync/DuPol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            27
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            28
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            29
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
warning: Pulling without specifying how to reconcile divergent branches is
 

-            30
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
discouraged. You can squelch this message by running one of the following
 

-            31
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
commands sometime before your next pull:
 

-            32
warning: Pulling without specifying how to reconcile divergent branches is
+            32
 

-            33
discouraged. You can squelch this message by running one of the following
+            33
  git config pull.rebase false  # merge (the default strategy)
 

-            34
commands sometime before your next pull:
+            34
  git config pull.rebase true   # rebase
 

-            35
+            35
  git config pull.ff only       # fast-forward only
 

-            36
  git config pull.rebase false  # merge (the default strategy)
+            36
 

-            37
  git config pull.rebase true   # rebase
+            37
You can replace "git config" with "git config --global" to set a default
 

-            38
  git config pull.ff only       # fast-forward only
+            38
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            39
+            39
or --ff-only on the command line to override the configured default per
 

-            40
You can replace "git config" with "git config --global" to set a default
+            40
invocation.
 

-            41
preference for all repositories. You can also pass --rebase, --no-rebase,
+            41
 

-            42
or --ff-only on the command line to override the configured default per
+            42
Already up to date.
 

-            43
invocation.
+            43
*** syncing beatussum-overlay
 

-            44
+            44
*** synced beatussum-overlay
 

-            45
Already up to date.
+            45
 * Sync succeeded
 

-            46
*** syncing beatussum-overlay
+            46
$ git log --format=%ci -1
 

-            47
*** synced beatussum-overlay
+            47
$ git show -q --pretty=format:%G? HEAD
 

-            48
 * Sync succeeded
+            48
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 beatussum-overlay
 

-            49
$ git log --format=%ci -1
-

-            50
$ git show -q --pretty=format:%G? HEAD
-

-            51
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 beatussum-overlay
-

-            52
 * Cache regenerated successfully
+            49
 * Cache regenerated successfully
 

 
         
diff --git a/beatussum-overlay.txt b/beatussum-overlay.txt
index f30f054d2f89..0c06594a3995 100644
--- a/beatussum-overlay.txt
+++ b/beatussum-overlay.txt
@@ -23,12 +23,9 @@
  'status': 'unofficial'}
 $ pmaint sync beatussum-overlay
 WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:DuPol repo at '/var/lib/repo-mirror-ci/sync/DuPol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/benzene-overlay.html b/benzene-overlay.html
index 64a125e547ff..1f5bd60a9b02 100644
--- a/benzene-overlay.html
+++ b/benzene-overlay.html
@@ -40,59 +40,53 @@
 

             15
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
warning: Pulling without specifying how to reconcile divergent branches is
 

-            20
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
discouraged. You can squelch this message by running one of the following
 

-            21
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
commands sometime before your next pull:
 

-            22
warning: Pulling without specifying how to reconcile divergent branches is
+            22
 

-            23
discouraged. You can squelch this message by running one of the following
+            23
  git config pull.rebase false  # merge (the default strategy)
 

-            24
commands sometime before your next pull:
+            24
  git config pull.rebase true   # rebase
 

-            25
+            25
  git config pull.ff only       # fast-forward only
 

-            26
  git config pull.rebase false  # merge (the default strategy)
+            26
 

-            27
  git config pull.rebase true   # rebase
+            27
You can replace "git config" with "git config --global" to set a default
 

-            28
  git config pull.ff only       # fast-forward only
+            28
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            29
+            29
or --ff-only on the command line to override the configured default per
 

-            30
You can replace "git config" with "git config --global" to set a default
+            30
invocation.
 

-            31
preference for all repositories. You can also pass --rebase, --no-rebase,
+            31
 

-            32
or --ff-only on the command line to override the configured default per
+            32
Already up to date.
 

-            33
invocation.
+            33
*** syncing benzene-overlay
 

-            34
+            34
*** synced benzene-overlay
 

-            35
Already up to date.
+            35
 * Sync succeeded
 

-            36
*** syncing benzene-overlay
+            36
$ git log --format=%ci -1
 

-            37
*** synced benzene-overlay
+            37
$ git show -q --pretty=format:%G? HEAD
 

-            38
 * Sync succeeded
+            38
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 benzene-overlay
 

-            39
$ git log --format=%ci -1
-

-            40
$ git show -q --pretty=format:%G? HEAD
-

-            41
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 benzene-overlay
-

-            42
 * Cache regenerated successfully
+            39
 * Cache regenerated successfully
 

 
         
diff --git a/benzene-overlay.txt b/benzene-overlay.txt
index 42efef676fa1..b20a72b8e873 100644
--- a/benzene-overlay.txt
+++ b/benzene-overlay.txt
@@ -13,12 +13,9 @@
  'status': 'unofficial'}
 $ pmaint sync benzene-overlay
 WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/bes.html b/bes.html
index 88e58ded680b..d7e30ff9925a 100644
--- a/bes.html
+++ b/bes.html
@@ -44,59 +44,53 @@
 

             17
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
warning: Pulling without specifying how to reconcile divergent branches is
 

-            22
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
discouraged. You can squelch this message by running one of the following
 

-            23
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
commands sometime before your next pull:
 

-            24
warning: Pulling without specifying how to reconcile divergent branches is
+            24
 

-            25
discouraged. You can squelch this message by running one of the following
+            25
  git config pull.rebase false  # merge (the default strategy)
 

-            26
commands sometime before your next pull:
+            26
  git config pull.rebase true   # rebase
 

-            27
+            27
  git config pull.ff only       # fast-forward only
 

-            28
  git config pull.rebase false  # merge (the default strategy)
+            28
 

-            29
  git config pull.rebase true   # rebase
+            29
You can replace "git config" with "git config --global" to set a default
 

-            30
  git config pull.ff only       # fast-forward only
+            30
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            31
+            31
or --ff-only on the command line to override the configured default per
 

-            32
You can replace "git config" with "git config --global" to set a default
+            32
invocation.
 

-            33
preference for all repositories. You can also pass --rebase, --no-rebase,
+            33
 

-            34
or --ff-only on the command line to override the configured default per
+            34
Already up to date.
 

-            35
invocation.
+            35
*** syncing bes
 

-            36
+            36
*** synced bes
 

-            37
Already up to date.
+            37
 * Sync succeeded
 

-            38
*** syncing bes
+            38
$ git log --format=%ci -1
 

-            39
*** synced bes
+            39
$ git show -q --pretty=format:%G? HEAD
 

-            40
 * Sync succeeded
+            40
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 bes
 

-            41
$ git log --format=%ci -1
-

-            42
$ git show -q --pretty=format:%G? HEAD
-

-            43
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 bes
-

-            44
 * Cache regenerated successfully
+            41
 * Cache regenerated successfully
 

 
         
diff --git a/bes.txt b/bes.txt
index 28a72b2b8ed4..e89a42b42f18 100644
--- a/bes.txt
+++ b/bes.txt
@@ -15,12 +15,9 @@
  'status': 'unofficial'}
 $ pmaint sync bes
 WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/bezerker.html b/bezerker.html
index e05dc2e14a06..2ae422050b75 100644
--- a/bezerker.html
+++ b/bezerker.html
@@ -34,59 +34,53 @@
 

             12
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
warning: Pulling without specifying how to reconcile divergent branches is
 

-            17
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
discouraged. You can squelch this message by running one of the following
 

-            18
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
commands sometime before your next pull:
 

-            19
warning: Pulling without specifying how to reconcile divergent branches is
+            19
 

-            20
discouraged. You can squelch this message by running one of the following
+            20
  git config pull.rebase false  # merge (the default strategy)
 

-            21
commands sometime before your next pull:
+            21
  git config pull.rebase true   # rebase
 

-            22
+            22
  git config pull.ff only       # fast-forward only
 

-            23
  git config pull.rebase false  # merge (the default strategy)
+            23
 

-            24
  git config pull.rebase true   # rebase
+            24
You can replace "git config" with "git config --global" to set a default
 

-            25
  git config pull.ff only       # fast-forward only
+            25
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            26
+            26
or --ff-only on the command line to override the configured default per
 

-            27
You can replace "git config" with "git config --global" to set a default
+            27
invocation.
 

-            28
preference for all repositories. You can also pass --rebase, --no-rebase,
+            28
 

-            29
or --ff-only on the command line to override the configured default per
+            29
Already up to date.
 

-            30
invocation.
+            30
*** syncing bezerker
 

-            31
+            31
*** synced bezerker
 

-            32
Already up to date.
+            32
 * Sync succeeded
 

-            33
*** syncing bezerker
+            33
$ git log --format=%ci -1
 

-            34
*** synced bezerker
+            34
$ git show -q --pretty=format:%G? HEAD
 

-            35
 * Sync succeeded
+            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 bezerker
 

-            36
$ git log --format=%ci -1
-

-            37
$ git show -q --pretty=format:%G? HEAD
-

-            38
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 bezerker
-

-            39
 * Cache regenerated successfully
+            36
 * Cache regenerated successfully
 

 
         
diff --git a/bezerker.txt b/bezerker.txt
index a528288de4d4..442ec2543fe3 100644
--- a/bezerker.txt
+++ b/bezerker.txt
@@ -10,12 +10,9 @@
  'status': 'unofficial'}
 $ pmaint sync bezerker
 WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/bibletime.html b/bibletime.html
index db226122bc5f..54661ab599eb 100644
--- a/bibletime.html
+++ b/bibletime.html
@@ -44,52 +44,36 @@
 

             17
$ pmaint sync bibletime
 

-            18
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            23
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            24
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            25
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
Cloning into '/var/lib/repo-mirror-ci/sync/bibletime'...
 

-            26
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
*** syncing bibletime
 

-            27
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
*** synced bibletime
 

-            28
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
 * Sync succeeded
 

-            29
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
$ git log --format=%ci -1
 

-            30
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
$ git show -q --pretty=format:%G? HEAD
 

-            31
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 bibletime
 

-            32
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
 * Cache regenerated successfully
 

-            33
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            34
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            35
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            36
Cloning into '/var/lib/repo-mirror-ci/sync/bibletime'...
-

-            37
fatal: unable to access 'https://anongit.gentoo.org/git/user/bibletime.git/': The requested URL returned error: 504
-

-            38
*** syncing bibletime
-

-            39
!!! failed syncing bibletime
-

-            40
 * Sync failed with 1
-
[FATAL]
 
         
     
diff --git a/bibletime.txt b/bibletime.txt
index be7c3c293e00..783b8b252424 100644
--- a/bibletime.txt
+++ b/bibletime.txt
@@ -15,26 +15,18 @@
  'status': 'unofficial'}
  * Adding new repository
 $ pmaint sync bibletime
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 Cloning into '/var/lib/repo-mirror-ci/sync/bibletime'...
-fatal: unable to access 'https://anongit.gentoo.org/git/user/bibletime.git/': The requested URL returned error: 504
 *** syncing bibletime
-!!! failed syncing bibletime
- * Sync failed with 1
+*** synced bibletime
+ * Sync succeeded
+$ git log --format=%ci -1
+$ git show -q --pretty=format:%G? HEAD
+$ pmaint regen --use-local-desc --pkg-desc-index -t 1 bibletime
+ * Cache regenerated successfully
diff --git a/binaryden.html b/binaryden.html
index 6dc53bcf14ea..e8a72afb91ba 100644
--- a/binaryden.html
+++ b/binaryden.html
@@ -38,65 +38,55 @@
 

             14
$ pmaint sync binaryden
 

-            15
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
warning: Pulling without specifying how to reconcile divergent branches is
 

-            20
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
discouraged. You can squelch this message by running one of the following
 

-            21
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
commands sometime before your next pull:
 

-            22
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
 

-            23
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase false  # merge (the default strategy)
 

-            24
warning: Pulling without specifying how to reconcile divergent branches is
+            24
  git config pull.rebase true   # rebase
 

-            25
discouraged. You can squelch this message by running one of the following
+            25
  git config pull.ff only       # fast-forward only
 

-            26
commands sometime before your next pull:
+            26
 

-            27
+            27
You can replace "git config" with "git config --global" to set a default
 

-            28
  git config pull.rebase false  # merge (the default strategy)
+            28
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            29
  git config pull.rebase true   # rebase
+            29
or --ff-only on the command line to override the configured default per
 

-            30
  git config pull.ff only       # fast-forward only
+            30
invocation.
 

             31
 

-            32
You can replace "git config" with "git config --global" to set a default
+            32
Already up to date.
 

-            33
preference for all repositories. You can also pass --rebase, --no-rebase,
+            33
*** syncing binaryden
 

-            34
or --ff-only on the command line to override the configured default per
+            34
*** synced binaryden
 

-            35
invocation.
+            35
 * Sync succeeded
 

-            36
+            36
$ git log --format=%ci -1
 

-            37
Already up to date.
+            37
$ git show -q --pretty=format:%G? HEAD
 

-            38
*** syncing binaryden
+            38
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 binaryden
 

-            39
*** synced binaryden
-

-            40
 * Sync succeeded
-

-            41
$ git log --format=%ci -1
-

-            42
$ git show -q --pretty=format:%G? HEAD
-

-            43
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 binaryden
-

-            44
 * Cache regenerated successfully
+            39
 * Cache regenerated successfully
 

 
         
diff --git a/binaryden.txt b/binaryden.txt
index bb67a1e0244b..2e4560aaa6f6 100644
--- a/binaryden.txt
+++ b/binaryden.txt
@@ -12,11 +12,6 @@
              'uri': 'git+ssh://git@github.com/tkemmer/binaryden.git'}],
  'status': 'unofficial'}
 $ pmaint sync binaryden
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
diff --git a/bircoph.html b/bircoph.html
index ac657f6bb710..b367afc77c79 100644
--- a/bircoph.html
+++ b/bircoph.html
@@ -38,63 +38,57 @@
 

             14
 'status': 'official'}
 

-            15
 * Adding new repository
+            15
$ pmaint sync bircoph
 

-            16
$ pmaint sync bircoph
+            16
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
warning: Pulling without specifying how to reconcile divergent branches is
 

-            21
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
discouraged. You can squelch this message by running one of the following
 

-            22
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
commands sometime before your next pull:
 

-            23
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
 

-            24
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.rebase false  # merge (the default strategy)
 

-            25
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase true   # rebase
 

-            26
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.ff only       # fast-forward only
 

-            27
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
 

-            28
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
You can replace "git config" with "git config --global" to set a default
 

-            29
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            30
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
or --ff-only on the command line to override the configured default per
 

-            31
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
invocation.
 

-            32
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
 

-            33
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
Already up to date.
 

-            34
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
*** syncing bircoph
 

-            35
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
*** synced bircoph
 

-            36
Cloning into '/var/lib/repo-mirror-ci/sync/bircoph'...
+            36
 * Sync succeeded
 

-            37
*** syncing bircoph
+            37
$ git log --format=%ci -1
 

-            38
*** synced bircoph
+            38
$ git show -q --pretty=format:%G? HEAD
 

-            39
 * Sync succeeded
+            39
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 bircoph
 

-            40
$ git log --format=%ci -1
-

-            41
$ git show -q --pretty=format:%G? HEAD
-

-            42
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 bircoph
-

-            43
 * Cache regenerated successfully
+            40
 * Cache regenerated successfully
 

 
         
diff --git a/bircoph.txt b/bircoph.txt
index 080cdfbf8214..4d26c8020086 100644
--- a/bircoph.txt
+++ b/bircoph.txt
@@ -12,28 +12,25 @@
             {'type': 'git',
              'uri': 'git+ssh://git@git.gentoo.org/dev/bircoph.git'}],
  'status': 'official'}
- * Adding new repository
 $ pmaint sync bircoph
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-Cloning into '/var/lib/repo-mirror-ci/sync/bircoph'...
+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.
+
+Already up to date.
 *** syncing bircoph
 *** synced bircoph
  * Sync succeeded
diff --git a/bitcetera.html b/bitcetera.html
index 6740805400d6..5caf8a52e9de 100644
--- a/bitcetera.html
+++ b/bitcetera.html
@@ -42,65 +42,55 @@
 

             16
$ pmaint sync bitcetera
 

-            17
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
warning: Pulling without specifying how to reconcile divergent branches is
 

-            22
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
discouraged. You can squelch this message by running one of the following
 

-            23
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
commands sometime before your next pull:
 

-            24
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 

-            25
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase false  # merge (the default strategy)
 

-            26
warning: Pulling without specifying how to reconcile divergent branches is
+            26
  git config pull.rebase true   # rebase
 

-            27
discouraged. You can squelch this message by running one of the following
+            27
  git config pull.ff only       # fast-forward only
 

-            28
commands sometime before your next pull:
+            28
 

-            29
+            29
You can replace "git config" with "git config --global" to set a default
 

-            30
  git config pull.rebase false  # merge (the default strategy)
+            30
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            31
  git config pull.rebase true   # rebase
+            31
or --ff-only on the command line to override the configured default per
 

-            32
  git config pull.ff only       # fast-forward only
+            32
invocation.
 

             33
 

-            34
You can replace "git config" with "git config --global" to set a default
+            34
Already up to date.
 

-            35
preference for all repositories. You can also pass --rebase, --no-rebase,
+            35
*** syncing bitcetera
 

-            36
or --ff-only on the command line to override the configured default per
+            36
*** synced bitcetera
 

-            37
invocation.
+            37
 * Sync succeeded
 

-            38
+            38
$ git log --format=%ci -1
 

-            39
Already up to date.
+            39
$ git show -q --pretty=format:%G? HEAD
 

-            40
*** syncing bitcetera
+            40
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 bitcetera
 

-            41
*** synced bitcetera
-

-            42
 * Sync succeeded
-

-            43
$ git log --format=%ci -1
-

-            44
$ git show -q --pretty=format:%G? HEAD
-

-            45
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 bitcetera
-

-            46
 * Cache regenerated successfully
+            41
 * Cache regenerated successfully
 

 
         
diff --git a/bitcetera.txt b/bitcetera.txt
index 528ddc1c7090..0a8f46cc5975 100644
--- a/bitcetera.txt
+++ b/bitcetera.txt
@@ -14,11 +14,6 @@
              'uri': 'git@github.com:svoop/bitcetera-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync bitcetera
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
diff --git a/bitcoin.html b/bitcoin.html
index c7d949d1f7b1..f6226b8dfca4 100644
--- a/bitcoin.html
+++ b/bitcoin.html
@@ -30,65 +30,55 @@
 

             10
$ pmaint sync bitcoin
 

-            11
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            11
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            12
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
warning: Pulling without specifying how to reconcile divergent branches is
 

-            16
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
discouraged. You can squelch this message by running one of the following
 

-            17
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
commands sometime before your next pull:
 

-            18
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
 

-            19
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
  git config pull.rebase false  # merge (the default strategy)
 

-            20
warning: Pulling without specifying how to reconcile divergent branches is
+            20
  git config pull.rebase true   # rebase
 

-            21
discouraged. You can squelch this message by running one of the following
+            21
  git config pull.ff only       # fast-forward only
 

-            22
commands sometime before your next pull:
+            22
 

-            23
+            23
You can replace "git config" with "git config --global" to set a default
 

-            24
  git config pull.rebase false  # merge (the default strategy)
+            24
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            25
  git config pull.rebase true   # rebase
+            25
or --ff-only on the command line to override the configured default per
 

-            26
  git config pull.ff only       # fast-forward only
+            26
invocation.
 

             27
 

-            28
You can replace "git config" with "git config --global" to set a default
+            28
Already up to date.
 

-            29
preference for all repositories. You can also pass --rebase, --no-rebase,
+            29
*** syncing bitcoin
 

-            30
or --ff-only on the command line to override the configured default per
+            30
*** synced bitcoin
 

-            31
invocation.
+            31
 * Sync succeeded
 

-            32
+            32
$ git log --format=%ci -1
 

-            33
Already up to date.
+            33
$ git show -q --pretty=format:%G? HEAD
 

-            34
*** syncing bitcoin
+            34
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 bitcoin
 

-            35
*** synced bitcoin
-

-            36
 * Sync succeeded
-

-            37
$ git log --format=%ci -1
-

-            38
$ git show -q --pretty=format:%G? HEAD
-

-            39
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 bitcoin
-

-            40
 * Cache regenerated successfully
+            35
 * Cache regenerated successfully
 

 
         
diff --git a/bitcoin.txt b/bitcoin.txt
index 4221ba0331cd..c073e072c3c6 100644
--- a/bitcoin.txt
+++ b/bitcoin.txt
@@ -8,11 +8,6 @@
  'source': [{'type': 'git', 'uri': 'https://gitlab.com/bitcoin/gentoo.git'}],
  'status': 'unofficial'}
 $ pmaint sync bitcoin
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
diff --git a/bleeding-edge.html b/bleeding-edge.html
index 07e6f9b08eaf..5c5fce05c6ab 100644
--- a/bleeding-edge.html
+++ b/bleeding-edge.html
@@ -42,65 +42,57 @@
 

             16
 'status': 'unofficial'}
 

-            17
 * Adding new repository
+            17
$ pmaint sync bleeding-edge
 

-            18
$ pmaint sync bleeding-edge
+            18
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
warning: Pulling without specifying how to reconcile divergent branches is
 

-            23
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
discouraged. You can squelch this message by running one of the following
 

-            24
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
commands sometime before your next pull:
 

-            25
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 

-            26
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.rebase false  # merge (the default strategy)
 

-            27
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.rebase true   # rebase
 

-            28
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
  git config pull.ff only       # fast-forward only
 

-            29
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
 

-            30
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
You can replace "git config" with "git config --global" to set a default
 

-            31
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            32
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
or --ff-only on the command line to override the configured default per
 

-            33
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
invocation.
 

-            34
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
 

-            35
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
Already up to date.
 

-            36
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
*** syncing bleeding-edge
 

-            37
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            37
*** synced bleeding-edge
 

-            38
WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            38
 * Sync succeeded
 

-            39
Cloning into '/var/lib/repo-mirror-ci/sync/bleeding-edge'...
+            39
$ git log --format=%ci -1
 

-            40
*** syncing bleeding-edge
+            40
$ git show -q --pretty=format:%G? HEAD
 

-            41
*** synced bleeding-edge
+            41
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 bleeding-edge
 

-            42
 * Sync succeeded
-

-            43
$ git log --format=%ci -1
-

-            44
$ git show -q --pretty=format:%G? HEAD
-

-            45
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 bleeding-edge
-

-            46
 * Cache regenerated successfully
+            42
 * Cache regenerated successfully
 

 
         
diff --git a/bleeding-edge.txt b/bleeding-edge.txt
index 1de791fbe6ae..970c727011db 100644
--- a/bleeding-edge.txt
+++ b/bleeding-edge.txt
@@ -14,29 +14,25 @@
             {'type': 'git',
              'uri': 'git+ssh://git@git.gentoo.org/repo/user/bleeding-edge.git'}],
  'status': 'unofficial'}
- * Adding new repository
 $ pmaint sync bleeding-edge
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-Cloning into '/var/lib/repo-mirror-ci/sync/bleeding-edge'...
+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.
+
+Already up to date.
 *** syncing bleeding-edge
 *** synced bleeding-edge
  * Sync succeeded
diff --git a/blender-gentoo-logo.html b/blender-gentoo-logo.html
index 36412d377984..1037ef1a8876 100644
--- a/blender-gentoo-logo.html
+++ b/blender-gentoo-logo.html
@@ -42,58 +42,40 @@
 

             16
$ pmaint sync blender-gentoo-logo
 

-            17
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            23
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            24
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            25
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            26
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
Cloning into '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo'...
 

-            27
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
*** syncing blender-gentoo-logo
 

-            28
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
*** synced blender-gentoo-logo
 

-            29
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
 * Sync succeeded
 

-            30
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
$ git log --format=%ci -1
 

-            31
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
$ git show -q --pretty=format:%G? HEAD
 

-            32
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 blender-gentoo-logo
 

-            33
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
 * Cache regenerated successfully
 

-            34
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            35
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            36
WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            37
WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            38
Cloning into '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo'...
-

-            39
fatal: unable to access 'https://anongit.gentoo.org/git/repo/proj/blender-gentoo-logo.git/': The requested URL returned error: 504
-

-            40
*** syncing blender-gentoo-logo
-

-            41
!!! failed syncing blender-gentoo-logo
-

-            42
 * Sync failed with 1
-
[FATAL]
 
         
     
diff --git a/blender-gentoo-logo.txt b/blender-gentoo-logo.txt
index 23d036b89367..64fe2b575bc3 100644
--- a/blender-gentoo-logo.txt
+++ b/blender-gentoo-logo.txt
@@ -14,29 +14,20 @@
  'status': 'official'}
  * Adding new repository
 $ pmaint sync blender-gentoo-logo
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 Cloning into '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo'...
-fatal: unable to access 'https://anongit.gentoo.org/git/repo/proj/blender-gentoo-logo.git/': The requested URL returned error: 504
 *** syncing blender-gentoo-logo
-!!! failed syncing blender-gentoo-logo
- * Sync failed with 1
+*** synced blender-gentoo-logo
+ * Sync succeeded
+$ git log --format=%ci -1
+$ git show -q --pretty=format:%G? HEAD
+$ pmaint regen --use-local-desc --pkg-desc-index -t 1 blender-gentoo-logo
+ * Cache regenerated successfully
diff --git a/bliss-overlay.html b/bliss-overlay.html
index 3044ed9d5ae0..787b09ed50f4 100644
--- a/bliss-overlay.html
+++ b/bliss-overlay.html
@@ -38,65 +38,55 @@
 

             14
$ pmaint sync bliss-overlay
 

-            15
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
warning: Pulling without specifying how to reconcile divergent branches is
 

-            20
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
discouraged. You can squelch this message by running one of the following
 

-            21
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
commands sometime before your next pull:
 

-            22
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
 

-            23
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase false  # merge (the default strategy)
 

-            24
warning: Pulling without specifying how to reconcile divergent branches is
+            24
  git config pull.rebase true   # rebase
 

-            25
discouraged. You can squelch this message by running one of the following
+            25
  git config pull.ff only       # fast-forward only
 

-            26
commands sometime before your next pull:
+            26
 

-            27
+            27
You can replace "git config" with "git config --global" to set a default
 

-            28
  git config pull.rebase false  # merge (the default strategy)
+            28
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            29
  git config pull.rebase true   # rebase
+            29
or --ff-only on the command line to override the configured default per
 

-            30
  git config pull.ff only       # fast-forward only
+            30
invocation.
 

             31
 

-            32
You can replace "git config" with "git config --global" to set a default
+            32
Already up to date.
 

-            33
preference for all repositories. You can also pass --rebase, --no-rebase,
+            33
*** syncing bliss-overlay
 

-            34
or --ff-only on the command line to override the configured default per
+            34
*** synced bliss-overlay
 

-            35
invocation.
+            35
 * Sync succeeded
 

-            36
+            36
$ git log --format=%ci -1
 

-            37
Already up to date.
+            37
$ git show -q --pretty=format:%G? HEAD
 

-            38
*** syncing bliss-overlay
+            38
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 bliss-overlay
 

-            39
*** synced bliss-overlay
-

-            40
 * Sync succeeded
-

-            41
$ git log --format=%ci -1
-

-            42
$ git show -q --pretty=format:%G? HEAD
-

-            43
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 bliss-overlay
-

-            44
 * Cache regenerated successfully
+            39
 * Cache regenerated successfully
 

 
         
diff --git a/bliss-overlay.txt b/bliss-overlay.txt
index d303d1066fe4..b2afc8ef66ce 100644
--- a/bliss-overlay.txt
+++ b/bliss-overlay.txt
@@ -12,11 +12,6 @@
              'uri': 'git@github.com:fearedbliss/bliss-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync bliss-overlay
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
diff --git a/bloody.html b/bloody.html
index 94420439450c..44058735acf9 100644
--- a/bloody.html
+++ b/bloody.html
@@ -36,65 +36,55 @@
 

             13
$ pmaint sync bloody
 

-            14
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
warning: Pulling without specifying how to reconcile divergent branches is
 

-            19
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
discouraged. You can squelch this message by running one of the following
 

-            20
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
commands sometime before your next pull:
 

-            21
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
 

-            22
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase false  # merge (the default strategy)
 

-            23
warning: Pulling without specifying how to reconcile divergent branches is
+            23
  git config pull.rebase true   # rebase
 

-            24
discouraged. You can squelch this message by running one of the following
+            24
  git config pull.ff only       # fast-forward only
 

-            25
commands sometime before your next pull:
+            25
 

-            26
+            26
You can replace "git config" with "git config --global" to set a default
 

-            27
  git config pull.rebase false  # merge (the default strategy)
+            27
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            28
  git config pull.rebase true   # rebase
+            28
or --ff-only on the command line to override the configured default per
 

-            29
  git config pull.ff only       # fast-forward only
+            29
invocation.
 

             30
 

-            31
You can replace "git config" with "git config --global" to set a default
+            31
Already up to date.
 

-            32
preference for all repositories. You can also pass --rebase, --no-rebase,
+            32
*** syncing bloody
 

-            33
or --ff-only on the command line to override the configured default per
+            33
*** synced bloody
 

-            34
invocation.
+            34
 * Sync succeeded
 

-            35
+            35
$ git log --format=%ci -1
 

-            36
Already up to date.
+            36
$ git show -q --pretty=format:%G? HEAD
 

-            37
*** syncing bloody
+            37
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 bloody
 

-            38
*** synced bloody
-

-            39
 * Sync succeeded
-

-            40
$ git log --format=%ci -1
-

-            41
$ git show -q --pretty=format:%G? HEAD
-

-            42
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 bloody
-

-            43
 * Cache regenerated successfully
+            38
 * Cache regenerated successfully
 

 
         
diff --git a/bloody.txt b/bloody.txt
index e799cc708f0b..348e41d6ea3a 100644
--- a/bloody.txt
+++ b/bloody.txt
@@ -11,11 +11,6 @@
             {'type': 'git', 'uri': 'git@github.com:bloodywing/bloody.git'}],
  'status': 'unofficial'}
 $ pmaint sync bloody
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
diff --git a/bobwya.html b/bobwya.html
index c9873911f878..63a808b3ba4b 100644
--- a/bobwya.html
+++ b/bobwya.html
@@ -42,65 +42,55 @@
 

             16
$ pmaint sync bobwya
 

-            17
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
warning: Pulling without specifying how to reconcile divergent branches is
 

-            22
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
discouraged. You can squelch this message by running one of the following
 

-            23
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
commands sometime before your next pull:
 

-            24
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 

-            25
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase false  # merge (the default strategy)
 

-            26
warning: Pulling without specifying how to reconcile divergent branches is
+            26
  git config pull.rebase true   # rebase
 

-            27
discouraged. You can squelch this message by running one of the following
+            27
  git config pull.ff only       # fast-forward only
 

-            28
commands sometime before your next pull:
+            28
 

-            29
+            29
You can replace "git config" with "git config --global" to set a default
 

-            30
  git config pull.rebase false  # merge (the default strategy)
+            30
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            31
  git config pull.rebase true   # rebase
+            31
or --ff-only on the command line to override the configured default per
 

-            32
  git config pull.ff only       # fast-forward only
+            32
invocation.
 

             33
 

-            34
You can replace "git config" with "git config --global" to set a default
+            34
Already up to date.
 

-            35
preference for all repositories. You can also pass --rebase, --no-rebase,
+            35
*** syncing bobwya
 

-            36
or --ff-only on the command line to override the configured default per
+            36
*** synced bobwya
 

-            37
invocation.
+            37
 * Sync succeeded
 

-            38
+            38
$ git log --format=%ci -1
 

-            39
Already up to date.
+            39
$ git show -q --pretty=format:%G? HEAD
 

-            40
*** syncing bobwya
+            40
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 bobwya
 

-            41
*** synced bobwya
-

-            42
 * Sync succeeded
-

-            43
$ git log --format=%ci -1
-

-            44
$ git show -q --pretty=format:%G? HEAD
-

-            45
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 bobwya
-

-            46
 * Cache regenerated successfully
+            41
 * Cache regenerated successfully
 

 
         
diff --git a/bobwya.txt b/bobwya.txt
index aec493aa1ff6..2b640ccb6e34 100644
--- a/bobwya.txt
+++ b/bobwya.txt
@@ -14,11 +14,6 @@
              'uri': 'git@github.com:bobwya/miscellaneous_ebuilds.git'}],
  'status': 'unofficial'}
 $ pmaint sync bobwya
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
diff --git a/bombo82.html b/bombo82.html
index b0dd59c5a521..31df70c3fd12 100644
--- a/bombo82.html
+++ b/bombo82.html
@@ -38,65 +38,55 @@
 

             14
$ pmaint sync bombo82
 

-            15
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
warning: Pulling without specifying how to reconcile divergent branches is
 

-            20
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
discouraged. You can squelch this message by running one of the following
 

-            21
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
commands sometime before your next pull:
 

-            22
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
 

-            23
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase false  # merge (the default strategy)
 

-            24
warning: Pulling without specifying how to reconcile divergent branches is
+            24
  git config pull.rebase true   # rebase
 

-            25
discouraged. You can squelch this message by running one of the following
+            25
  git config pull.ff only       # fast-forward only
 

-            26
commands sometime before your next pull:
+            26
 

-            27
+            27
You can replace "git config" with "git config --global" to set a default
 

-            28
  git config pull.rebase false  # merge (the default strategy)
+            28
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            29
  git config pull.rebase true   # rebase
+            29
or --ff-only on the command line to override the configured default per
 

-            30
  git config pull.ff only       # fast-forward only
+            30
invocation.
 

             31
 

-            32
You can replace "git config" with "git config --global" to set a default
+            32
Already up to date.
 

-            33
preference for all repositories. You can also pass --rebase, --no-rebase,
+            33
*** syncing bombo82
 

-            34
or --ff-only on the command line to override the configured default per
+            34
*** synced bombo82
 

-            35
invocation.
+            35
 * Sync succeeded
 

-            36
+            36
$ git log --format=%ci -1
 

-            37
Already up to date.
+            37
$ git show -q --pretty=format:%G? HEAD
 

-            38
*** syncing bombo82
+            38
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 bombo82
 

-            39
*** synced bombo82
-

-            40
 * Sync succeeded
-

-            41
$ git log --format=%ci -1
-

-            42
$ git show -q --pretty=format:%G? HEAD
-

-            43
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 bombo82
-

-            44
 * Cache regenerated successfully
+            39
 * Cache regenerated successfully
 

 
         
diff --git a/bombo82.txt b/bombo82.txt
index d749f2a378f9..41fbe6fb3284 100644
--- a/bombo82.txt
+++ b/bombo82.txt
@@ -12,11 +12,6 @@
              'uri': 'git@github.com:bombo82/bombo82-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync bombo82
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
diff --git a/booboo.html b/booboo.html
index 7121a517f8c0..f003acbac7db 100644
--- a/booboo.html
+++ b/booboo.html
@@ -32,69 +32,55 @@
 

             11
$ pmaint sync booboo
 

-            12
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
warning: Pulling without specifying how to reconcile divergent branches is
 

-            17
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
discouraged. You can squelch this message by running one of the following
 

-            18
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
commands sometime before your next pull:
 

-            19
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
 

-            20
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
  git config pull.rebase false  # merge (the default strategy)
 

-            21
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
  git config pull.rebase true   # rebase
 

-            22
WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.ff only       # fast-forward only
 

-            23
warning: Pulling without specifying how to reconcile divergent branches is
+            23
 

-            24
discouraged. You can squelch this message by running one of the following
+            24
You can replace "git config" with "git config --global" to set a default
 

-            25
commands sometime before your next pull:
+            25
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            26
+            26
or --ff-only on the command line to override the configured default per
 

-            27
  git config pull.rebase false  # merge (the default strategy)
+            27
invocation.
 

-            28
  git config pull.rebase true   # rebase
+            28
 

-            29
  git config pull.ff only       # fast-forward only
+            29
Already up to date.
 

-            30
+            30
*** syncing booboo
 

-            31
You can replace "git config" with "git config --global" to set a default
+            31
*** synced booboo
 

-            32
preference for all repositories. You can also pass --rebase, --no-rebase,
+            32
 * Sync succeeded
 

-            33
or --ff-only on the command line to override the configured default per
+            33
$ git log --format=%ci -1
 

-            34
invocation.
+            34
$ git show -q --pretty=format:%G? HEAD
 

-            35
+            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 booboo
 

-            36
Already up to date.
-

-            37
*** syncing booboo
-

-            38
*** synced booboo
-

-            39
 * Sync succeeded
-

-            40
$ git log --format=%ci -1
-

-            41
$ git show -q --pretty=format:%G? HEAD
-

-            42
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 booboo
-

-            43
 * Cache regenerated successfully
+            36
 * Cache regenerated successfully
 

 
         
diff --git a/booboo.txt b/booboo.txt
index a79691e5c996..8fc176ef9102 100644
--- a/booboo.txt
+++ b/booboo.txt
@@ -9,17 +9,10 @@
  'source': [{'type': 'git', 'uri': 'https://github.com/l29ah/booboo.git'}],
  'status': 'unofficial'}
 $ pmaint sync booboo
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/brave-overlay.html b/brave-overlay.html
index bc9fcda345a8..7640af5115bb 100644
--- a/brave-overlay.html
+++ b/brave-overlay.html
@@ -34,67 +34,55 @@
 

             12
$ pmaint sync brave-overlay
 

-            13
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
warning: Pulling without specifying how to reconcile divergent branches is
 

-            18
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
discouraged. You can squelch this message by running one of the following
 

-            19
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
commands sometime before your next pull:
 

-            20
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
 

-            21
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
  git config pull.rebase false  # merge (the default strategy)
 

-            22
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase true   # rebase
 

-            23
warning: Pulling without specifying how to reconcile divergent branches is
+            23
  git config pull.ff only       # fast-forward only
 

-            24
discouraged. You can squelch this message by running one of the following
+            24
 

-            25
commands sometime before your next pull:
+            25
You can replace "git config" with "git config --global" to set a default
 

-            26
+            26
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            27
  git config pull.rebase false  # merge (the default strategy)
+            27
or --ff-only on the command line to override the configured default per
 

-            28
  git config pull.rebase true   # rebase
+            28
invocation.
 

-            29
  git config pull.ff only       # fast-forward only
+            29
 

-            30
+            30
Already up to date.
 

-            31
You can replace "git config" with "git config --global" to set a default
+            31
*** syncing brave-overlay
 

-            32
preference for all repositories. You can also pass --rebase, --no-rebase,
+            32
*** synced brave-overlay
 

-            33
or --ff-only on the command line to override the configured default per
+            33
 * Sync succeeded
 

-            34
invocation.
+            34
$ git log --format=%ci -1
 

-            35
+            35
$ git show -q --pretty=format:%G? HEAD
 

-            36
Already up to date.
+            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 brave-overlay
 

-            37
*** syncing brave-overlay
-

-            38
*** synced brave-overlay
-

-            39
 * Sync succeeded
-

-            40
$ git log --format=%ci -1
-

-            41
$ git show -q --pretty=format:%G? HEAD
-

-            42
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 brave-overlay
-

-            43
 * Cache regenerated successfully
+            37
 * Cache regenerated successfully
 

 
         
diff --git a/brave-overlay.txt b/brave-overlay.txt
index 11f58f8d80d0..2bbf231534b5 100644
--- a/brave-overlay.txt
+++ b/brave-overlay.txt
@@ -10,16 +10,10 @@
              'uri': 'https://gitlab.com/jason.oliveira/brave-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync brave-overlay
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/bright.html b/bright.html
index 60e116b1437d..cfeaf8d33568 100644
--- a/bright.html
+++ b/bright.html
@@ -32,67 +32,55 @@
 

             11
$ pmaint sync bright
 

-            12
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
warning: Pulling without specifying how to reconcile divergent branches is
 

-            17
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
discouraged. You can squelch this message by running one of the following
 

-            18
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
commands sometime before your next pull:
 

-            19
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
 

-            20
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
  git config pull.rebase false  # merge (the default strategy)
 

-            21
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
  git config pull.rebase true   # rebase
 

-            22
warning: Pulling without specifying how to reconcile divergent branches is
+            22
  git config pull.ff only       # fast-forward only
 

-            23
discouraged. You can squelch this message by running one of the following
+            23
 

-            24
commands sometime before your next pull:
+            24
You can replace "git config" with "git config --global" to set a default
 

-            25
+            25
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            26
  git config pull.rebase false  # merge (the default strategy)
+            26
or --ff-only on the command line to override the configured default per
 

-            27
  git config pull.rebase true   # rebase
+            27
invocation.
 

-            28
  git config pull.ff only       # fast-forward only
+            28
 

-            29
+            29
Already up to date.
 

-            30
You can replace "git config" with "git config --global" to set a default
+            30
*** syncing bright
 

-            31
preference for all repositories. You can also pass --rebase, --no-rebase,
+            31
*** synced bright
 

-            32
or --ff-only on the command line to override the configured default per
+            32
 * Sync succeeded
 

-            33
invocation.
+            33
$ git log --format=%ci -1
 

-            34
+            34
$ git show -q --pretty=format:%G? HEAD
 

-            35
Already up to date.
+            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 bright
 

-            36
*** syncing bright
-

-            37
*** synced bright
-

-            38
 * Sync succeeded
-

-            39
$ git log --format=%ci -1
-

-            40
$ git show -q --pretty=format:%G? HEAD
-

-            41
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 bright
-

-            42
 * Cache regenerated successfully
+            36
 * Cache regenerated successfully
 

 
         
diff --git a/bright.txt b/bright.txt
index 31ea8566a72a..71b4f4e1f5dd 100644
--- a/bright.txt
+++ b/bright.txt
@@ -9,16 +9,10 @@
  'source': [{'type': 'git', 'uri': 'https://github.com/filalex77/bright.git'}],
  'status': 'unofficial'}
 $ pmaint sync bright
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/brother-overlay.html b/brother-overlay.html
index e9c71944b530..465797328b68 100644
--- a/brother-overlay.html
+++ b/brother-overlay.html
@@ -42,69 +42,55 @@
 

             16
$ pmaint sync brother-overlay
 

-            17
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
warning: Pulling without specifying how to reconcile divergent branches is
 

-            22
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
discouraged. You can squelch this message by running one of the following
 

-            23
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
commands sometime before your next pull:
 

-            24
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 

-            25
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase false  # merge (the default strategy)
 

-            26
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.rebase true   # rebase
 

-            27
WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.ff only       # fast-forward only
 

-            28
warning: Pulling without specifying how to reconcile divergent branches is
+            28
 

-            29
discouraged. You can squelch this message by running one of the following
+            29
You can replace "git config" with "git config --global" to set a default
 

-            30
commands sometime before your next pull:
+            30
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            31
+            31
or --ff-only on the command line to override the configured default per
 

-            32
  git config pull.rebase false  # merge (the default strategy)
+            32
invocation.
 

-            33
  git config pull.rebase true   # rebase
+            33
 

-            34
  git config pull.ff only       # fast-forward only
+            34
Already up to date.
 

-            35
+            35
*** syncing brother-overlay
 

-            36
You can replace "git config" with "git config --global" to set a default
+            36
*** synced brother-overlay
 

-            37
preference for all repositories. You can also pass --rebase, --no-rebase,
+            37
 * Sync succeeded
 

-            38
or --ff-only on the command line to override the configured default per
+            38
$ git log --format=%ci -1
 

-            39
invocation.
+            39
$ git show -q --pretty=format:%G? HEAD
 

-            40
+            40
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 brother-overlay
 

-            41
Already up to date.
-

-            42
*** syncing brother-overlay
-

-            43
*** synced brother-overlay
-

-            44
 * Sync succeeded
-

-            45
$ git log --format=%ci -1
-

-            46
$ git show -q --pretty=format:%G? HEAD
-

-            47
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 brother-overlay
-

-            48
 * Cache regenerated successfully
+            41
 * Cache regenerated successfully
 

 
         
diff --git a/brother-overlay.txt b/brother-overlay.txt
index ecdb32138f3a..7a8581155727 100644
--- a/brother-overlay.txt
+++ b/brother-overlay.txt
@@ -14,17 +14,10 @@
              'uri': 'git@github.com:stefan-langenmaier/brother-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync brother-overlay
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/bubba.html b/bubba.html
index 1509281142c9..c0385d55d1c7 100644
--- a/bubba.html
+++ b/bubba.html
@@ -32,67 +32,55 @@
 

             11
$ pmaint sync bubba
 

-            12
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
warning: Pulling without specifying how to reconcile divergent branches is
 

-            17
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
discouraged. You can squelch this message by running one of the following
 

-            18
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
commands sometime before your next pull:
 

-            19
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
 

-            20
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
  git config pull.rebase false  # merge (the default strategy)
 

-            21
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
  git config pull.rebase true   # rebase
 

-            22
warning: Pulling without specifying how to reconcile divergent branches is
+            22
  git config pull.ff only       # fast-forward only
 

-            23
discouraged. You can squelch this message by running one of the following
+            23
 

-            24
commands sometime before your next pull:
+            24
You can replace "git config" with "git config --global" to set a default
 

-            25
+            25
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            26
  git config pull.rebase false  # merge (the default strategy)
+            26
or --ff-only on the command line to override the configured default per
 

-            27
  git config pull.rebase true   # rebase
+            27
invocation.
 

-            28
  git config pull.ff only       # fast-forward only
+            28
 

-            29
+            29
Already up to date.
 

-            30
You can replace "git config" with "git config --global" to set a default
+            30
*** syncing bubba
 

-            31
preference for all repositories. You can also pass --rebase, --no-rebase,
+            31
*** synced bubba
 

-            32
or --ff-only on the command line to override the configured default per
+            32
 * Sync succeeded
 

-            33
invocation.
+            33
$ git log --format=%ci -1
 

-            34
+            34
$ git show -q --pretty=format:%G? HEAD
 

-            35
Already up to date.
+            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 bubba
 

-            36
*** syncing bubba
-

-            37
*** synced bubba
-

-            38
 * Sync succeeded
-

-            39
$ git log --format=%ci -1
-

-            40
$ git show -q --pretty=format:%G? HEAD
-

-            41
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 bubba
-

-            42
 * Cache regenerated successfully
+            36
 * Cache regenerated successfully
 

 
         
diff --git a/bubba.txt b/bubba.txt
index 98acfacc444b..a1da9d5ee2ef 100644
--- a/bubba.txt
+++ b/bubba.txt
@@ -9,16 +9,10 @@
              'uri': 'https://github.com/gordonb3/bubba-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync bubba
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/bumblebee.html b/bumblebee.html
index eab8c9219218..ac181b649cdd 100644
--- a/bumblebee.html
+++ b/bumblebee.html
@@ -34,71 +34,55 @@
 

             12
$ pmaint sync bumblebee
 

-            13
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
warning: Pulling without specifying how to reconcile divergent branches is
 

-            18
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
discouraged. You can squelch this message by running one of the following
 

-            19
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
commands sometime before your next pull:
 

-            20
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
 

-            21
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
  git config pull.rebase false  # merge (the default strategy)
 

-            22
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase true   # rebase
 

-            23
WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.ff only       # fast-forward only
 

-            24
WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 

-            25
warning: Pulling without specifying how to reconcile divergent branches is
+            25
You can replace "git config" with "git config --global" to set a default
 

-            26
discouraged. You can squelch this message by running one of the following
+            26
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            27
commands sometime before your next pull:
+            27
or --ff-only on the command line to override the configured default per
 

-            28
+            28
invocation.
 

-            29
  git config pull.rebase false  # merge (the default strategy)
+            29
 

-            30
  git config pull.rebase true   # rebase
+            30
Already up to date.
 

-            31
  git config pull.ff only       # fast-forward only
+            31
*** syncing bumblebee
 

-            32
+            32
*** synced bumblebee
 

-            33
You can replace "git config" with "git config --global" to set a default
+            33
 * Sync succeeded
 

-            34
preference for all repositories. You can also pass --rebase, --no-rebase,
+            34
$ git log --format=%ci -1
 

-            35
or --ff-only on the command line to override the configured default per
+            35
$ git show -q --pretty=format:%G? HEAD
 

-            36
invocation.
+            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 bumblebee
 

-            37
-

-            38
Already up to date.
-

-            39
*** syncing bumblebee
-

-            40
*** synced bumblebee
-

-            41
 * Sync succeeded
-

-            42
$ git log --format=%ci -1
-

-            43
$ git show -q --pretty=format:%G? HEAD
-

-            44
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 bumblebee
-

-            45
 * Cache regenerated successfully
+            37
 * Cache regenerated successfully
 

 
         
diff --git a/bumblebee.txt b/bumblebee.txt
index ec8206b48e56..0a254ff00009 100644
--- a/bumblebee.txt
+++ b/bumblebee.txt
@@ -10,18 +10,10 @@
              'uri': 'git://github.com/Bumblebee-Project/bumblebee-gentoo'}],
  'status': 'unofficial'}
 $ pmaint sync bumblebee
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/buzden.html b/buzden.html
index 6de388aee971..912a78c62f99 100644
--- a/buzden.html
+++ b/buzden.html
@@ -40,71 +40,55 @@
 

             15
$ pmaint sync buzden
 

-            16
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
warning: Pulling without specifying how to reconcile divergent branches is
 

-            21
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
discouraged. You can squelch this message by running one of the following
 

-            22
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
commands sometime before your next pull:
 

-            23
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
 

-            24
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.rebase false  # merge (the default strategy)
 

-            25
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase true   # rebase
 

-            26
WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.ff only       # fast-forward only
 

-            27
WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
 

-            28
warning: Pulling without specifying how to reconcile divergent branches is
+            28
You can replace "git config" with "git config --global" to set a default
 

-            29
discouraged. You can squelch this message by running one of the following
+            29
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            30
commands sometime before your next pull:
+            30
or --ff-only on the command line to override the configured default per
 

-            31
+            31
invocation.
 

-            32
  git config pull.rebase false  # merge (the default strategy)
+            32
 

-            33
  git config pull.rebase true   # rebase
+            33
Already up to date.
 

-            34
  git config pull.ff only       # fast-forward only
+            34
*** syncing buzden
 

-            35
+            35
*** synced buzden
 

-            36
You can replace "git config" with "git config --global" to set a default
+            36
 * Sync succeeded
 

-            37
preference for all repositories. You can also pass --rebase, --no-rebase,
+            37
$ git log --format=%ci -1
 

-            38
or --ff-only on the command line to override the configured default per
+            38
$ git show -q --pretty=format:%G? HEAD
 

-            39
invocation.
+            39
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 buzden
 

-            40
-

-            41
Already up to date.
-

-            42
*** syncing buzden
-

-            43
*** synced buzden
-

-            44
 * Sync succeeded
-

-            45
$ git log --format=%ci -1
-

-            46
$ git show -q --pretty=format:%G? HEAD
-

-            47
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 buzden
-

-            48
 * Cache regenerated successfully
+            40
 * Cache regenerated successfully
 

 
         
diff --git a/buzden.txt b/buzden.txt
index 00bf59cd1a0d..f11cba21149f 100644
--- a/buzden.txt
+++ b/buzden.txt
@@ -13,18 +13,10 @@
             {'type': 'git', 'uri': 'git@github.com:buzden/buzden-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync buzden
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/c2p-overlay.html b/c2p-overlay.html
index 8da73f8376a9..f6e4a6ead38f 100644
--- a/c2p-overlay.html
+++ b/c2p-overlay.html
@@ -42,71 +42,55 @@
 

             16
$ pmaint sync c2p-overlay
 

-            17
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
warning: Pulling without specifying how to reconcile divergent branches is
 

-            22
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
discouraged. You can squelch this message by running one of the following
 

-            23
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
commands sometime before your next pull:
 

-            24
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 

-            25
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase false  # merge (the default strategy)
 

-            26
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.rebase true   # rebase
 

-            27
WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.ff only       # fast-forward only
 

-            28
WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
 

-            29
warning: Pulling without specifying how to reconcile divergent branches is
+            29
You can replace "git config" with "git config --global" to set a default
 

-            30
discouraged. You can squelch this message by running one of the following
+            30
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            31
commands sometime before your next pull:
+            31
or --ff-only on the command line to override the configured default per
 

-            32
+            32
invocation.
 

-            33
  git config pull.rebase false  # merge (the default strategy)
+            33
 

-            34
  git config pull.rebase true   # rebase
+            34
Already up to date.
 

-            35
  git config pull.ff only       # fast-forward only
+            35
*** syncing c2p-overlay
 

-            36
+            36
*** synced c2p-overlay
 

-            37
You can replace "git config" with "git config --global" to set a default
+            37
 * Sync succeeded
 

-            38
preference for all repositories. You can also pass --rebase, --no-rebase,
+            38
$ git log --format=%ci -1
 

-            39
or --ff-only on the command line to override the configured default per
+            39
$ git show -q --pretty=format:%G? HEAD
 

-            40
invocation.
+            40
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 c2p-overlay
 

-            41
-

-            42
Already up to date.
-

-            43
*** syncing c2p-overlay
-

-            44
*** synced c2p-overlay
-

-            45
 * Sync succeeded
-

-            46
$ git log --format=%ci -1
-

-            47
$ git show -q --pretty=format:%G? HEAD
-

-            48
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 c2p-overlay
-

-            49
 * Cache regenerated successfully
+            41
 * Cache regenerated successfully
 

 
         
diff --git a/c2p-overlay.txt b/c2p-overlay.txt
index a53ae1c24a5a..d12cf89b93b8 100644
--- a/c2p-overlay.txt
+++ b/c2p-overlay.txt
@@ -14,18 +14,10 @@
              'uri': 'git+ssh://git@github.com:karolgrudzinski/c2p-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync c2p-overlay
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/calculate.html b/calculate.html
index 327be85a1304..7abd1182e1cd 100644
--- a/calculate.html
+++ b/calculate.html
@@ -28,71 +28,57 @@
 

             9
$ pmaint sync calculate
 

-            10
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            10
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            11
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            11
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            12
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
warning: Pulling without specifying how to reconcile divergent branches is
 

-            16
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
discouraged. You can squelch this message by running one of the following
 

-            17
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
commands sometime before your next pull:
 

-            18
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
 

-            19
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
  git config pull.rebase false  # merge (the default strategy)
 

-            20
WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
  git config pull.rebase true   # rebase
 

-            21
WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
  git config pull.ff only       # fast-forward only
 

-            22
warning: Pulling without specifying how to reconcile divergent branches is
+            22
 

-            23
discouraged. You can squelch this message by running one of the following
+            23
You can replace "git config" with "git config --global" to set a default
 

-            24
commands sometime before your next pull:
+            24
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            25
+            25
or --ff-only on the command line to override the configured default per
 

-            26
  git config pull.rebase false  # merge (the default strategy)
+            26
invocation.
 

-            27
  git config pull.rebase true   # rebase
+            27
 

-            28
  git config pull.ff only       # fast-forward only
+            28
Already up to date.
 

-            29
+            29
*** syncing calculate
 

-            30
You can replace "git config" with "git config --global" to set a default
+            30
*** synced calculate
 

-            31
preference for all repositories. You can also pass --rebase, --no-rebase,
+            31
 * Sync succeeded
 

-            32
or --ff-only on the command line to override the configured default per
+            32
$ git log --format=%ci -1
 

-            33
invocation.
+            33
$ git show -q --pretty=format:%G? HEAD
 

-            34
+            34
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 calculate
 

-            35
Already up to date.
-

-            36
*** syncing calculate
-

-            37
*** synced calculate
-

-            38
 * Sync succeeded
-

-            39
$ git log --format=%ci -1
-

-            40
$ git show -q --pretty=format:%G? HEAD
-

-            41
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 calculate
-

-            42
 * Cache regenerated successfully
+            35
 * Cache regenerated successfully
 

 
         
diff --git a/calculate.txt b/calculate.txt
index 4ada7cf7bf95..a8ff6d3947ea 100644
--- a/calculate.txt
+++ b/calculate.txt
@@ -7,18 +7,11 @@
              'uri': 'git://git.calculate-linux.org/calculate/calculate-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync calculate
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/canutethegreat-overlay.html b/canutethegreat-overlay.html
index cbecfeb073ce..e88bffc9e7b4 100644
--- a/canutethegreat-overlay.html
+++ b/canutethegreat-overlay.html
@@ -40,71 +40,55 @@
 

             15
$ pmaint sync canutethegreat-overlay
 

-            16
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
warning: Pulling without specifying how to reconcile divergent branches is
 

-            21
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
discouraged. You can squelch this message by running one of the following
 

-            22
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
commands sometime before your next pull:
 

-            23
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
 

-            24
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.rebase false  # merge (the default strategy)
 

-            25
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase true   # rebase
 

-            26
WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.ff only       # fast-forward only
 

-            27
WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
 

-            28
warning: Pulling without specifying how to reconcile divergent branches is
+            28
You can replace "git config" with "git config --global" to set a default
 

-            29
discouraged. You can squelch this message by running one of the following
+            29
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            30
commands sometime before your next pull:
+            30
or --ff-only on the command line to override the configured default per
 

-            31
+            31
invocation.
 

-            32
  git config pull.rebase false  # merge (the default strategy)
+            32
 

-            33
  git config pull.rebase true   # rebase
+            33
Already up to date.
 

-            34
  git config pull.ff only       # fast-forward only
+            34
*** syncing canutethegreat-overlay
 

-            35
+            35
*** synced canutethegreat-overlay
 

-            36
You can replace "git config" with "git config --global" to set a default
+            36
 * Sync succeeded
 

-            37
preference for all repositories. You can also pass --rebase, --no-rebase,
+            37
$ git log --format=%ci -1
 

-            38
or --ff-only on the command line to override the configured default per
+            38
$ git show -q --pretty=format:%G? HEAD
 

-            39
invocation.
+            39
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 canutethegreat-overlay
 

-            40
-

-            41
Already up to date.
-

-            42
*** syncing canutethegreat-overlay
-

-            43
*** synced canutethegreat-overlay
-

-            44
 * Sync succeeded
-

-            45
$ git log --format=%ci -1
-

-            46
$ git show -q --pretty=format:%G? HEAD
-

-            47
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 canutethegreat-overlay
-

-            48
 * Cache regenerated successfully
+            40
 * Cache regenerated successfully
 

 
         
diff --git a/canutethegreat-overlay.txt b/canutethegreat-overlay.txt
index f90489126e63..d6326aff70e8 100644
--- a/canutethegreat-overlay.txt
+++ b/canutethegreat-overlay.txt
@@ -13,18 +13,10 @@
              'uri': 'git+ssh://git@github.com/CanuteTheGreat/canutethegreat-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync canutethegreat-overlay
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/causelay.html b/causelay.html
index e64a2c3d6481..a915d09bdd71 100644
--- a/causelay.html
+++ b/causelay.html
@@ -34,75 +34,59 @@
 

             12
$ pmaint sync causelay
 

-            13
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
warning: Pulling without specifying how to reconcile divergent branches is
 

-            19
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
discouraged. You can squelch this message by running one of the following
 

-            20
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
commands sometime before your next pull:
 

-            21
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
 

-            22
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase false  # merge (the default strategy)
 

-            23
WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase true   # rebase
 

-            24
WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.ff only       # fast-forward only
 

-            25
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 

-            26
warning: Pulling without specifying how to reconcile divergent branches is
+            26
You can replace "git config" with "git config --global" to set a default
 

-            27
discouraged. You can squelch this message by running one of the following
+            27
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            28
commands sometime before your next pull:
+            28
or --ff-only on the command line to override the configured default per
 

-            29
+            29
invocation.
 

-            30
  git config pull.rebase false  # merge (the default strategy)
+            30
 

-            31
  git config pull.rebase true   # rebase
+            31
Already up to date.
 

-            32
  git config pull.ff only       # fast-forward only
+            32
*** syncing causelay
 

-            33
+            33
*** synced causelay
 

-            34
You can replace "git config" with "git config --global" to set a default
+            34
 * Sync succeeded
 

-            35
preference for all repositories. You can also pass --rebase, --no-rebase,
+            35
$ git log --format=%ci -1
 

-            36
or --ff-only on the command line to override the configured default per
+            36
$ git show -q --pretty=format:%G? HEAD
 

-            37
invocation.
+            37
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 causelay
 

-            38
-

-            39
Already up to date.
-

-            40
*** syncing causelay
-

-            41
*** synced causelay
-

-            42
 * Sync succeeded
-

-            43
$ git log --format=%ci -1
-

-            44
$ git show -q --pretty=format:%G? HEAD
-

-            45
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 causelay
-

-            46
 * net-misc/svtplay-dl-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            38
 * net-misc/svtplay-dl-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            47
 * Cache regen failed with 1
+            39
 * Cache regen failed with 1
 

 
         
diff --git a/causelay.txt b/causelay.txt
index 124b13916b17..6205468440db 100644
--- a/causelay.txt
+++ b/causelay.txt
@@ -10,19 +10,11 @@
             {'type': 'git', 'uri': 'git@github.com:causes-/causelay.git'}],
  'status': 'unofficial'}
 $ pmaint sync causelay
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/ceamac.html b/ceamac.html
index 03cc561425da..b5e4ea616c20 100644
--- a/ceamac.html
+++ b/ceamac.html
@@ -40,73 +40,55 @@
 

             15
$ pmaint sync ceamac
 

-            16
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
warning: Pulling without specifying how to reconcile divergent branches is
 

-            21
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
discouraged. You can squelch this message by running one of the following
 

-            22
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
commands sometime before your next pull:
 

-            23
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
 

-            24
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.rebase false  # merge (the default strategy)
 

-            25
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase true   # rebase
 

-            26
WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.ff only       # fast-forward only
 

-            27
WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
 

-            28
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
You can replace "git config" with "git config --global" to set a default
 

-            29
warning: Pulling without specifying how to reconcile divergent branches is
+            29
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            30
discouraged. You can squelch this message by running one of the following
+            30
or --ff-only on the command line to override the configured default per
 

-            31
commands sometime before your next pull:
+            31
invocation.
 

             32
 

-            33
  git config pull.rebase false  # merge (the default strategy)
+            33
Already up to date.
 

-            34
  git config pull.rebase true   # rebase
+            34
*** syncing ceamac
 

-            35
  git config pull.ff only       # fast-forward only
+            35
*** synced ceamac
 

-            36
+            36
 * Sync succeeded
 

-            37
You can replace "git config" with "git config --global" to set a default
+            37
$ git log --format=%ci -1
 

-            38
preference for all repositories. You can also pass --rebase, --no-rebase,
+            38
$ git show -q --pretty=format:%G? HEAD
 

-            39
or --ff-only on the command line to override the configured default per
+            39
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 ceamac
 

-            40
invocation.
-

-            41
-

-            42
Already up to date.
-

-            43
*** syncing ceamac
-

-            44
*** synced ceamac
-

-            45
 * Sync succeeded
-

-            46
$ git log --format=%ci -1
-

-            47
$ git show -q --pretty=format:%G? HEAD
-

-            48
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 ceamac
-

-            49
 * Cache regenerated successfully
+            40
 * Cache regenerated successfully
 

 
         
diff --git a/ceamac.txt b/ceamac.txt
index d97773976ea4..1d2b9ca5bd22 100644
--- a/ceamac.txt
+++ b/ceamac.txt
@@ -13,18 +13,9 @@
              'uri': 'git+ssh://git@github.com/ceamac/overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync ceamac
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
diff --git a/cg.html b/cg.html
index 077895e8b3af..da4fa59c94fa 100644
--- a/cg.html
+++ b/cg.html
@@ -28,75 +28,57 @@
 

             9
$ pmaint sync cg
 

-            10
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            10
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            11
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            11
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            12
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
warning: Pulling without specifying how to reconcile divergent branches is
 

-            15
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
discouraged. You can squelch this message by running one of the following
 

-            16
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
commands sometime before your next pull:
 

-            17
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
 

-            18
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
  git config pull.rebase false  # merge (the default strategy)
 

-            19
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
  git config pull.rebase true   # rebase
 

-            20
WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
  git config pull.ff only       # fast-forward only
 

-            21
WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
 

-            22
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
You can replace "git config" with "git config --global" to set a default
 

-            23
warning: Pulling without specifying how to reconcile divergent branches is
+            23
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            24
discouraged. You can squelch this message by running one of the following
+            24
or --ff-only on the command line to override the configured default per
 

-            25
commands sometime before your next pull:
+            25
invocation.
 

             26
 

-            27
  git config pull.rebase false  # merge (the default strategy)
+            27
Already up to date.
 

-            28
  git config pull.rebase true   # rebase
+            28
*** syncing cg
 

-            29
  git config pull.ff only       # fast-forward only
+            29
*** synced cg
 

-            30
+            30
 * Sync succeeded
 

-            31
You can replace "git config" with "git config --global" to set a default
+            31
$ git log --format=%ci -1
 

-            32
preference for all repositories. You can also pass --rebase, --no-rebase,
+            32
$ git show -q --pretty=format:%G? HEAD
 

-            33
or --ff-only on the command line to override the configured default per
+            33
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 cg
 

-            34
invocation.
-

-            35
-

-            36
Already up to date.
-

-            37
*** syncing cg
-

-            38
*** synced cg
-

-            39
 * Sync succeeded
-

-            40
$ git log --format=%ci -1
-

-            41
$ git show -q --pretty=format:%G? HEAD
-

-            42
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 cg
-

-            43
 * app-emacs/elpy-1.34.0: failed sourcing ebuild: inherit: missing eclass argument
+            34
 * app-emacs/elpy-1.34.0: failed sourcing ebuild: inherit: missing eclass argument
 
[FATAL]
-            44
 * Cache regen failed with 1
+            35
 * Cache regen failed with 1
 

 
         
diff --git a/cg.txt b/cg.txt
index 41d6fe49bfd9..ab9ddb197c18 100644
--- a/cg.txt
+++ b/cg.txt
@@ -7,18 +7,9 @@
              'uri': 'https://github.com/brothermechanic/cg.git'}],
  'status': 'unofficial'}
 $ pmaint sync cg
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
diff --git a/chrisadr.html b/chrisadr.html
index 5265c40966d2..7aa8d8d65bf3 100644
--- a/chrisadr.html
+++ b/chrisadr.html
@@ -38,73 +38,55 @@
 

             14
$ pmaint sync chrisadr
 

-            15
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
warning: Pulling without specifying how to reconcile divergent branches is
 

-            20
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
discouraged. You can squelch this message by running one of the following
 

-            21
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
commands sometime before your next pull:
 

-            22
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
 

-            23
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase false  # merge (the default strategy)
 

-            24
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.rebase true   # rebase
 

-            25
WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.ff only       # fast-forward only
 

-            26
WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
 

-            27
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
You can replace "git config" with "git config --global" to set a default
 

-            28
warning: Pulling without specifying how to reconcile divergent branches is
+            28
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            29
discouraged. You can squelch this message by running one of the following
+            29
or --ff-only on the command line to override the configured default per
 

-            30
commands sometime before your next pull:
+            30
invocation.
 

             31
 

-            32
  git config pull.rebase false  # merge (the default strategy)
+            32
Already up to date.
 

-            33
  git config pull.rebase true   # rebase
+            33
*** syncing chrisadr
 

-            34
  git config pull.ff only       # fast-forward only
+            34
*** synced chrisadr
 

-            35
+            35
 * Sync succeeded
 

-            36
You can replace "git config" with "git config --global" to set a default
+            36
$ git log --format=%ci -1
 

-            37
preference for all repositories. You can also pass --rebase, --no-rebase,
+            37
$ git show -q --pretty=format:%G? HEAD
 

-            38
or --ff-only on the command line to override the configured default per
+            38
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 chrisadr
 

-            39
invocation.
-

-            40
-

-            41
Already up to date.
-

-            42
*** syncing chrisadr
-

-            43
*** synced chrisadr
-

-            44
 * Sync succeeded
-

-            45
$ git log --format=%ci -1
-

-            46
$ git show -q --pretty=format:%G? HEAD
-

-            47
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 chrisadr
-

-            48
 * Cache regenerated successfully
+            39
 * Cache regenerated successfully
 

 
         
diff --git a/chrisadr.txt b/chrisadr.txt
index acae96cdba27..e3a3a35bbd10 100644
--- a/chrisadr.txt
+++ b/chrisadr.txt
@@ -12,18 +12,9 @@
              'uri': 'git@github.com:ChrisADR/chrisadr-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync chrisadr
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
diff --git a/chrytoo.html b/chrytoo.html
index 94cc7c820a17..b40b314768bf 100644
--- a/chrytoo.html
+++ b/chrytoo.html
@@ -44,73 +44,55 @@
 

             17
$ pmaint sync chrytoo
 

-            18
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
warning: Pulling without specifying how to reconcile divergent branches is
 

-            23
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
discouraged. You can squelch this message by running one of the following
 

-            24
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
commands sometime before your next pull:
 

-            25
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 

-            26
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.rebase false  # merge (the default strategy)
 

-            27
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.rebase true   # rebase
 

-            28
WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
  git config pull.ff only       # fast-forward only
 

-            29
WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
 

-            30
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
You can replace "git config" with "git config --global" to set a default
 

-            31
warning: Pulling without specifying how to reconcile divergent branches is
+            31
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            32
discouraged. You can squelch this message by running one of the following
+            32
or --ff-only on the command line to override the configured default per
 

-            33
commands sometime before your next pull:
+            33
invocation.
 

             34
 

-            35
  git config pull.rebase false  # merge (the default strategy)
+            35
Already up to date.
 

-            36
  git config pull.rebase true   # rebase
+            36
*** syncing chrytoo
 

-            37
  git config pull.ff only       # fast-forward only
+            37
*** synced chrytoo
 

-            38
+            38
 * Sync succeeded
 

-            39
You can replace "git config" with "git config --global" to set a default
+            39
$ git log --format=%ci -1
 

-            40
preference for all repositories. You can also pass --rebase, --no-rebase,
+            40
$ git show -q --pretty=format:%G? HEAD
 

-            41
or --ff-only on the command line to override the configured default per
+            41
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 chrytoo
 

-            42
invocation.
-

-            43
-

-            44
Already up to date.
-

-            45
*** syncing chrytoo
-

-            46
*** synced chrytoo
-

-            47
 * Sync succeeded
-

-            48
$ git log --format=%ci -1
-

-            49
$ git show -q --pretty=format:%G? HEAD
-

-            50
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 chrytoo
-

-            51
 * Cache regenerated successfully
+            42
 * Cache regenerated successfully
 

 
         
diff --git a/chrytoo.txt b/chrytoo.txt
index 74c0fa7d1749..082838ecc92a 100644
--- a/chrytoo.txt
+++ b/chrytoo.txt
@@ -15,18 +15,9 @@
              'uri': 'git@github.com:chrytoo/gentoo-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync chrytoo
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
diff --git a/chutzpah.html b/chutzpah.html
index 4bd2083700f6..114d80cd2310 100644
--- a/chutzpah.html
+++ b/chutzpah.html
@@ -44,68 +44,36 @@
 

             17
$ pmaint sync chutzpah
 

-            18
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            23
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            24
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
Cloning into '/var/lib/repo-mirror-ci/sync/chutzpah'...
 

-            25
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
*** syncing chutzpah
 

-            26
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
*** synced chutzpah
 

-            27
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
 * Sync succeeded
 

-            28
WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
$ git log --format=%ci -1
 

-            29
WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
$ git show -q --pretty=format:%G? HEAD
 

-            30
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 chutzpah
 

-            31
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            32
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            33
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            34
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            35
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            36
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            37
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            38
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            39
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            40
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            41
WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            42
WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            43
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            44
Cloning into '/var/lib/repo-mirror-ci/sync/chutzpah'...
-

-            45
fatal: unable to access 'https://anongit.gentoo.org/git/dev/chutzpah.git/': The requested URL returned error: 504
-

-            46
*** syncing chutzpah
-

-            47
!!! failed syncing chutzpah
-

-            48
 * Sync failed with 1
+            31
 * app-vim/jedi-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
+            32
 * Cache regen failed with 1
+

 
         
     
diff --git a/chutzpah.txt b/chutzpah.txt
index 15d2f37a58b9..695e5f83c3f5 100644
--- a/chutzpah.txt
+++ b/chutzpah.txt
@@ -15,34 +15,18 @@
  'status': 'official'}
  * Adding new repository
 $ pmaint sync chutzpah
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 Cloning into '/var/lib/repo-mirror-ci/sync/chutzpah'...
-fatal: unable to access 'https://anongit.gentoo.org/git/dev/chutzpah.git/': The requested URL returned error: 504
 *** syncing chutzpah
-!!! failed syncing chutzpah
- * Sync failed with 1
+*** synced chutzpah
+ * Sync succeeded
+$ git log --format=%ci -1
+$ git show -q --pretty=format:%G? HEAD
+$ pmaint regen --use-local-desc --pkg-desc-index -t 1 chutzpah
+ * app-vim/jedi-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+ * Cache regen failed with 1
diff --git a/chymeric.html b/chymeric.html
index 7de6437c631e..2ed237629e54 100644
--- a/chymeric.html
+++ b/chymeric.html
@@ -38,71 +38,53 @@
 

             14
$ pmaint sync chymeric
 

-            15
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
warning: Pulling without specifying how to reconcile divergent branches is
 

-            19
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
discouraged. You can squelch this message by running one of the following
 

-            20
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
commands sometime before your next pull:
 

-            21
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
 

-            22
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase false  # merge (the default strategy)
 

-            23
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase true   # rebase
 

-            24
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.ff only       # fast-forward only
 

-            25
WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 

-            26
WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
You can replace "git config" with "git config --global" to set a default
 

-            27
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            28
warning: Pulling without specifying how to reconcile divergent branches is
+            28
or --ff-only on the command line to override the configured default per
 

-            29
discouraged. You can squelch this message by running one of the following
+            29
invocation.
 

-            30
commands sometime before your next pull:
+            30
 

-            31
+            31
Already up to date.
 

-            32
  git config pull.rebase false  # merge (the default strategy)
+            32
*** syncing chymeric
 

-            33
  git config pull.rebase true   # rebase
+            33
*** synced chymeric
 

-            34
  git config pull.ff only       # fast-forward only
+            34
 * Sync succeeded
 

-            35
+            35
$ git log --format=%ci -1
 

-            36
You can replace "git config" with "git config --global" to set a default
+            36
$ git show -q --pretty=format:%G? HEAD
 

-            37
preference for all repositories. You can also pass --rebase, --no-rebase,
+            37
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 chymeric
 

-            38
or --ff-only on the command line to override the configured default per
-

-            39
invocation.
-

-            40
-

-            41
Already up to date.
-

-            42
*** syncing chymeric
-

-            43
*** synced chymeric
-

-            44
 * Sync succeeded
-

-            45
$ git log --format=%ci -1
-

-            46
$ git show -q --pretty=format:%G? HEAD
-

-            47
 * Invalid metadata, removing: Failed instantiating section 'chymeric'
+            38
 * Cache regenerated successfully
 

 
         
diff --git a/chymeric.txt b/chymeric.txt
index b6bc1367b16b..87e0b26e2096 100644
--- a/chymeric.txt
+++ b/chymeric.txt
@@ -12,18 +12,8 @@
              'uri': 'git+ssh://git@github.com/TheChymera/overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync chymeric
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
@@ -44,4 +34,5 @@ Already up to date.
  * Sync succeeded
 $ git log --format=%ci -1
 $ git show -q --pretty=format:%G? HEAD
- * Invalid metadata, removing: Failed instantiating section 'chymeric'
+$ pmaint regen --use-local-desc --pkg-desc-index -t 1 chymeric
+ * Cache regenerated successfully
diff --git a/cj-overlay.html b/cj-overlay.html
index 394c569e0d75..a60f855f0e21 100644
--- a/cj-overlay.html
+++ b/cj-overlay.html
@@ -28,73 +28,51 @@
 

             9
$ pmaint sync cj-overlay
 

-            10
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            10
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            11
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            11
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            12
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
warning: Pulling without specifying how to reconcile divergent branches is
 

-            13
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
discouraged. You can squelch this message by running one of the following
 

-            14
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
commands sometime before your next pull:
 

-            15
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
 

-            16
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
  git config pull.rebase false  # merge (the default strategy)
 

-            17
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
  git config pull.rebase true   # rebase
 

-            18
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
  git config pull.ff only       # fast-forward only
 

-            19
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
 

-            20
WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
You can replace "git config" with "git config --global" to set a default
 

-            21
WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            22
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
or --ff-only on the command line to override the configured default per
 

-            23
warning: Pulling without specifying how to reconcile divergent branches is
+            23
invocation.
 

-            24
discouraged. You can squelch this message by running one of the following
+            24
 

-            25
commands sometime before your next pull:
+            25
Already up to date.
 

-            26
+            26
*** syncing cj-overlay
 

-            27
  git config pull.rebase false  # merge (the default strategy)
+            27
*** synced cj-overlay
 

-            28
  git config pull.rebase true   # rebase
+            28
 * Sync succeeded
 

-            29
  git config pull.ff only       # fast-forward only
+            29
$ git log --format=%ci -1
 

-            30
+            30
$ git show -q --pretty=format:%G? HEAD
 

-            31
You can replace "git config" with "git config --global" to set a default
+            31
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 cj-overlay
 

-            32
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            33
or --ff-only on the command line to override the configured default per
-

-            34
invocation.
-

-            35
-

-            36
Already up to date.
-

-            37
*** syncing cj-overlay
-

-            38
*** synced cj-overlay
-

-            39
 * Sync succeeded
-

-            40
$ git log --format=%ci -1
-

-            41
$ git show -q --pretty=format:%G? HEAD
-

-            42
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 cj-overlay
-

-            43
 * Cache regenerated successfully
+            32
 * Cache regenerated successfully
 

 
         
diff --git a/cj-overlay.txt b/cj-overlay.txt
index d6cbbf55d26b..e2e55102f1e2 100644
--- a/cj-overlay.txt
+++ b/cj-overlay.txt
@@ -7,18 +7,7 @@
  'source': [{'type': 'git', 'uri': 'git://github.com/junghans/cj-overlay'}],
  'status': 'official'}
 $ pmaint sync cj-overlay
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
diff --git a/concaveoverlay.html b/concaveoverlay.html
index dc71d0d90e57..50bf95566a79 100644
--- a/concaveoverlay.html
+++ b/concaveoverlay.html
@@ -30,73 +30,51 @@
 

             10
$ pmaint sync concaveoverlay
 

-            11
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            11
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            12
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
warning: Pulling without specifying how to reconcile divergent branches is
 

-            14
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
discouraged. You can squelch this message by running one of the following
 

-            15
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
commands sometime before your next pull:
 

-            16
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
 

-            17
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
  git config pull.rebase false  # merge (the default strategy)
 

-            18
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
  git config pull.rebase true   # rebase
 

-            19
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
  git config pull.ff only       # fast-forward only
 

-            20
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
 

-            21
WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
You can replace "git config" with "git config --global" to set a default
 

-            22
WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            23
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
or --ff-only on the command line to override the configured default per
 

-            24
warning: Pulling without specifying how to reconcile divergent branches is
+            24
invocation.
 

-            25
discouraged. You can squelch this message by running one of the following
+            25
 

-            26
commands sometime before your next pull:
+            26
Already up to date.
 

-            27
+            27
*** syncing concaveoverlay
 

-            28
  git config pull.rebase false  # merge (the default strategy)
+            28
*** synced concaveoverlay
 

-            29
  git config pull.rebase true   # rebase
+            29
 * Sync succeeded
 

-            30
  git config pull.ff only       # fast-forward only
+            30
$ git log --format=%ci -1
 

-            31
+            31
$ git show -q --pretty=format:%G? HEAD
 

-            32
You can replace "git config" with "git config --global" to set a default
+            32
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 concaveoverlay
 

-            33
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            34
or --ff-only on the command line to override the configured default per
-

-            35
invocation.
-

-            36
-

-            37
Already up to date.
-

-            38
*** syncing concaveoverlay
-

-            39
*** synced concaveoverlay
-

-            40
 * Sync succeeded
-

-            41
$ git log --format=%ci -1
-

-            42
$ git show -q --pretty=format:%G? HEAD
-

-            43
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 concaveoverlay
-

-            44
 * Cache regenerated successfully
+            33
 * Cache regenerated successfully
 

 
         
diff --git a/concaveoverlay.txt b/concaveoverlay.txt
index 8308a8755220..d89c4933f300 100644
--- a/concaveoverlay.txt
+++ b/concaveoverlay.txt
@@ -8,18 +8,7 @@
              'uri': 'https://gitlab.com/concavegit/concaveoverlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync concaveoverlay
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
diff --git a/crocket-overlay.html b/crocket-overlay.html
index 78df843cfa0f..343a42a0c94a 100644
--- a/crocket-overlay.html
+++ b/crocket-overlay.html
@@ -38,73 +38,51 @@
 

             14
$ pmaint sync crocket-overlay
 

-            15
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
warning: Pulling without specifying how to reconcile divergent branches is
 

-            18
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
discouraged. You can squelch this message by running one of the following
 

-            19
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
commands sometime before your next pull:
 

-            20
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
 

-            21
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
  git config pull.rebase false  # merge (the default strategy)
 

-            22
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase true   # rebase
 

-            23
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.ff only       # fast-forward only
 

-            24
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 

-            25
WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
You can replace "git config" with "git config --global" to set a default
 

-            26
WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            27
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
or --ff-only on the command line to override the configured default per
 

-            28
warning: Pulling without specifying how to reconcile divergent branches is
+            28
invocation.
 

-            29
discouraged. You can squelch this message by running one of the following
+            29
 

-            30
commands sometime before your next pull:
+            30
Already up to date.
 

-            31
+            31
*** syncing crocket-overlay
 

-            32
  git config pull.rebase false  # merge (the default strategy)
+            32
*** synced crocket-overlay
 

-            33
  git config pull.rebase true   # rebase
+            33
 * Sync succeeded
 

-            34
  git config pull.ff only       # fast-forward only
+            34
$ git log --format=%ci -1
 

-            35
+            35
$ git show -q --pretty=format:%G? HEAD
 

-            36
You can replace "git config" with "git config --global" to set a default
+            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 crocket-overlay
 

-            37
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            38
or --ff-only on the command line to override the configured default per
-

-            39
invocation.
-

-            40
-

-            41
Already up to date.
-

-            42
*** syncing crocket-overlay
-

-            43
*** synced crocket-overlay
-

-            44
 * Sync succeeded
-

-            45
$ git log --format=%ci -1
-

-            46
$ git show -q --pretty=format:%G? HEAD
-

-            47
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 crocket-overlay
-

-            48
 * Cache regenerated successfully
+            37
 * Cache regenerated successfully
 

 
         
diff --git a/crocket-overlay.txt b/crocket-overlay.txt
index 3656ffd19058..4fe22408c5c6 100644
--- a/crocket-overlay.txt
+++ b/crocket-overlay.txt
@@ -12,18 +12,7 @@
              'uri': 'git+ssh://git@github.com/crocket/crocket-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync crocket-overlay
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
diff --git a/crossdev.html b/crossdev.html
index e0b9b60a1a03..7a2ce72426db 100644
--- a/crossdev.html
+++ b/crossdev.html
@@ -34,73 +34,51 @@
 

             12
$ pmaint sync crossdev
 

-            13
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
warning: Pulling without specifying how to reconcile divergent branches is
 

-            16
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
discouraged. You can squelch this message by running one of the following
 

-            17
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
commands sometime before your next pull:
 

-            18
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
 

-            19
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
  git config pull.rebase false  # merge (the default strategy)
 

-            20
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
  git config pull.rebase true   # rebase
 

-            21
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
  git config pull.ff only       # fast-forward only
 

-            22
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
 

-            23
WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
You can replace "git config" with "git config --global" to set a default
 

-            24
WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            25
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
or --ff-only on the command line to override the configured default per
 

-            26
warning: Pulling without specifying how to reconcile divergent branches is
+            26
invocation.
 

-            27
discouraged. You can squelch this message by running one of the following
+            27
 

-            28
commands sometime before your next pull:
+            28
Already up to date.
 

-            29
+            29
*** syncing crossdev
 

-            30
  git config pull.rebase false  # merge (the default strategy)
+            30
*** synced crossdev
 

-            31
  git config pull.rebase true   # rebase
+            31
 * Sync succeeded
 

-            32
  git config pull.ff only       # fast-forward only
+            32
$ git log --format=%ci -1
 

-            33
+            33
$ git show -q --pretty=format:%G? HEAD
 

-            34
You can replace "git config" with "git config --global" to set a default
+            34
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 crossdev
 

-            35
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            36
or --ff-only on the command line to override the configured default per
-

-            37
invocation.
-

-            38
-

-            39
Already up to date.
-

-            40
*** syncing crossdev
-

-            41
*** synced crossdev
-

-            42
 * Sync succeeded
-

-            43
$ git log --format=%ci -1
-

-            44
$ git show -q --pretty=format:%G? HEAD
-

-            45
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 crossdev
-

-            46
 * Cache regenerated successfully
+            35
 * Cache regenerated successfully
 

 
         
diff --git a/crossdev.txt b/crossdev.txt
index 8713736dc108..4d955f89bb9e 100644
--- a/crossdev.txt
+++ b/crossdev.txt
@@ -10,18 +10,7 @@
  'source': [{'type': 'git', 'uri': 'git://github.com/alphallc/crossdev'}],
  'status': 'unofficial'}
 $ pmaint sync crossdev
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
diff --git a/cynede.html b/cynede.html
index f395da8726d3..10848e92ea89 100644
--- a/cynede.html
+++ b/cynede.html
@@ -40,73 +40,51 @@
 

             15
$ pmaint sync cynede
 

-            16
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
warning: Pulling without specifying how to reconcile divergent branches is
 

-            19
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
discouraged. You can squelch this message by running one of the following
 

-            20
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
commands sometime before your next pull:
 

-            21
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
 

-            22
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase false  # merge (the default strategy)
 

-            23
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase true   # rebase
 

-            24
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.ff only       # fast-forward only
 

-            25
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 

-            26
WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
You can replace "git config" with "git config --global" to set a default
 

-            27
WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            28
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
or --ff-only on the command line to override the configured default per
 

-            29
warning: Pulling without specifying how to reconcile divergent branches is
+            29
invocation.
 

-            30
discouraged. You can squelch this message by running one of the following
+            30
 

-            31
commands sometime before your next pull:
+            31
Already up to date.
 

-            32
+            32
*** syncing cynede
 

-            33
  git config pull.rebase false  # merge (the default strategy)
+            33
*** synced cynede
 

-            34
  git config pull.rebase true   # rebase
+            34
 * Sync succeeded
 

-            35
  git config pull.ff only       # fast-forward only
+            35
$ git log --format=%ci -1
 

-            36
+            36
$ git show -q --pretty=format:%G? HEAD
 

-            37
You can replace "git config" with "git config --global" to set a default
+            37
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 cynede
 

-            38
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            39
or --ff-only on the command line to override the configured default per
-

-            40
invocation.
-

-            41
-

-            42
Already up to date.
-

-            43
*** syncing cynede
-

-            44
*** synced cynede
-

-            45
 * Sync succeeded
-

-            46
$ git log --format=%ci -1
-

-            47
$ git show -q --pretty=format:%G? HEAD
-

-            48
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 cynede
-

-            49
 * Cache regenerated successfully
+            38
 * Cache regenerated successfully
 

 
         
diff --git a/cynede.txt b/cynede.txt
index 172eedabb391..4ded03f670be 100644
--- a/cynede.txt
+++ b/cynede.txt
@@ -13,18 +13,7 @@
             {'type': 'git', 'uri': 'git@github.com:Heather/gentoo-cynede.git'}],
  'status': 'unofficial'}
 $ pmaint sync cynede
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
diff --git a/dMaggot.html b/dMaggot.html
index e09b6d4a925b..7698a5d5e045 100644
--- a/dMaggot.html
+++ b/dMaggot.html
@@ -38,77 +38,53 @@
 

             14
 'status': 'unofficial'}
 

-            15
 * Adding new repository
+            15
$ pmaint sync dMaggot
 

-            16
$ pmaint sync dMaggot
+            16
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
warning: Pulling without specifying how to reconcile divergent branches is
 

-            19
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
discouraged. You can squelch this message by running one of the following
 

-            20
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
commands sometime before your next pull:
 

-            21
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
 

-            22
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase false  # merge (the default strategy)
 

-            23
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase true   # rebase
 

-            24
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.ff only       # fast-forward only
 

-            25
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 

-            26
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
You can replace "git config" with "git config --global" to set a default
 

-            27
WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            28
WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
or --ff-only on the command line to override the configured default per
 

-            29
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
invocation.
 

-            30
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
 

-            31
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
Already up to date.
 

-            32
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
*** syncing dMaggot
 

-            33
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
*** synced dMaggot
 

-            34
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
 * Sync succeeded
 

-            35
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
$ git log --format=%ci -1
 

-            36
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
$ git show -q --pretty=format:%G? HEAD
 

-            37
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            37
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 dMaggot
 

-            38
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            39
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            40
WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            41
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            42
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            43
Cloning into '/var/lib/repo-mirror-ci/sync/dMaggot'...
-

-            44
*** syncing dMaggot
-

-            45
*** synced dMaggot
-

-            46
 * Sync succeeded
-

-            47
$ git log --format=%ci -1
-

-            48
$ git show -q --pretty=format:%G? HEAD
-

-            49
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 dMaggot
-

-            50
 * Cache regenerated successfully
+            38
 * Cache regenerated successfully
 

 
         
diff --git a/dMaggot.txt b/dMaggot.txt
index 89a809c7f2e6..0222d1e01b84 100644
--- a/dMaggot.txt
+++ b/dMaggot.txt
@@ -12,35 +12,23 @@
             {'type': 'git',
              'uri': 'git+ssh://git@git.gentoo.org/user/dMaggot.git'}],
  'status': 'unofficial'}
- * Adding new repository
 $ pmaint sync dMaggot
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-Cloning into '/var/lib/repo-mirror-ci/sync/dMaggot'...
+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.
+
+Already up to date.
 *** syncing dMaggot
 *** synced dMaggot
  * Sync succeeded
diff --git a/darkelf.html b/darkelf.html
index bfaff851f57e..f378a747036f 100644
--- a/darkelf.html
+++ b/darkelf.html
@@ -38,68 +38,26 @@
 

             14
$ pmaint sync darkelf
 

-            15
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
Cloning into '/var/lib/repo-mirror-ci/sync/darkelf'...
 

-            18
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
*** syncing darkelf
 

-            19
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
*** synced darkelf
 

-            20
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
 * Sync succeeded
 

-            21
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
$ git log --format=%ci -1
 

-            22
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
$ git show -q --pretty=format:%G? HEAD
 

-            23
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 darkelf
 

-            24
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 * Cache regenerated successfully
 

-            25
WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            26
WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            27
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            28
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            29
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            30
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            31
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            32
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            33
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            34
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            35
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            36
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            37
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            38
WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            39
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            40
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            41
Cloning into '/var/lib/repo-mirror-ci/sync/darkelf'...
-

-            42
fatal: unable to access 'https://anongit.gentoo.org/git/repo/user/darkelf.git/': The requested URL returned error: 504
-

-            43
*** syncing darkelf
-

-            44
!!! failed syncing darkelf
-

-            45
 * Sync failed with 1
-
[FATAL]
 
         
     
diff --git a/darkelf.txt b/darkelf.txt
index 3736ce27cf21..b066215e96b0 100644
--- a/darkelf.txt
+++ b/darkelf.txt
@@ -12,34 +12,13 @@
  'status': 'unofficial'}
  * Adding new repository
 $ pmaint sync darkelf
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 Cloning into '/var/lib/repo-mirror-ci/sync/darkelf'...
-fatal: unable to access 'https://anongit.gentoo.org/git/repo/user/darkelf.git/': The requested URL returned error: 504
 *** syncing darkelf
-!!! failed syncing darkelf
- * Sync failed with 1
+*** synced darkelf
+ * Sync succeeded
+$ git log --format=%ci -1
+$ git show -q --pretty=format:%G? HEAD
+$ pmaint regen --use-local-desc --pkg-desc-index -t 1 darkelf
+ * Cache regenerated successfully
diff --git a/darthgandalf-overlay.html b/darthgandalf-overlay.html
index a9c6e7561917..5719b46f8500 100644
--- a/darthgandalf-overlay.html
+++ b/darthgandalf-overlay.html
@@ -38,73 +38,51 @@
 

             14
$ pmaint sync darthgandalf-overlay
 

-            15
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
warning: Pulling without specifying how to reconcile divergent branches is
 

-            18
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
discouraged. You can squelch this message by running one of the following
 

-            19
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
commands sometime before your next pull:
 

-            20
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
 

-            21
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
  git config pull.rebase false  # merge (the default strategy)
 

-            22
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase true   # rebase
 

-            23
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.ff only       # fast-forward only
 

-            24
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 

-            25
WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
You can replace "git config" with "git config --global" to set a default
 

-            26
WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            27
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
or --ff-only on the command line to override the configured default per
 

-            28
warning: Pulling without specifying how to reconcile divergent branches is
+            28
invocation.
 

-            29
discouraged. You can squelch this message by running one of the following
+            29
 

-            30
commands sometime before your next pull:
+            30
Already up to date.
 

-            31
+            31
*** syncing darthgandalf-overlay
 

-            32
  git config pull.rebase false  # merge (the default strategy)
+            32
*** synced darthgandalf-overlay
 

-            33
  git config pull.rebase true   # rebase
+            33
 * Sync succeeded
 

-            34
  git config pull.ff only       # fast-forward only
+            34
$ git log --format=%ci -1
 

-            35
+            35
$ git show -q --pretty=format:%G? HEAD
 

-            36
You can replace "git config" with "git config --global" to set a default
+            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 darthgandalf-overlay
 

-            37
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            38
or --ff-only on the command line to override the configured default per
-

-            39
invocation.
-

-            40
-

-            41
Already up to date.
-

-            42
*** syncing darthgandalf-overlay
-

-            43
*** synced darthgandalf-overlay
-

-            44
 * Sync succeeded
-

-            45
$ git log --format=%ci -1
-

-            46
$ git show -q --pretty=format:%G? HEAD
-

-            47
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 darthgandalf-overlay
-

-            48
 * Cache regenerated successfully
+            37
 * Cache regenerated successfully
 

 
         
diff --git a/darthgandalf-overlay.txt b/darthgandalf-overlay.txt
index bb20e2e8f19a..6943267e7219 100644
--- a/darthgandalf-overlay.txt
+++ b/darthgandalf-overlay.txt
@@ -12,18 +12,7 @@
              'uri': 'git+ssh://git@github.com/DarthGandalf/gentoo-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync darthgandalf-overlay
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
diff --git a/deadbeef-overlay.html b/deadbeef-overlay.html
index eb8ae1261bf8..b623eb9ebc8e 100644
--- a/deadbeef-overlay.html
+++ b/deadbeef-overlay.html
@@ -34,75 +34,49 @@
 

             12
$ pmaint sync deadbeef-overlay
 

-            13
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
warning: Pulling without specifying how to reconcile divergent branches is
 

-            15
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
discouraged. You can squelch this message by running one of the following
 

-            16
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
commands sometime before your next pull:
 

-            17
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
 

-            18
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
  git config pull.rebase false  # merge (the default strategy)
 

-            19
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
  git config pull.rebase true   # rebase
 

-            20
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
  git config pull.ff only       # fast-forward only
 

-            21
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
 

-            22
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
You can replace "git config" with "git config --global" to set a default
 

-            23
WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            24
WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
or --ff-only on the command line to override the configured default per
 

-            25
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
invocation.
 

-            26
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
 

-            27
warning: Pulling without specifying how to reconcile divergent branches is
+            27
Already up to date.
 

-            28
discouraged. You can squelch this message by running one of the following
+            28
*** syncing deadbeef-overlay
 

-            29
commands sometime before your next pull:
+            29
*** synced deadbeef-overlay
 

-            30
+            30
 * Sync succeeded
 

-            31
  git config pull.rebase false  # merge (the default strategy)
+            31
$ git log --format=%ci -1
 

-            32
  git config pull.rebase true   # rebase
+            32
$ git show -q --pretty=format:%G? HEAD
 

-            33
  git config pull.ff only       # fast-forward only
+            33
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 deadbeef-overlay
 

-            34
-

-            35
You can replace "git config" with "git config --global" to set a default
-

-            36
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            37
or --ff-only on the command line to override the configured default per
-

-            38
invocation.
-

-            39
-

-            40
Already up to date.
-

-            41
*** syncing deadbeef-overlay
-

-            42
*** synced deadbeef-overlay
-

-            43
 * Sync succeeded
-

-            44
$ git log --format=%ci -1
-

-            45
$ git show -q --pretty=format:%G? HEAD
-

-            46
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 deadbeef-overlay
-

-            47
 * Cache regenerated successfully
+            34
 * Cache regenerated successfully
 

 
         
diff --git a/deadbeef-overlay.txt b/deadbeef-overlay.txt
index eedca6ce072a..bf51f6e29f78 100644
--- a/deadbeef-overlay.txt
+++ b/deadbeef-overlay.txt
@@ -10,19 +10,6 @@
              'uri': 'https://github.com/damex/deadbeef-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync deadbeef-overlay
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
diff --git a/decent-im.html b/decent-im.html
index 2cc812d7074e..4aedc80341f6 100644
--- a/decent-im.html
+++ b/decent-im.html
@@ -38,73 +38,53 @@
 

             14
$ pmaint sync decent-im
 

-            15
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
warning: Pulling without specifying how to reconcile divergent branches is
 

-            19
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
discouraged. You can squelch this message by running one of the following
 

-            20
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
commands sometime before your next pull:
 

-            21
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
 

-            22
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase false  # merge (the default strategy)
 

-            23
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase true   # rebase
 

-            24
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.ff only       # fast-forward only
 

-            25
WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 

-            26
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
You can replace "git config" with "git config --global" to set a default
 

-            27
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            28
warning: Pulling without specifying how to reconcile divergent branches is
+            28
or --ff-only on the command line to override the configured default per
 

-            29
discouraged. You can squelch this message by running one of the following
+            29
invocation.
 

-            30
commands sometime before your next pull:
+            30
 

-            31
+            31
Already up to date.
 

-            32
  git config pull.rebase false  # merge (the default strategy)
+            32
*** syncing decent-im
 

-            33
  git config pull.rebase true   # rebase
+            33
*** synced decent-im
 

-            34
  git config pull.ff only       # fast-forward only
+            34
 * Sync succeeded
 

-            35
+            35
$ git log --format=%ci -1
 

-            36
You can replace "git config" with "git config --global" to set a default
+            36
$ git show -q --pretty=format:%G? HEAD
 

-            37
preference for all repositories. You can also pass --rebase, --no-rebase,
+            37
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 decent-im
 

-            38
or --ff-only on the command line to override the configured default per
-

-            39
invocation.
-

-            40
-

-            41
Already up to date.
-

-            42
*** syncing decent-im
-

-            43
*** synced decent-im
-

-            44
 * Sync succeeded
-

-            45
$ git log --format=%ci -1
-

-            46
$ git show -q --pretty=format:%G? HEAD
-

-            47
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 decent-im
-

-            48
 * Cache regenerated successfully
+            38
 * Cache regenerated successfully
 

 
         
diff --git a/decent-im.txt b/decent-im.txt
index e4f768343417..d24dad174814 100644
--- a/decent-im.txt
+++ b/decent-im.txt
@@ -12,17 +12,7 @@
              'uri': 'git+ssh://git@github.com/decent-im/gentoo-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync decent-im
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
diff --git a/deepin.html b/deepin.html
index 3fdf96e7aeab..eb013d26bd14 100644
--- a/deepin.html
+++ b/deepin.html
@@ -34,73 +34,49 @@
 

             12
$ pmaint sync deepin
 

-            13
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
warning: Pulling without specifying how to reconcile divergent branches is
 

-            15
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
discouraged. You can squelch this message by running one of the following
 

-            16
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
commands sometime before your next pull:
 

-            17
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
 

-            18
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
  git config pull.rebase false  # merge (the default strategy)
 

-            19
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
  git config pull.rebase true   # rebase
 

-            20
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
  git config pull.ff only       # fast-forward only
 

-            21
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
 

-            22
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
You can replace "git config" with "git config --global" to set a default
 

-            23
WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            24
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
or --ff-only on the command line to override the configured default per
 

-            25
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
invocation.
 

-            26
warning: Pulling without specifying how to reconcile divergent branches is
+            26
 

-            27
discouraged. You can squelch this message by running one of the following
+            27
Already up to date.
 

-            28
commands sometime before your next pull:
+            28
*** syncing deepin
 

-            29
+            29
*** synced deepin
 

-            30
  git config pull.rebase false  # merge (the default strategy)
+            30
 * Sync succeeded
 

-            31
  git config pull.rebase true   # rebase
+            31
$ git log --format=%ci -1
 

-            32
  git config pull.ff only       # fast-forward only
+            32
$ git show -q --pretty=format:%G? HEAD
 

-            33
+            33
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 deepin
 

-            34
You can replace "git config" with "git config --global" to set a default
-

-            35
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            36
or --ff-only on the command line to override the configured default per
-

-            37
invocation.
-

-            38
-

-            39
Already up to date.
-

-            40
*** syncing deepin
-

-            41
*** synced deepin
-

-            42
 * Sync succeeded
-

-            43
$ git log --format=%ci -1
-

-            44
$ git show -q --pretty=format:%G? HEAD
-

-            45
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 deepin
-

-            46
 * Cache regenerated successfully
+            34
 * Cache regenerated successfully
 

 
         
diff --git a/deepin.txt b/deepin.txt
index 94cea0ca8163..fba686cbe7ee 100644
--- a/deepin.txt
+++ b/deepin.txt
@@ -10,18 +10,6 @@
              'uri': 'git://github.com/zhtengw/deepin-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync deepin
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
diff --git a/defiance.html b/defiance.html
index 31a7d912ee2a..d9685b6fd980 100644
--- a/defiance.html
+++ b/defiance.html
@@ -36,73 +36,49 @@
 

             13
$ pmaint sync defiance
 

-            14
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
warning: Pulling without specifying how to reconcile divergent branches is
 

-            16
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
discouraged. You can squelch this message by running one of the following
 

-            17
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
commands sometime before your next pull:
 

-            18
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
 

-            19
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
  git config pull.rebase false  # merge (the default strategy)
 

-            20
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
  git config pull.rebase true   # rebase
 

-            21
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
  git config pull.ff only       # fast-forward only
 

-            22
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
 

-            23
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
You can replace "git config" with "git config --global" to set a default
 

-            24
WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            25
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
or --ff-only on the command line to override the configured default per
 

-            26
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
invocation.
 

-            27
warning: Pulling without specifying how to reconcile divergent branches is
+            27
 

-            28
discouraged. You can squelch this message by running one of the following
+            28
Already up to date.
 

-            29
commands sometime before your next pull:
+            29
*** syncing defiance
 

-            30
+            30
*** synced defiance
 

-            31
  git config pull.rebase false  # merge (the default strategy)
+            31
 * Sync succeeded
 

-            32
  git config pull.rebase true   # rebase
+            32
$ git log --format=%ci -1
 

-            33
  git config pull.ff only       # fast-forward only
+            33
$ git show -q --pretty=format:%G? HEAD
 

-            34
+            34
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 defiance
 

-            35
You can replace "git config" with "git config --global" to set a default
-

-            36
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            37
or --ff-only on the command line to override the configured default per
-

-            38
invocation.
-

-            39
-

-            40
Already up to date.
-

-            41
*** syncing defiance
-

-            42
*** synced defiance
-

-            43
 * Sync succeeded
-

-            44
$ git log --format=%ci -1
-

-            45
$ git show -q --pretty=format:%G? HEAD
-

-            46
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 defiance
-

-            47
 * Cache regenerated successfully
+            35
 * Cache regenerated successfully
 

 
         
diff --git a/defiance.txt b/defiance.txt
index 4182ee33ad2b..32de452320f9 100644
--- a/defiance.txt
+++ b/defiance.txt
@@ -11,18 +11,6 @@
             {'type': 'git', 'uri': 'git@github.com:d3fy/defiance-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync defiance
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
diff --git a/delicious-absurdities.html b/delicious-absurdities.html
index 388360b1db36..45e5e6aa18de 100644
--- a/delicious-absurdities.html
+++ b/delicious-absurdities.html
@@ -42,73 +42,49 @@
 

             16
$ pmaint sync delicious-absurdities
 

-            17
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
warning: Pulling without specifying how to reconcile divergent branches is
 

-            19
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
discouraged. You can squelch this message by running one of the following
 

-            20
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
commands sometime before your next pull:
 

-            21
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
 

-            22
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase false  # merge (the default strategy)
 

-            23
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase true   # rebase
 

-            24
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.ff only       # fast-forward only
 

-            25
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 

-            26
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
You can replace "git config" with "git config --global" to set a default
 

-            27
WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            28
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
or --ff-only on the command line to override the configured default per
 

-            29
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
invocation.
 

-            30
warning: Pulling without specifying how to reconcile divergent branches is
+            30
 

-            31
discouraged. You can squelch this message by running one of the following
+            31
Already up to date.
 

-            32
commands sometime before your next pull:
+            32
*** syncing delicious-absurdities
 

-            33
+            33
*** synced delicious-absurdities
 

-            34
  git config pull.rebase false  # merge (the default strategy)
+            34
 * Sync succeeded
 

-            35
  git config pull.rebase true   # rebase
+            35
$ git log --format=%ci -1
 

-            36
  git config pull.ff only       # fast-forward only
+            36
$ git show -q --pretty=format:%G? HEAD
 

-            37
+            37
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 delicious-absurdities
 

-            38
You can replace "git config" with "git config --global" to set a default
-

-            39
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            40
or --ff-only on the command line to override the configured default per
-

-            41
invocation.
-

-            42
-

-            43
Already up to date.
-

-            44
*** syncing delicious-absurdities
-

-            45
*** synced delicious-absurdities
-

-            46
 * Sync succeeded
-

-            47
$ git log --format=%ci -1
-

-            48
$ git show -q --pretty=format:%G? HEAD
-

-            49
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 delicious-absurdities
-

-            50
 * Cache regenerated successfully
+            38
 * Cache regenerated successfully
 

 
         
diff --git a/delicious-absurdities.txt b/delicious-absurdities.txt
index c80339caaa27..fa4f8dae4515 100644
--- a/delicious-absurdities.txt
+++ b/delicious-absurdities.txt
@@ -14,18 +14,6 @@
              'uri': 'git@github.com:paraenggu/delicious-absurdities-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync delicious-absurdities
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
diff --git a/deter.html b/deter.html
index c851f612e54a..b014c8c8958a 100644
--- a/deter.html
+++ b/deter.html
@@ -36,75 +36,51 @@
 

             13
$ pmaint sync deter
 

-            14
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
warning: Pulling without specifying how to reconcile divergent branches is
 

-            16
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
discouraged. You can squelch this message by running one of the following
 

-            17
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
commands sometime before your next pull:
 

-            18
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
 

-            19
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
  git config pull.rebase false  # merge (the default strategy)
 

-            20
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
  git config pull.rebase true   # rebase
 

-            21
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
  git config pull.ff only       # fast-forward only
 

-            22
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
 

-            23
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
You can replace "git config" with "git config --global" to set a default
 

-            24
WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            25
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
or --ff-only on the command line to override the configured default per
 

-            26
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
invocation.
 

-            27
warning: Pulling without specifying how to reconcile divergent branches is
+            27
 

-            28
discouraged. You can squelch this message by running one of the following
+            28
Already up to date.
 

-            29
commands sometime before your next pull:
+            29
*** syncing deter
 

-            30
+            30
*** synced deter
 

-            31
  git config pull.rebase false  # merge (the default strategy)
+            31
 * Sync succeeded
 

-            32
  git config pull.rebase true   # rebase
+            32
$ git log --format=%ci -1
 

-            33
  git config pull.ff only       # fast-forward only
+            33
$ git show -q --pretty=format:%G? HEAD
 

-            34
+            34
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 deter
 

-            35
You can replace "git config" with "git config --global" to set a default
-

-            36
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            37
or --ff-only on the command line to override the configured default per
-

-            38
invocation.
-

-            39
-

-            40
Already up to date.
-

-            41
*** syncing deter
-

-            42
*** synced deter
-

-            43
 * Sync succeeded
-

-            44
$ git log --format=%ci -1
-

-            45
$ git show -q --pretty=format:%G? HEAD
-

-            46
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 deter
-

-            47
 * www-client/firefox-52.9.0: failed sourcing ebuild: inherit requires unknown eclass: mozconfig-v6.52.eclass
+            35
 * www-client/firefox-52.9.0: failed sourcing ebuild: inherit requires unknown eclass: mozconfig-v6.52.eclass
 
[FATAL]
-            48
 * Cache regen failed with 1
+            36
 * Cache regen failed with 1
 

 
         
diff --git a/deter.txt b/deter.txt
index 05c789146900..566863de4108 100644
--- a/deter.txt
+++ b/deter.txt
@@ -11,18 +11,6 @@
             {'type': 'git', 'uri': 'git@github.com:deterenkelt/deter.git'}],
  'status': 'unofficial'}
 $ pmaint sync deter
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
diff --git a/dev1990-overlay.html b/dev1990-overlay.html
index ac76f3ac9b11..aea4f989cd26 100644
--- a/dev1990-overlay.html
+++ b/dev1990-overlay.html
@@ -34,77 +34,49 @@
 

             12
$ pmaint sync dev1990-overlay
 

-            13
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
warning: Pulling without specifying how to reconcile divergent branches is
 

-            15
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
discouraged. You can squelch this message by running one of the following
 

-            16
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
commands sometime before your next pull:
 

-            17
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
 

-            18
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
  git config pull.rebase false  # merge (the default strategy)
 

-            19
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
  git config pull.rebase true   # rebase
 

-            20
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
  git config pull.ff only       # fast-forward only
 

-            21
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
 

-            22
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
You can replace "git config" with "git config --global" to set a default
 

-            23
WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            24
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
or --ff-only on the command line to override the configured default per
 

-            25
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
invocation.
 

-            26
WARNING:pkgcore:dMaggot repo at '/var/lib/repo-mirror-ci/sync/dMaggot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
 

-            27
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
Already up to date.
 

-            28
warning: Pulling without specifying how to reconcile divergent branches is
+            28
*** syncing dev1990-overlay
 

-            29
discouraged. You can squelch this message by running one of the following
+            29
*** synced dev1990-overlay
 

-            30
commands sometime before your next pull:
+            30
 * Sync succeeded
 

-            31
+            31
$ git log --format=%ci -1
 

-            32
  git config pull.rebase false  # merge (the default strategy)
+            32
$ git show -q --pretty=format:%G? HEAD
 

-            33
  git config pull.rebase true   # rebase
+            33
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 dev1990-overlay
 

-            34
  git config pull.ff only       # fast-forward only
-

-            35
-

-            36
You can replace "git config" with "git config --global" to set a default
-

-            37
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            38
or --ff-only on the command line to override the configured default per
-

-            39
invocation.
-

-            40
-

-            41
Already up to date.
-

-            42
*** syncing dev1990-overlay
-

-            43
*** synced dev1990-overlay
-

-            44
 * Sync succeeded
-

-            45
$ git log --format=%ci -1
-

-            46
$ git show -q --pretty=format:%G? HEAD
-

-            47
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 dev1990-overlay
-

-            48
 * Cache regenerated successfully
+            34
 * Cache regenerated successfully
 

 
         
diff --git a/dev1990-overlay.txt b/dev1990-overlay.txt
index 1fdf9c9d7410..ee6cf498567a 100644
--- a/dev1990-overlay.txt
+++ b/dev1990-overlay.txt
@@ -10,21 +10,7 @@
              'uri': 'https://github.com/dev-0x7C6/dev1990-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync dev1990-overlay
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dMaggot repo at '/var/lib/repo-mirror-ci/sync/dMaggot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/devpump-gor.html b/devpump-gor.html
index 4a7c61a70e20..b0ffd6eaa947 100644
--- a/devpump-gor.html
+++ b/devpump-gor.html
@@ -32,77 +32,49 @@
 

             11
$ pmaint sync devpump-gor
 

-            12
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
warning: Pulling without specifying how to reconcile divergent branches is
 

-            14
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
discouraged. You can squelch this message by running one of the following
 

-            15
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
commands sometime before your next pull:
 

-            16
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
 

-            17
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
  git config pull.rebase false  # merge (the default strategy)
 

-            18
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
  git config pull.rebase true   # rebase
 

-            19
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
  git config pull.ff only       # fast-forward only
 

-            20
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
 

-            21
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
You can replace "git config" with "git config --global" to set a default
 

-            22
WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            23
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
or --ff-only on the command line to override the configured default per
 

-            24
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
invocation.
 

-            25
WARNING:pkgcore:dMaggot repo at '/var/lib/repo-mirror-ci/sync/dMaggot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 

-            26
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
Already up to date.
 

-            27
warning: Pulling without specifying how to reconcile divergent branches is
+            27
*** syncing devpump-gor
 

-            28
discouraged. You can squelch this message by running one of the following
+            28
*** synced devpump-gor
 

-            29
commands sometime before your next pull:
+            29
 * Sync succeeded
 

-            30
+            30
$ git log --format=%ci -1
 

-            31
  git config pull.rebase false  # merge (the default strategy)
+            31
$ git show -q --pretty=format:%G? HEAD
 

-            32
  git config pull.rebase true   # rebase
+            32
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 devpump-gor
 

-            33
  git config pull.ff only       # fast-forward only
-

-            34
-

-            35
You can replace "git config" with "git config --global" to set a default
-

-            36
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            37
or --ff-only on the command line to override the configured default per
-

-            38
invocation.
-

-            39
-

-            40
Already up to date.
-

-            41
*** syncing devpump-gor
-

-            42
*** synced devpump-gor
-

-            43
 * Sync succeeded
-

-            44
$ git log --format=%ci -1
-

-            45
$ git show -q --pretty=format:%G? HEAD
-

-            46
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 devpump-gor
-

-            47
 * Cache regenerated successfully
+            33
 * Cache regenerated successfully
 

 
         
diff --git a/devpump-gor.txt b/devpump-gor.txt
index f34a25f786f2..d48d9aca12c6 100644
--- a/devpump-gor.txt
+++ b/devpump-gor.txt
@@ -9,21 +9,7 @@
              'uri': 'https://github.com/DevPump/gentoo-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync devpump-gor
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dMaggot repo at '/var/lib/repo-mirror-ci/sync/dMaggot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/didactic-duck.html b/didactic-duck.html
index 56a978ba3075..83cf1c34575d 100644
--- a/didactic-duck.html
+++ b/didactic-duck.html
@@ -34,77 +34,49 @@
 

             12
$ pmaint sync didactic-duck
 

-            13
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
warning: Pulling without specifying how to reconcile divergent branches is
 

-            15
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
discouraged. You can squelch this message by running one of the following
 

-            16
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
commands sometime before your next pull:
 

-            17
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
 

-            18
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
  git config pull.rebase false  # merge (the default strategy)
 

-            19
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
  git config pull.rebase true   # rebase
 

-            20
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
  git config pull.ff only       # fast-forward only
 

-            21
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
 

-            22
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
You can replace "git config" with "git config --global" to set a default
 

-            23
WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            24
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
or --ff-only on the command line to override the configured default per
 

-            25
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
invocation.
 

-            26
WARNING:pkgcore:dMaggot repo at '/var/lib/repo-mirror-ci/sync/dMaggot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
 

-            27
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
Already up to date.
 

-            28
warning: Pulling without specifying how to reconcile divergent branches is
+            28
*** syncing didactic-duck
 

-            29
discouraged. You can squelch this message by running one of the following
+            29
*** synced didactic-duck
 

-            30
commands sometime before your next pull:
+            30
 * Sync succeeded
 

-            31
+            31
$ git log --format=%ci -1
 

-            32
  git config pull.rebase false  # merge (the default strategy)
+            32
$ git show -q --pretty=format:%G? HEAD
 

-            33
  git config pull.rebase true   # rebase
+            33
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 didactic-duck
 

-            34
  git config pull.ff only       # fast-forward only
-

-            35
-

-            36
You can replace "git config" with "git config --global" to set a default
-

-            37
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            38
or --ff-only on the command line to override the configured default per
-

-            39
invocation.
-

-            40
-

-            41
Already up to date.
-

-            42
*** syncing didactic-duck
-

-            43
*** synced didactic-duck
-

-            44
 * Sync succeeded
-

-            45
$ git log --format=%ci -1
-

-            46
$ git show -q --pretty=format:%G? HEAD
-

-            47
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 didactic-duck
-

-            48
 * Cache regenerated successfully
+            34
 * Cache regenerated successfully
 

 
         
diff --git a/didactic-duck.txt b/didactic-duck.txt
index 055012a6efc2..16654cd58246 100644
--- a/didactic-duck.txt
+++ b/didactic-duck.txt
@@ -10,21 +10,7 @@
              'uri': 'https://github.com/lucianposton/didactic-duck.git'}],
  'status': 'unofficial'}
 $ pmaint sync didactic-duck
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dMaggot repo at '/var/lib/repo-mirror-ci/sync/dMaggot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/dilfridge.html b/dilfridge.html
index 48830648a8c3..185054ef5864 100644
--- a/dilfridge.html
+++ b/dilfridge.html
@@ -46,74 +46,28 @@
 

             18
$ pmaint sync dilfridge
 

-            19
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
Cloning into '/var/lib/repo-mirror-ci/sync/dilfridge'...
 

-            23
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
*** syncing dilfridge
 

-            24
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
*** synced dilfridge
 

-            25
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 * Sync succeeded
 

-            26
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
$ git log --format=%ci -1
 

-            27
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
$ git show -q --pretty=format:%G? HEAD
 

-            28
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 dilfridge
 

-            29
WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
 * Cache regenerated successfully
 

-            30
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            31
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            32
WARNING:pkgcore:dMaggot repo at '/var/lib/repo-mirror-ci/sync/dMaggot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            33
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            34
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            35
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            36
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            37
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            38
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            39
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            40
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            41
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            42
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            43
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            44
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            45
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            46
WARNING:pkgcore:dMaggot repo at '/var/lib/repo-mirror-ci/sync/dMaggot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            47
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            48
Cloning into '/var/lib/repo-mirror-ci/sync/dilfridge'...
-

-            49
fatal: unable to access 'https://anongit.gentoo.org/git/dev/dilfridge.git/': The requested URL returned error: 504
-

-            50
*** syncing dilfridge
-

-            51
!!! failed syncing dilfridge
-

-            52
 * Sync failed with 1
-
[FATAL]
 
         
     
diff --git a/dilfridge.txt b/dilfridge.txt
index 21c72a242e7f..de37c9b19683 100644
--- a/dilfridge.txt
+++ b/dilfridge.txt
@@ -16,37 +16,14 @@
  'status': 'official'}
  * Adding new repository
 $ pmaint sync dilfridge
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dMaggot repo at '/var/lib/repo-mirror-ci/sync/dMaggot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dMaggot repo at '/var/lib/repo-mirror-ci/sync/dMaggot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 Cloning into '/var/lib/repo-mirror-ci/sync/dilfridge'...
-fatal: unable to access 'https://anongit.gentoo.org/git/dev/dilfridge.git/': The requested URL returned error: 504
 *** syncing dilfridge
-!!! failed syncing dilfridge
- * Sync failed with 1
+*** synced dilfridge
+ * Sync succeeded
+$ git log --format=%ci -1
+$ git show -q --pretty=format:%G? HEAD
+$ pmaint regen --use-local-desc --pkg-desc-index -t 1 dilfridge
+ * Cache regenerated successfully
diff --git a/displacer.html b/displacer.html
index fd04e97d3e75..efa32081dc51 100644
--- a/displacer.html
+++ b/displacer.html
@@ -44,74 +44,28 @@
 

             17
$ pmaint sync displacer
 

-            18
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
Cloning into '/var/lib/repo-mirror-ci/sync/displacer'...
 

-            22
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
*** syncing displacer
 

-            23
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
*** synced displacer
 

-            24
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 * Sync succeeded
 

-            25
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
$ git log --format=%ci -1
 

-            26
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
$ git show -q --pretty=format:%G? HEAD
 

-            27
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 displacer
 

-            28
WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
 * Cache regenerated successfully
 

-            29
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            30
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            31
WARNING:pkgcore:dMaggot repo at '/var/lib/repo-mirror-ci/sync/dMaggot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            32
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            33
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            34
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            35
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            36
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            37
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            38
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            39
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            40
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            41
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            42
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            43
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            44
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            45
WARNING:pkgcore:dMaggot repo at '/var/lib/repo-mirror-ci/sync/dMaggot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            46
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            47
Cloning into '/var/lib/repo-mirror-ci/sync/displacer'...
-

-            48
fatal: unable to access 'https://anongit.gentoo.org/git/user/displacer.git/': The requested URL returned error: 504
-

-            49
*** syncing displacer
-

-            50
!!! failed syncing displacer
-

-            51
 * Sync failed with 1
-
[FATAL]
 
         
     
diff --git a/displacer.txt b/displacer.txt
index 56ada68f4ace..6cb69b6d3444 100644
--- a/displacer.txt
+++ b/displacer.txt
@@ -15,37 +15,14 @@
  'status': 'unofficial'}
  * Adding new repository
 $ pmaint sync displacer
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dMaggot repo at '/var/lib/repo-mirror-ci/sync/dMaggot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dMaggot repo at '/var/lib/repo-mirror-ci/sync/dMaggot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 Cloning into '/var/lib/repo-mirror-ci/sync/displacer'...
-fatal: unable to access 'https://anongit.gentoo.org/git/user/displacer.git/': The requested URL returned error: 504
 *** syncing displacer
-!!! failed syncing displacer
- * Sync failed with 1
+*** synced displacer
+ * Sync succeeded
+$ git log --format=%ci -1
+$ git show -q --pretty=format:%G? HEAD
+$ pmaint regen --use-local-desc --pkg-desc-index -t 1 displacer
+ * Cache regenerated successfully
diff --git a/distros.html b/distros.html
index 388cb6c9326d..26d3a41c0508 100644
--- a/distros.html
+++ b/distros.html
@@ -28,75 +28,49 @@
 

             9
$ pmaint sync distros
 

-            10
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            10
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            11
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            11
warning: Pulling without specifying how to reconcile divergent branches is
 

-            12
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
discouraged. You can squelch this message by running one of the following
 

-            13
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
commands sometime before your next pull:
 

-            14
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
 

-            15
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
  git config pull.rebase false  # merge (the default strategy)
 

-            16
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
  git config pull.rebase true   # rebase
 

-            17
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
  git config pull.ff only       # fast-forward only
 

-            18
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
 

-            19
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
You can replace "git config" with "git config --global" to set a default
 

-            20
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            21
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
or --ff-only on the command line to override the configured default per
 

-            22
WARNING:pkgcore:dMaggot repo at '/var/lib/repo-mirror-ci/sync/dMaggot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
invocation.
 

-            23
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
 

-            24
warning: Pulling without specifying how to reconcile divergent branches is
+            24
Already up to date.
 

-            25
discouraged. You can squelch this message by running one of the following
+            25
*** syncing distros
 

-            26
commands sometime before your next pull:
+            26
*** synced distros
 

-            27
+            27
 * Sync succeeded
 

-            28
  git config pull.rebase false  # merge (the default strategy)
+            28
$ git log --format=%ci -1
 

-            29
  git config pull.rebase true   # rebase
+            29
$ git show -q --pretty=format:%G? HEAD
 

-            30
  git config pull.ff only       # fast-forward only
+            30
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 distros
 

-            31
-

-            32
You can replace "git config" with "git config --global" to set a default
-

-            33
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            34
or --ff-only on the command line to override the configured default per
-

-            35
invocation.
-

-            36
-

-            37
Already up to date.
-

-            38
*** syncing distros
-

-            39
*** synced distros
-

-            40
 * Sync succeeded
-

-            41
$ git log --format=%ci -1
-

-            42
$ git show -q --pretty=format:%G? HEAD
-

-            43
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 distros
-

-            44
 * Cache regenerated successfully
+            31
 * Cache regenerated successfully
 

 
         
diff --git a/distros.txt b/distros.txt
index 195d97b0da09..83596ed5cec2 100644
--- a/distros.txt
+++ b/distros.txt
@@ -7,20 +7,7 @@
              'uri': 'git://git.calculate-linux.org/calculate/distros-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync distros
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dMaggot repo at '/var/lib/repo-mirror-ci/sync/dMaggot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/djc.html b/djc.html
index ea31c70b5467..90caf3da510e 100644
--- a/djc.html
+++ b/djc.html
@@ -36,75 +36,49 @@
 

             13
$ pmaint sync djc
 

-            14
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
warning: Pulling without specifying how to reconcile divergent branches is
 

-            16
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
discouraged. You can squelch this message by running one of the following
 

-            17
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
commands sometime before your next pull:
 

-            18
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
 

-            19
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
  git config pull.rebase false  # merge (the default strategy)
 

-            20
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
  git config pull.rebase true   # rebase
 

-            21
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
  git config pull.ff only       # fast-forward only
 

-            22
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
 

-            23
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
You can replace "git config" with "git config --global" to set a default
 

-            24
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            25
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
or --ff-only on the command line to override the configured default per
 

-            26
WARNING:pkgcore:dMaggot repo at '/var/lib/repo-mirror-ci/sync/dMaggot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
invocation.
 

-            27
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
 

-            28
warning: Pulling without specifying how to reconcile divergent branches is
+            28
Already up to date.
 

-            29
discouraged. You can squelch this message by running one of the following
+            29
*** syncing djc
 

-            30
commands sometime before your next pull:
+            30
*** synced djc
 

-            31
+            31
 * Sync succeeded
 

-            32
  git config pull.rebase false  # merge (the default strategy)
+            32
$ git log --format=%ci -1
 

-            33
  git config pull.rebase true   # rebase
+            33
$ git show -q --pretty=format:%G? HEAD
 

-            34
  git config pull.ff only       # fast-forward only
+            34
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 djc
 

-            35
-

-            36
You can replace "git config" with "git config --global" to set a default
-

-            37
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            38
or --ff-only on the command line to override the configured default per
-

-            39
invocation.
-

-            40
-

-            41
Already up to date.
-

-            42
*** syncing djc
-

-            43
*** synced djc
-

-            44
 * Sync succeeded
-

-            45
$ git log --format=%ci -1
-

-            46
$ git show -q --pretty=format:%G? HEAD
-

-            47
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 djc
-

-            48
 * Cache regenerated successfully
+            35
 * Cache regenerated successfully
 

 
         
diff --git a/djc.txt b/djc.txt
index d86fd5fc2e5c..f4ae24f95bc8 100644
--- a/djc.txt
+++ b/djc.txt
@@ -11,20 +11,7 @@
             {'type': 'git', 'uri': 'git@github.com:djc/djc-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync djc
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dMaggot repo at '/var/lib/repo-mirror-ci/sync/dMaggot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/dlang.html b/dlang.html
index 43a30c264ad8..d59d25d77697 100644
--- a/dlang.html
+++ b/dlang.html
@@ -34,75 +34,49 @@
 

             12
$ pmaint sync dlang
 

-            13
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
warning: Pulling without specifying how to reconcile divergent branches is
 

-            15
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
discouraged. You can squelch this message by running one of the following
 

-            16
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
commands sometime before your next pull:
 

-            17
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
 

-            18
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
  git config pull.rebase false  # merge (the default strategy)
 

-            19
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
  git config pull.rebase true   # rebase
 

-            20
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
  git config pull.ff only       # fast-forward only
 

-            21
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
 

-            22
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
You can replace "git config" with "git config --global" to set a default
 

-            23
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            24
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
or --ff-only on the command line to override the configured default per
 

-            25
WARNING:pkgcore:dMaggot repo at '/var/lib/repo-mirror-ci/sync/dMaggot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
invocation.
 

-            26
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
 

-            27
warning: Pulling without specifying how to reconcile divergent branches is
+            27
Already up to date.
 

-            28
discouraged. You can squelch this message by running one of the following
+            28
*** syncing dlang
 

-            29
commands sometime before your next pull:
+            29
*** synced dlang
 

-            30
+            30
 * Sync succeeded
 

-            31
  git config pull.rebase false  # merge (the default strategy)
+            31
$ git log --format=%ci -1
 

-            32
  git config pull.rebase true   # rebase
+            32
$ git show -q --pretty=format:%G? HEAD
 

-            33
  git config pull.ff only       # fast-forward only
+            33
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 dlang
 

-            34
-

-            35
You can replace "git config" with "git config --global" to set a default
-

-            36
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            37
or --ff-only on the command line to override the configured default per
-

-            38
invocation.
-

-            39
-

-            40
Already up to date.
-

-            41
*** syncing dlang
-

-            42
*** synced dlang
-

-            43
 * Sync succeeded
-

-            44
$ git log --format=%ci -1
-

-            45
$ git show -q --pretty=format:%G? HEAD
-

-            46
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 dlang
-

-            47
 * Cache regenerated successfully
+            34
 * Cache regenerated successfully
 

 
         
diff --git a/dlang.txt b/dlang.txt
index d5a9cfb24ae6..f9757d9d1941 100644
--- a/dlang.txt
+++ b/dlang.txt
@@ -10,20 +10,7 @@
             {'type': 'git', 'uri': 'git://github.com/gentoo/dlang.git'}],
  'status': 'unofficial'}
 $ pmaint sync dlang
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dMaggot repo at '/var/lib/repo-mirror-ci/sync/dMaggot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/dmchurch.html b/dmchurch.html
index 6f9413cdca43..3e73b89ea554 100644
--- a/dmchurch.html
+++ b/dmchurch.html
@@ -42,75 +42,49 @@
 

             16
$ pmaint sync dmchurch
 

-            17
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
warning: Pulling without specifying how to reconcile divergent branches is
 

-            19
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
discouraged. You can squelch this message by running one of the following
 

-            20
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
commands sometime before your next pull:
 

-            21
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
 

-            22
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase false  # merge (the default strategy)
 

-            23
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase true   # rebase
 

-            24
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.ff only       # fast-forward only
 

-            25
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 

-            26
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
You can replace "git config" with "git config --global" to set a default
 

-            27
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            28
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
or --ff-only on the command line to override the configured default per
 

-            29
WARNING:pkgcore:dMaggot repo at '/var/lib/repo-mirror-ci/sync/dMaggot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
invocation.
 

-            30
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
 

-            31
warning: Pulling without specifying how to reconcile divergent branches is
+            31
Already up to date.
 

-            32
discouraged. You can squelch this message by running one of the following
+            32
*** syncing dmchurch
 

-            33
commands sometime before your next pull:
+            33
*** synced dmchurch
 

-            34
+            34
 * Sync succeeded
 

-            35
  git config pull.rebase false  # merge (the default strategy)
+            35
$ git log --format=%ci -1
 

-            36
  git config pull.rebase true   # rebase
+            36
$ git show -q --pretty=format:%G? HEAD
 

-            37
  git config pull.ff only       # fast-forward only
+            37
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 dmchurch
 

-            38
-

-            39
You can replace "git config" with "git config --global" to set a default
-

-            40
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            41
or --ff-only on the command line to override the configured default per
-

-            42
invocation.
-

-            43
-

-            44
Already up to date.
-

-            45
*** syncing dmchurch
-

-            46
*** synced dmchurch
-

-            47
 * Sync succeeded
-

-            48
$ git log --format=%ci -1
-

-            49
$ git show -q --pretty=format:%G? HEAD
-

-            50
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 dmchurch
-

-            51
 * Cache regenerated successfully
+            38
 * Cache regenerated successfully
 

 
         
diff --git a/dmchurch.txt b/dmchurch.txt
index 9e03ce903a85..0a76058a2463 100644
--- a/dmchurch.txt
+++ b/dmchurch.txt
@@ -14,20 +14,7 @@
              'uri': 'git@github.com:dmchurch/portage-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync dmchurch
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dMaggot repo at '/var/lib/repo-mirror-ci/sync/dMaggot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/docker.html b/docker.html
index edb5f2aa259d..535368f2627c 100644
--- a/docker.html
+++ b/docker.html
@@ -40,109 +40,83 @@
 

             15
$ pmaint sync docker
 

-            16
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
warning: Pulling without specifying how to reconcile divergent branches is
 

-            18
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
discouraged. You can squelch this message by running one of the following
 

-            19
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
commands sometime before your next pull:
 

-            20
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
 

-            21
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
  git config pull.rebase false  # merge (the default strategy)
 

-            22
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase true   # rebase
 

-            23
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.ff only       # fast-forward only
 

-            24
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 

-            25
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
You can replace "git config" with "git config --global" to set a default
 

-            26
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            27
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
or --ff-only on the command line to override the configured default per
 

-            28
WARNING:pkgcore:dMaggot repo at '/var/lib/repo-mirror-ci/sync/dMaggot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
invocation.
 

-            29
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
 

-            30
warning: Pulling without specifying how to reconcile divergent branches is
+            30
Already up to date.
 

-            31
discouraged. You can squelch this message by running one of the following
+            31
*** syncing docker
 

-            32
commands sometime before your next pull:
+            32
*** synced docker
 

-            33
+            33
 * Sync succeeded
 

-            34
  git config pull.rebase false  # merge (the default strategy)
+            34
$ git log --format=%ci -1
 

-            35
  git config pull.rebase true   # rebase
+            35
$ git show -q --pretty=format:%G? HEAD
 

-            36
  git config pull.ff only       # fast-forward only
+            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 docker
 

-            37
-

-            38
You can replace "git config" with "git config --global" to set a default
-

-            39
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            40
or --ff-only on the command line to override the configured default per
-

-            41
invocation.
-

-            42
-

-            43
Already up to date.
-

-            44
*** syncing docker
-

-            45
*** synced docker
-

-            46
 * Sync succeeded
-

-            47
$ git log --format=%ci -1
-

-            48
$ git show -q --pretty=format:%G? HEAD
-

-            49
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 docker
-

-            50
 * app-emulation/docker-0.5.3: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            37
 * app-emulation/docker-0.5.3: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            51
 * app-emulation/docker-0.6.0: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            38
 * app-emulation/docker-0.6.0: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            52
 * app-emulation/docker-0.6.1-r1: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            39
 * app-emulation/docker-0.6.1-r1: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            53
 * app-emulation/docker-0.6.1-r2: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            40
 * app-emulation/docker-0.6.1-r2: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            54
 * app-emulation/docker-0.6.1-r3: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            41
 * app-emulation/docker-0.6.1-r3: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            55
 * app-emulation/docker-0.6.1-r4: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            42
 * app-emulation/docker-0.6.1-r4: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            56
 * app-emulation/docker-0.6.2: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            43
 * app-emulation/docker-0.6.2: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            57
 * app-emulation/docker-0.6.2-r1: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            44
 * app-emulation/docker-0.6.2-r1: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            58
 * app-emulation/docker-0.6.3: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            45
 * app-emulation/docker-0.6.3: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            59
 * app-emulation/docker-0.6.3-r1: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            46
 * app-emulation/docker-0.6.3-r1: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            60
 * app-emulation/docker-0.6.4: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            47
 * app-emulation/docker-0.6.4: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            61
 * app-emulation/docker-0.6.5: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            48
 * app-emulation/docker-0.6.5: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            62
 * app-emulation/docker-0.6.6: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            49
 * app-emulation/docker-0.6.6: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            63
 * app-emulation/docker-0.6.7: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            50
 * app-emulation/docker-0.6.7: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            64
 * app-emulation/docker-0.7.0: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            51
 * app-emulation/docker-0.7.0: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            65
 * dev-util/gordon-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            52
 * dev-util/gordon-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            66
 * sys-auth/notary-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            53
 * sys-auth/notary-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            67
 * Cache regen failed with 1
+            54
 * Cache regen failed with 1
 

 
         
diff --git a/docker.txt b/docker.txt
index ccbb62aa11e6..124cda03c3c5 100644
--- a/docker.txt
+++ b/docker.txt
@@ -13,20 +13,7 @@
             {'type': 'git', 'uri': 'git@github.com:tianon/docker-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync docker
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dMaggot repo at '/var/lib/repo-mirror-ci/sync/dMaggot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/dotnet.html b/dotnet.html
index ff528dfee479..27388e53a2d6 100644
--- a/dotnet.html
+++ b/dotnet.html
@@ -34,75 +34,49 @@
 

             12
$ pmaint sync dotnet
 

-            13
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
warning: Pulling without specifying how to reconcile divergent branches is
 

-            15
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
discouraged. You can squelch this message by running one of the following
 

-            16
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
commands sometime before your next pull:
 

-            17
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
 

-            18
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
  git config pull.rebase false  # merge (the default strategy)
 

-            19
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
  git config pull.rebase true   # rebase
 

-            20
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
  git config pull.ff only       # fast-forward only
 

-            21
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
 

-            22
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
You can replace "git config" with "git config --global" to set a default
 

-            23
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            24
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
or --ff-only on the command line to override the configured default per
 

-            25
WARNING:pkgcore:dMaggot repo at '/var/lib/repo-mirror-ci/sync/dMaggot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
invocation.
 

-            26
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
 

-            27
warning: Pulling without specifying how to reconcile divergent branches is
+            27
Already up to date.
 

-            28
discouraged. You can squelch this message by running one of the following
+            28
*** syncing dotnet
 

-            29
commands sometime before your next pull:
+            29
*** synced dotnet
 

-            30
+            30
 * Sync succeeded
 

-            31
  git config pull.rebase false  # merge (the default strategy)
+            31
$ git log --format=%ci -1
 

-            32
  git config pull.rebase true   # rebase
+            32
$ git show -q --pretty=format:%G? HEAD
 

-            33
  git config pull.ff only       # fast-forward only
+            33
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 dotnet
 

-            34
-

-            35
You can replace "git config" with "git config --global" to set a default
-

-            36
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            37
or --ff-only on the command line to override the configured default per
-

-            38
invocation.
-

-            39
-

-            40
Already up to date.
-

-            41
*** syncing dotnet
-

-            42
*** synced dotnet
-

-            43
 * Sync succeeded
-

-            44
$ git log --format=%ci -1
-

-            45
$ git show -q --pretty=format:%G? HEAD
-

-            46
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 dotnet
-

-            47
 * Cache regenerated successfully
+            34
 * Cache regenerated successfully
 

 
         
diff --git a/dotnet.txt b/dotnet.txt
index 8c8580039c43..ba591bbd5be5 100644
--- a/dotnet.txt
+++ b/dotnet.txt
@@ -10,20 +10,7 @@
             {'type': 'git', 'uri': 'git@github.com:gentoo/dotnet.git'}],
  'status': 'official'}
 $ pmaint sync dotnet
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dMaggot repo at '/var/lib/repo-mirror-ci/sync/dMaggot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/drdim.html b/drdim.html
index 805064a70fdf..1ebe909828a0 100644
--- a/drdim.html
+++ b/drdim.html
@@ -38,75 +38,49 @@
 

             14
$ pmaint sync drdim
 

-            15
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
warning: Pulling without specifying how to reconcile divergent branches is
 

-            17
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
discouraged. You can squelch this message by running one of the following
 

-            18
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
commands sometime before your next pull:
 

-            19
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
 

-            20
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
  git config pull.rebase false  # merge (the default strategy)
 

-            21
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
  git config pull.rebase true   # rebase
 

-            22
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.ff only       # fast-forward only
 

-            23
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
 

-            24
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
You can replace "git config" with "git config --global" to set a default
 

-            25
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            26
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
or --ff-only on the command line to override the configured default per
 

-            27
WARNING:pkgcore:dMaggot repo at '/var/lib/repo-mirror-ci/sync/dMaggot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
invocation.
 

-            28
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
 

-            29
warning: Pulling without specifying how to reconcile divergent branches is
+            29
Already up to date.
 

-            30
discouraged. You can squelch this message by running one of the following
+            30
*** syncing drdim
 

-            31
commands sometime before your next pull:
+            31
*** synced drdim
 

-            32
+            32
 * Sync succeeded
 

-            33
  git config pull.rebase false  # merge (the default strategy)
+            33
$ git log --format=%ci -1
 

-            34
  git config pull.rebase true   # rebase
+            34
$ git show -q --pretty=format:%G? HEAD
 

-            35
  git config pull.ff only       # fast-forward only
+            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 drdim
 

-            36
-

-            37
You can replace "git config" with "git config --global" to set a default
-

-            38
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            39
or --ff-only on the command line to override the configured default per
-

-            40
invocation.
-

-            41
-

-            42
Already up to date.
-

-            43
*** syncing drdim
-

-            44
*** synced drdim
-

-            45
 * Sync succeeded
-

-            46
$ git log --format=%ci -1
-

-            47
$ git show -q --pretty=format:%G? HEAD
-

-            48
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 drdim
-

-            49
 * Cache regenerated successfully
+            36
 * Cache regenerated successfully
 

 
         
diff --git a/drdim.txt b/drdim.txt
index 5beeae6715d3..6555ccda4c86 100644
--- a/drdim.txt
+++ b/drdim.txt
@@ -12,20 +12,7 @@
             {'type': 'git', 'uri': 'git@github.com:drdim/layman.git'}],
  'status': 'unofficial'}
 $ pmaint sync drdim
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dMaggot repo at '/var/lib/repo-mirror-ci/sync/dMaggot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/dwfreed.html b/dwfreed.html
index 000f1c31e92a..aa8b476be292 100644
--- a/dwfreed.html
+++ b/dwfreed.html
@@ -34,79 +34,49 @@
 

             12
$ pmaint sync dwfreed
 

-            13
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
warning: Pulling without specifying how to reconcile divergent branches is
 

-            15
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
discouraged. You can squelch this message by running one of the following
 

-            16
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
commands sometime before your next pull:
 

-            17
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
 

-            18
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
  git config pull.rebase false  # merge (the default strategy)
 

-            19
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
  git config pull.rebase true   # rebase
 

-            20
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
  git config pull.ff only       # fast-forward only
 

-            21
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
 

-            22
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
You can replace "git config" with "git config --global" to set a default
 

-            23
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            24
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
or --ff-only on the command line to override the configured default per
 

-            25
WARNING:pkgcore:dMaggot repo at '/var/lib/repo-mirror-ci/sync/dMaggot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
invocation.
 

-            26
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
 

-            27
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
Already up to date.
 

-            28
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
*** syncing dwfreed
 

-            29
warning: Pulling without specifying how to reconcile divergent branches is
+            29
*** synced dwfreed
 

-            30
discouraged. You can squelch this message by running one of the following
+            30
 * Sync succeeded
 

-            31
commands sometime before your next pull:
+            31
$ git log --format=%ci -1
 

-            32
+            32
$ git show -q --pretty=format:%G? HEAD
 

-            33
  git config pull.rebase false  # merge (the default strategy)
+            33
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 dwfreed
 

-            34
  git config pull.rebase true   # rebase
-

-            35
  git config pull.ff only       # fast-forward only
-

-            36
-

-            37
You can replace "git config" with "git config --global" to set a default
-

-            38
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            39
or --ff-only on the command line to override the configured default per
-

-            40
invocation.
-

-            41
-

-            42
Already up to date.
-

-            43
*** syncing dwfreed
-

-            44
*** synced dwfreed
-

-            45
 * Sync succeeded
-

-            46
$ git log --format=%ci -1
-

-            47
$ git show -q --pretty=format:%G? HEAD
-

-            48
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 dwfreed
-

-            49
 * Cache regenerated successfully
+            34
 * Cache regenerated successfully
 

 
         
diff --git a/dwfreed.txt b/dwfreed.txt
index 486ad2dd8d31..082cb2bccc59 100644
--- a/dwfreed.txt
+++ b/dwfreed.txt
@@ -10,22 +10,7 @@
              'uri': 'https://bitbucket.org/dwfreed/dwfreed.gentoo'}],
  'status': 'unofficial'}
 $ pmaint sync dwfreed
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dMaggot repo at '/var/lib/repo-mirror-ci/sync/dMaggot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/dwosky.html b/dwosky.html
index 95b45079164e..6aae2bdb741b 100644
--- a/dwosky.html
+++ b/dwosky.html
@@ -38,79 +38,49 @@
 

             14
$ pmaint sync dwosky
 

-            15
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
warning: Pulling without specifying how to reconcile divergent branches is
 

-            17
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
discouraged. You can squelch this message by running one of the following
 

-            18
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
commands sometime before your next pull:
 

-            19
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
 

-            20
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
  git config pull.rebase false  # merge (the default strategy)
 

-            21
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
  git config pull.rebase true   # rebase
 

-            22
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.ff only       # fast-forward only
 

-            23
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
 

-            24
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
You can replace "git config" with "git config --global" to set a default
 

-            25
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            26
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
or --ff-only on the command line to override the configured default per
 

-            27
WARNING:pkgcore:dMaggot repo at '/var/lib/repo-mirror-ci/sync/dMaggot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
invocation.
 

-            28
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
 

-            29
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
Already up to date.
 

-            30
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
*** syncing dwosky
 

-            31
warning: Pulling without specifying how to reconcile divergent branches is
+            31
*** synced dwosky
 

-            32
discouraged. You can squelch this message by running one of the following
+            32
 * Sync succeeded
 

-            33
commands sometime before your next pull:
+            33
$ git log --format=%ci -1
 

-            34
+            34
$ git show -q --pretty=format:%G? HEAD
 

-            35
  git config pull.rebase false  # merge (the default strategy)
+            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 dwosky
 

-            36
  git config pull.rebase true   # rebase
-

-            37
  git config pull.ff only       # fast-forward only
-

-            38
-

-            39
You can replace "git config" with "git config --global" to set a default
-

-            40
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            41
or --ff-only on the command line to override the configured default per
-

-            42
invocation.
-

-            43
-

-            44
Already up to date.
-

-            45
*** syncing dwosky
-

-            46
*** synced dwosky
-

-            47
 * Sync succeeded
-

-            48
$ git log --format=%ci -1
-

-            49
$ git show -q --pretty=format:%G? HEAD
-

-            50
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 dwosky
-

-            51
 * Cache regenerated successfully
+            36
 * Cache regenerated successfully
 

 
         
diff --git a/dwosky.txt b/dwosky.txt
index ac89e1677bcd..3e12c66061ea 100644
--- a/dwosky.txt
+++ b/dwosky.txt
@@ -12,22 +12,7 @@
              'uri': 'git+ssh://git@github.com/Dwosky/Dwosky-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync dwosky
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dMaggot repo at '/var/lib/repo-mirror-ci/sync/dMaggot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/earshark.html b/earshark.html
index d1d23401f453..d665667af5a6 100644
--- a/earshark.html
+++ b/earshark.html
@@ -34,77 +34,51 @@
 

             12
$ pmaint sync earshark
 

-            13
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
warning: Pulling without specifying how to reconcile divergent branches is
 

-            16
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
discouraged. You can squelch this message by running one of the following
 

-            17
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
commands sometime before your next pull:
 

-            18
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
 

-            19
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
  git config pull.rebase false  # merge (the default strategy)
 

-            20
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
  git config pull.rebase true   # rebase
 

-            21
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
  git config pull.ff only       # fast-forward only
 

-            22
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
 

-            23
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
You can replace "git config" with "git config --global" to set a default
 

-            24
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            25
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
or --ff-only on the command line to override the configured default per
 

-            26
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
invocation.
 

-            27
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
 

-            28
warning: Pulling without specifying how to reconcile divergent branches is
+            28
Already up to date.
 

-            29
discouraged. You can squelch this message by running one of the following
+            29
*** syncing earshark
 

-            30
commands sometime before your next pull:
+            30
*** synced earshark
 

-            31
+            31
 * Sync succeeded
 

-            32
  git config pull.rebase false  # merge (the default strategy)
+            32
$ git log --format=%ci -1
 

-            33
  git config pull.rebase true   # rebase
+            33
$ git show -q --pretty=format:%G? HEAD
 

-            34
  git config pull.ff only       # fast-forward only
+            34
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 earshark
 

-            35
-

-            36
You can replace "git config" with "git config --global" to set a default
-

-            37
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            38
or --ff-only on the command line to override the configured default per
-

-            39
invocation.
-

-            40
-

-            41
Already up to date.
-

-            42
*** syncing earshark
-

-            43
*** synced earshark
-

-            44
 * Sync succeeded
-

-            45
$ git log --format=%ci -1
-

-            46
$ git show -q --pretty=format:%G? HEAD
-

-            47
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 earshark
-

-            48
 * Cache regenerated successfully
+            35
 * Cache regenerated successfully
 

 
         
diff --git a/earshark.txt b/earshark.txt
index dc7b8a7bf07a..2a7ab856c599 100644
--- a/earshark.txt
+++ b/earshark.txt
@@ -10,21 +10,8 @@
             {'type': 'git', 'uri': 'git://github.com/Chemrat/overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync earshark
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/eclipse.html b/eclipse.html
index 51f022f97502..9088ab565518 100644
--- a/eclipse.html
+++ b/eclipse.html
@@ -42,77 +42,55 @@
 

             16
$ pmaint sync eclipse
 

-            17
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
warning: Pulling without specifying how to reconcile divergent branches is
 

-            22
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
discouraged. You can squelch this message by running one of the following
 

-            23
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
commands sometime before your next pull:
 

-            24
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 

-            25
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase false  # merge (the default strategy)
 

-            26
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.rebase true   # rebase
 

-            27
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.ff only       # fast-forward only
 

-            28
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
 

-            29
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
You can replace "git config" with "git config --global" to set a default
 

-            30
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            31
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
or --ff-only on the command line to override the configured default per
 

-            32
warning: Pulling without specifying how to reconcile divergent branches is
+            32
invocation.
 

-            33
discouraged. You can squelch this message by running one of the following
+            33
 

-            34
commands sometime before your next pull:
+            34
Already up to date.
 

-            35
+            35
*** syncing eclipse
 

-            36
  git config pull.rebase false  # merge (the default strategy)
+            36
*** synced eclipse
 

-            37
  git config pull.rebase true   # rebase
+            37
 * Sync succeeded
 

-            38
  git config pull.ff only       # fast-forward only
+            38
$ git log --format=%ci -1
 

-            39
+            39
$ git show -q --pretty=format:%G? HEAD
 

-            40
You can replace "git config" with "git config --global" to set a default
+            40
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 eclipse
 

-            41
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            42
or --ff-only on the command line to override the configured default per
-

-            43
invocation.
-

-            44
-

-            45
Already up to date.
-

-            46
*** syncing eclipse
-

-            47
*** synced eclipse
-

-            48
 * Sync succeeded
-

-            49
$ git log --format=%ci -1
-

-            50
$ git show -q --pretty=format:%G? HEAD
-

-            51
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 eclipse
-

-            52
 * Cache regenerated successfully
+            41
 * Cache regenerated successfully
 

 
         
diff --git a/eclipse.txt b/eclipse.txt
index fb2dbafc60ce..c1f21e29e00f 100644
--- a/eclipse.txt
+++ b/eclipse.txt
@@ -14,17 +14,6 @@
              'uri': 'git@github.com:gentoo/eclipse-overlay.git'}],
  'status': 'official'}
 $ pmaint sync eclipse
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
diff --git a/edgets.html b/edgets.html
index 964bb8416a9e..69ce7e516fa2 100644
--- a/edgets.html
+++ b/edgets.html
@@ -38,77 +38,53 @@
 

             14
$ pmaint sync edgets
 

-            15
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
warning: Pulling without specifying how to reconcile divergent branches is
 

-            19
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
discouraged. You can squelch this message by running one of the following
 

-            20
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
commands sometime before your next pull:
 

-            21
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
 

-            22
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase false  # merge (the default strategy)
 

-            23
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase true   # rebase
 

-            24
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.ff only       # fast-forward only
 

-            25
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 

-            26
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
You can replace "git config" with "git config --global" to set a default
 

-            27
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            28
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
or --ff-only on the command line to override the configured default per
 

-            29
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
invocation.
 

-            30
warning: Pulling without specifying how to reconcile divergent branches is
+            30
 

-            31
discouraged. You can squelch this message by running one of the following
+            31
Already up to date.
 

-            32
commands sometime before your next pull:
+            32
*** syncing edgets
 

-            33
+            33
*** synced edgets
 

-            34
  git config pull.rebase false  # merge (the default strategy)
+            34
 * Sync succeeded
 

-            35
  git config pull.rebase true   # rebase
+            35
$ git log --format=%ci -1
 

-            36
  git config pull.ff only       # fast-forward only
+            36
$ git show -q --pretty=format:%G? HEAD
 

-            37
+            37
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 edgets
 

-            38
You can replace "git config" with "git config --global" to set a default
-

-            39
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            40
or --ff-only on the command line to override the configured default per
-

-            41
invocation.
-

-            42
-

-            43
Already up to date.
-

-            44
*** syncing edgets
-

-            45
*** synced edgets
-

-            46
 * Sync succeeded
-

-            47
$ git log --format=%ci -1
-

-            48
$ git show -q --pretty=format:%G? HEAD
-

-            49
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 edgets
-

-            50
 * Cache regenerated successfully
+            38
 * Cache regenerated successfully
 

 
         
diff --git a/edgets.txt b/edgets.txt
index 50ab1004d171..bc0d5d0216e2 100644
--- a/edgets.txt
+++ b/edgets.txt
@@ -12,21 +12,9 @@
              'uri': 'git+ssh://git@github.com/BlueManCZ/edgets.git'}],
  'status': 'unofficial'}
 $ pmaint sync edgets
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/eigenlay.html b/eigenlay.html
index 0d669ba3a57d..a3297b73dd55 100644
--- a/eigenlay.html
+++ b/eigenlay.html
@@ -30,77 +30,53 @@
 

             10
$ pmaint sync eigenlay
 

-            11
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            11
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            12
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
warning: Pulling without specifying how to reconcile divergent branches is
 

-            15
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
discouraged. You can squelch this message by running one of the following
 

-            16
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
commands sometime before your next pull:
 

-            17
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
 

-            18
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
  git config pull.rebase false  # merge (the default strategy)
 

-            19
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
  git config pull.rebase true   # rebase
 

-            20
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
  git config pull.ff only       # fast-forward only
 

-            21
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
 

-            22
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
You can replace "git config" with "git config --global" to set a default
 

-            23
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            24
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
or --ff-only on the command line to override the configured default per
 

-            25
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
invocation.
 

-            26
warning: Pulling without specifying how to reconcile divergent branches is
+            26
 

-            27
discouraged. You can squelch this message by running one of the following
+            27
Already up to date.
 

-            28
commands sometime before your next pull:
+            28
*** syncing eigenlay
 

-            29
+            29
*** synced eigenlay
 

-            30
  git config pull.rebase false  # merge (the default strategy)
+            30
 * Sync succeeded
 

-            31
  git config pull.rebase true   # rebase
+            31
$ git log --format=%ci -1
 

-            32
  git config pull.ff only       # fast-forward only
+            32
$ git show -q --pretty=format:%G? HEAD
 

-            33
+            33
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 eigenlay
 

-            34
You can replace "git config" with "git config --global" to set a default
-

-            35
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            36
or --ff-only on the command line to override the configured default per
-

-            37
invocation.
-

-            38
-

-            39
Already up to date.
-

-            40
*** syncing eigenlay
-

-            41
*** synced eigenlay
-

-            42
 * Sync succeeded
-

-            43
$ git log --format=%ci -1
-

-            44
$ git show -q --pretty=format:%G? HEAD
-

-            45
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 eigenlay
-

-            46
 * Cache regenerated successfully
+            34
 * Cache regenerated successfully
 

 
         
diff --git a/eigenlay.txt b/eigenlay.txt
index 432cbe46492c..f35152168e4d 100644
--- a/eigenlay.txt
+++ b/eigenlay.txt
@@ -8,21 +8,9 @@
  'source': [{'type': 'git', 'uri': 'https://gitlab.com/eigennet/eigenlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync eigenlay
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/einflay.html b/einflay.html
index 9710ee453ced..52f93d7f78ea 100644
--- a/einflay.html
+++ b/einflay.html
@@ -38,77 +38,55 @@
 

             14
$ pmaint sync einflay
 

-            15
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
warning: Pulling without specifying how to reconcile divergent branches is
 

-            20
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
discouraged. You can squelch this message by running one of the following
 

-            21
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
commands sometime before your next pull:
 

-            22
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
 

-            23
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase false  # merge (the default strategy)
 

-            24
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.rebase true   # rebase
 

-            25
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.ff only       # fast-forward only
 

-            26
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
 

-            27
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
You can replace "git config" with "git config --global" to set a default
 

-            28
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            29
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
or --ff-only on the command line to override the configured default per
 

-            30
warning: Pulling without specifying how to reconcile divergent branches is
+            30
invocation.
 

-            31
discouraged. You can squelch this message by running one of the following
+            31
 

-            32
commands sometime before your next pull:
+            32
Already up to date.
 

-            33
+            33
*** syncing einflay
 

-            34
  git config pull.rebase false  # merge (the default strategy)
+            34
*** synced einflay
 

-            35
  git config pull.rebase true   # rebase
+            35
 * Sync succeeded
 

-            36
  git config pull.ff only       # fast-forward only
+            36
$ git log --format=%ci -1
 

-            37
+            37
$ git show -q --pretty=format:%G? HEAD
 

-            38
You can replace "git config" with "git config --global" to set a default
+            38
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 einflay
 

-            39
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            40
or --ff-only on the command line to override the configured default per
-

-            41
invocation.
-

-            42
-

-            43
Already up to date.
-

-            44
*** syncing einflay
-

-            45
*** synced einflay
-

-            46
 * Sync succeeded
-

-            47
$ git log --format=%ci -1
-

-            48
$ git show -q --pretty=format:%G? HEAD
-

-            49
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 einflay
-

-            50
 * Cache regenerated successfully
+            39
 * Cache regenerated successfully
 

 
         
diff --git a/einflay.txt b/einflay.txt
index 0cec446f2fc3..7980d5dc6670 100644
--- a/einflay.txt
+++ b/einflay.txt
@@ -12,17 +12,6 @@
              'uri': 'git+ssh://git@github.com/EinstokFair/einflay.git'}],
  'status': 'unofficial'}
 $ pmaint sync einflay
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
diff --git a/ejabberd.html b/ejabberd.html
index 12b0bdeff198..85e130ea873f 100644
--- a/ejabberd.html
+++ b/ejabberd.html
@@ -38,77 +38,53 @@
 

             14
$ pmaint sync ejabberd
 

-            15
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
warning: Pulling without specifying how to reconcile divergent branches is
 

-            19
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
discouraged. You can squelch this message by running one of the following
 

-            20
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
commands sometime before your next pull:
 

-            21
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
 

-            22
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase false  # merge (the default strategy)
 

-            23
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase true   # rebase
 

-            24
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.ff only       # fast-forward only
 

-            25
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 

-            26
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
You can replace "git config" with "git config --global" to set a default
 

-            27
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            28
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
or --ff-only on the command line to override the configured default per
 

-            29
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
invocation.
 

-            30
warning: Pulling without specifying how to reconcile divergent branches is
+            30
 

-            31
discouraged. You can squelch this message by running one of the following
+            31
Already up to date.
 

-            32
commands sometime before your next pull:
+            32
*** syncing ejabberd
 

-            33
+            33
*** synced ejabberd
 

-            34
  git config pull.rebase false  # merge (the default strategy)
+            34
 * Sync succeeded
 

-            35
  git config pull.rebase true   # rebase
+            35
$ git log --format=%ci -1
 

-            36
  git config pull.ff only       # fast-forward only
+            36
$ git show -q --pretty=format:%G? HEAD
 

-            37
+            37
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 ejabberd
 

-            38
You can replace "git config" with "git config --global" to set a default
-

-            39
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            40
or --ff-only on the command line to override the configured default per
-

-            41
invocation.
-

-            42
-

-            43
Already up to date.
-

-            44
*** syncing ejabberd
-

-            45
*** synced ejabberd
-

-            46
 * Sync succeeded
-

-            47
$ git log --format=%ci -1
-

-            48
$ git show -q --pretty=format:%G? HEAD
-

-            49
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 ejabberd
-

-            50
 * Cache regenerated successfully
+            38
 * Cache regenerated successfully
 

 
         
diff --git a/ejabberd.txt b/ejabberd.txt
index 2386d7111666..18978e851e0e 100644
--- a/ejabberd.txt
+++ b/ejabberd.txt
@@ -12,18 +12,6 @@
              'uri': 'git+ssh://git@github.com/rion-overlay/ejabberd-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync ejabberd
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
diff --git a/elementary.html b/elementary.html
index 89ffe41b54cc..3224a75f07ac 100644
--- a/elementary.html
+++ b/elementary.html
@@ -38,77 +38,53 @@
 

             14
$ pmaint sync elementary
 

-            15
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
warning: Pulling without specifying how to reconcile divergent branches is
 

-            19
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
discouraged. You can squelch this message by running one of the following
 

-            20
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
commands sometime before your next pull:
 

-            21
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
 

-            22
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase false  # merge (the default strategy)
 

-            23
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase true   # rebase
 

-            24
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.ff only       # fast-forward only
 

-            25
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 

-            26
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
You can replace "git config" with "git config --global" to set a default
 

-            27
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            28
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
or --ff-only on the command line to override the configured default per
 

-            29
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
invocation.
 

-            30
warning: Pulling without specifying how to reconcile divergent branches is
+            30
 

-            31
discouraged. You can squelch this message by running one of the following
+            31
Already up to date.
 

-            32
commands sometime before your next pull:
+            32
*** syncing elementary
 

-            33
+            33
*** synced elementary
 

-            34
  git config pull.rebase false  # merge (the default strategy)
+            34
 * Sync succeeded
 

-            35
  git config pull.rebase true   # rebase
+            35
$ git log --format=%ci -1
 

-            36
  git config pull.ff only       # fast-forward only
+            36
$ git show -q --pretty=format:%G? HEAD
 

-            37
+            37
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 elementary
 

-            38
You can replace "git config" with "git config --global" to set a default
-

-            39
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            40
or --ff-only on the command line to override the configured default per
-

-            41
invocation.
-

-            42
-

-            43
Already up to date.
-

-            44
*** syncing elementary
-

-            45
*** synced elementary
-

-            46
 * Sync succeeded
-

-            47
$ git log --format=%ci -1
-

-            48
$ git show -q --pretty=format:%G? HEAD
-

-            49
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 elementary
-

-            50
 * Cache regenerated successfully
+            38
 * Cache regenerated successfully
 

 
         
diff --git a/elementary.txt b/elementary.txt
index 5d1458b48717..542203bcea19 100644
--- a/elementary.txt
+++ b/elementary.txt
@@ -12,18 +12,6 @@
              'uri': 'git://github.com/pimvullers/elementary.git'}],
  'status': 'unofficial'}
 $ pmaint sync elementary
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
diff --git a/elopez-r-overlay.html b/elopez-r-overlay.html
index ab22d12bfd3f..045d62a54584 100644
--- a/elopez-r-overlay.html
+++ b/elopez-r-overlay.html
@@ -38,77 +38,53 @@
 

             14
$ pmaint sync elopez-r-overlay
 

-            15
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
warning: Pulling without specifying how to reconcile divergent branches is
 

-            19
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
discouraged. You can squelch this message by running one of the following
 

-            20
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
commands sometime before your next pull:
 

-            21
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
 

-            22
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase false  # merge (the default strategy)
 

-            23
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase true   # rebase
 

-            24
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.ff only       # fast-forward only
 

-            25
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 

-            26
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
You can replace "git config" with "git config --global" to set a default
 

-            27
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            28
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
or --ff-only on the command line to override the configured default per
 

-            29
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
invocation.
 

-            30
warning: Pulling without specifying how to reconcile divergent branches is
+            30
 

-            31
discouraged. You can squelch this message by running one of the following
+            31
Already up to date.
 

-            32
commands sometime before your next pull:
+            32
*** syncing elopez-r-overlay
 

-            33
+            33
*** synced elopez-r-overlay
 

-            34
  git config pull.rebase false  # merge (the default strategy)
+            34
 * Sync succeeded
 

-            35
  git config pull.rebase true   # rebase
+            35
$ git log --format=%ci -1
 

-            36
  git config pull.ff only       # fast-forward only
+            36
$ git show -q --pretty=format:%G? HEAD
 

-            37
+            37
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 elopez-r-overlay
 

-            38
You can replace "git config" with "git config --global" to set a default
-

-            39
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            40
or --ff-only on the command line to override the configured default per
-

-            41
invocation.
-

-            42
-

-            43
Already up to date.
-

-            44
*** syncing elopez-r-overlay
-

-            45
*** synced elopez-r-overlay
-

-            46
 * Sync succeeded
-

-            47
$ git log --format=%ci -1
-

-            48
$ git show -q --pretty=format:%G? HEAD
-

-            49
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 elopez-r-overlay
-

-            50
 * Cache regenerated successfully
+            38
 * Cache regenerated successfully
 

 
         
diff --git a/elopez-r-overlay.txt b/elopez-r-overlay.txt
index 397dd8858697..e7a2a79689ea 100644
--- a/elopez-r-overlay.txt
+++ b/elopez-r-overlay.txt
@@ -12,18 +12,6 @@
              'uri': 'git+ssh://git@gitlab.com:libre_hackerman/elopez-r-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync elopez-r-overlay
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
diff --git a/emacs.html b/emacs.html
index 629c14c5dd19..38989c8eff1e 100644
--- a/emacs.html
+++ b/emacs.html
@@ -50,76 +50,32 @@
 

             20
$ pmaint sync emacs
 

-            21
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            23
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            24
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            25
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            26
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
Cloning into '/var/lib/repo-mirror-ci/sync/emacs'...
 

-            27
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
*** syncing emacs
 

-            28
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
*** synced emacs
 

-            29
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
 * Sync succeeded
 

-            30
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
$ git log --format=%ci -1
 

-            31
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
$ git show -q --pretty=format:%G? HEAD
 

-            32
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 emacs
 

-            33
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
 * Cache regenerated successfully
 

-            34
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            35
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            36
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            37
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            38
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            39
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            40
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            41
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            42
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            43
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            44
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            45
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            46
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            47
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            48
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            49
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            50
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            51
Cloning into '/var/lib/repo-mirror-ci/sync/emacs'...
-

-            52
fatal: unable to access 'https://anongit.gentoo.org/git/repo/proj/emacs.git/': The requested URL returned error: 504
-

-            53
*** syncing emacs
-

-            54
!!! failed syncing emacs
-

-            55
 * Sync failed with 1
-
[FATAL]
 
         
     
diff --git a/emacs.txt b/emacs.txt
index d7ac53c4c50e..18d62815a155 100644
--- a/emacs.txt
+++ b/emacs.txt
@@ -18,38 +18,16 @@
  'status': 'official'}
  * Adding new repository
 $ pmaint sync emacs
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 Cloning into '/var/lib/repo-mirror-ci/sync/emacs'...
-fatal: unable to access 'https://anongit.gentoo.org/git/repo/proj/emacs.git/': The requested URL returned error: 504
 *** syncing emacs
-!!! failed syncing emacs
- * Sync failed with 1
+*** synced emacs
+ * Sync succeeded
+$ git log --format=%ci -1
+$ git show -q --pretty=format:%G? HEAD
+$ pmaint regen --use-local-desc --pkg-desc-index -t 1 emacs
+ * Cache regenerated successfully
diff --git a/enlightenment-live.html b/enlightenment-live.html
index 992436657abd..45c3b6d91059 100644
--- a/enlightenment-live.html
+++ b/enlightenment-live.html
@@ -36,77 +36,53 @@
 

             13
$ pmaint sync enlightenment-live
 

-            14
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
warning: Pulling without specifying how to reconcile divergent branches is
 

-            18
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
discouraged. You can squelch this message by running one of the following
 

-            19
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
commands sometime before your next pull:
 

-            20
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
 

-            21
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
  git config pull.rebase false  # merge (the default strategy)
 

-            22
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase true   # rebase
 

-            23
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.ff only       # fast-forward only
 

-            24
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 

-            25
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
You can replace "git config" with "git config --global" to set a default
 

-            26
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            27
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
or --ff-only on the command line to override the configured default per
 

-            28
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
invocation.
 

-            29
warning: Pulling without specifying how to reconcile divergent branches is
+            29
 

-            30
discouraged. You can squelch this message by running one of the following
+            30
Already up to date.
 

-            31
commands sometime before your next pull:
+            31
*** syncing enlightenment-live
 

-            32
+            32
*** synced enlightenment-live
 

-            33
  git config pull.rebase false  # merge (the default strategy)
+            33
 * Sync succeeded
 

-            34
  git config pull.rebase true   # rebase
+            34
$ git log --format=%ci -1
 

-            35
  git config pull.ff only       # fast-forward only
+            35
$ git show -q --pretty=format:%G? HEAD
 

-            36
+            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 enlightenment-live
 

-            37
You can replace "git config" with "git config --global" to set a default
-

-            38
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            39
or --ff-only on the command line to override the configured default per
-

-            40
invocation.
-

-            41
-

-            42
Already up to date.
-

-            43
*** syncing enlightenment-live
-

-            44
*** synced enlightenment-live
-

-            45
 * Sync succeeded
-

-            46
$ git log --format=%ci -1
-

-            47
$ git show -q --pretty=format:%G? HEAD
-

-            48
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 enlightenment-live
-

-            49
 * Cache regenerated successfully
+            37
 * Cache regenerated successfully
 

 
         
diff --git a/enlightenment-live.txt b/enlightenment-live.txt
index 550ce42c7ebb..3d803cd940aa 100644
--- a/enlightenment-live.txt
+++ b/enlightenment-live.txt
@@ -11,18 +11,6 @@
              'uri': 'https://github.com/rafspiny/enlightenment-live.git'}],
  'status': 'unofficial'}
 $ pmaint sync enlightenment-live
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
diff --git a/ennui.html b/ennui.html
index d332fb98ee70..531906acde31 100644
--- a/ennui.html
+++ b/ennui.html
@@ -40,89 +40,53 @@
 

             15
$ pmaint sync ennui
 

-            16
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
warning: Pulling without specifying how to reconcile divergent branches is
 

-            20
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
discouraged. You can squelch this message by running one of the following
 

-            21
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
commands sometime before your next pull:
 

-            22
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
 

-            23
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase false  # merge (the default strategy)
 

-            24
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.rebase true   # rebase
 

-            25
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.ff only       # fast-forward only
 

-            26
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
 

-            27
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
You can replace "git config" with "git config --global" to set a default
 

-            28
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            29
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
or --ff-only on the command line to override the configured default per
 

-            30
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
invocation.
 

-            31
warning: Pulling without specifying how to reconcile divergent branches is
+            31
 

-            32
discouraged. You can squelch this message by running one of the following
+            32
Already up to date.
 

-            33
commands sometime before your next pull:
+            33
*** syncing ennui
 

-            34
+            34
*** synced ennui
 

-            35
  git config pull.rebase false  # merge (the default strategy)
+            35
 * Sync succeeded
 

-            36
  git config pull.rebase true   # rebase
+            36
$ git log --format=%ci -1
 

-            37
  git config pull.ff only       # fast-forward only
+            37
$ git show -q --pretty=format:%G? HEAD
 

-            38
+            38
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 ennui
 

-            39
You can replace "git config" with "git config --global" to set a default
-

-            40
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            41
or --ff-only on the command line to override the configured default per
-

-            42
invocation.
-

-            43
-

-            44
fatal: unable to access 'https://anongit.gentoo.org/git/user/ennui.git/': The requested URL returned error: 504
-

-            45
*** syncing ennui
-

-            46
!!! failed syncing ennui
-

-            47
 * Sync failed with 1
-
[FATAL]
-            48
 * Will try to re-create
-

-            49
$ pmaint sync ennui
-

-            50
Cloning into '/var/lib/repo-mirror-ci/sync/ennui'...
-

-            51
*** syncing ennui
-

-            52
*** synced ennui
-

-            53
 * Sync succeeded after re-adding
-

-            54
$ git log --format=%ci -1
-

-            55
$ git show -q --pretty=format:%G? HEAD
-

-            56
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 ennui
-

-            57
 * Cache regenerated successfully
+            39
 * Cache regenerated successfully
 

 
         
diff --git a/ennui.txt b/ennui.txt
index af54e7eb9610..ae5d3e9965ea 100644
--- a/ennui.txt
+++ b/ennui.txt
@@ -13,18 +13,6 @@
              'uri': 'git+ssh://git@git.gentoo.org/user/ennui.git'}],
  'status': 'unofficial'}
 $ pmaint sync ennui
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
@@ -41,16 +29,10 @@ 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.
 
-fatal: unable to access 'https://anongit.gentoo.org/git/user/ennui.git/': The requested URL returned error: 504
-*** syncing ennui
-!!! failed syncing ennui
- * Sync failed with 1
- * Will try to re-create
-$ pmaint sync ennui
-Cloning into '/var/lib/repo-mirror-ci/sync/ennui'...
+Already up to date.
 *** syncing ennui
 *** synced ennui
- * Sync succeeded after re-adding
+ * Sync succeeded
 $ git log --format=%ci -1
 $ git show -q --pretty=format:%G? HEAD
 $ pmaint regen --use-local-desc --pkg-desc-index -t 1 ennui
diff --git a/equaeghe.html b/equaeghe.html
index 642c34309c71..b29dbf39edc9 100644
--- a/equaeghe.html
+++ b/equaeghe.html
@@ -38,77 +38,53 @@
 

             14
$ pmaint sync equaeghe
 

-            15
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
warning: Pulling without specifying how to reconcile divergent branches is
 

-            19
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
discouraged. You can squelch this message by running one of the following
 

-            20
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
commands sometime before your next pull:
 

-            21
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
 

-            22
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase false  # merge (the default strategy)
 

-            23
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase true   # rebase
 

-            24
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.ff only       # fast-forward only
 

-            25
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 

-            26
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
You can replace "git config" with "git config --global" to set a default
 

-            27
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            28
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
or --ff-only on the command line to override the configured default per
 

-            29
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
invocation.
 

-            30
warning: Pulling without specifying how to reconcile divergent branches is
+            30
 

-            31
discouraged. You can squelch this message by running one of the following
+            31
Already up to date.
 

-            32
commands sometime before your next pull:
+            32
*** syncing equaeghe
 

-            33
+            33
*** synced equaeghe
 

-            34
  git config pull.rebase false  # merge (the default strategy)
+            34
 * Sync succeeded
 

-            35
  git config pull.rebase true   # rebase
+            35
$ git log --format=%ci -1
 

-            36
  git config pull.ff only       # fast-forward only
+            36
$ git show -q --pretty=format:%G? HEAD
 

-            37
+            37
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 equaeghe
 

-            38
You can replace "git config" with "git config --global" to set a default
-

-            39
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            40
or --ff-only on the command line to override the configured default per
-

-            41
invocation.
-

-            42
-

-            43
Already up to date.
-

-            44
*** syncing equaeghe
-

-            45
*** synced equaeghe
-

-            46
 * Sync succeeded
-

-            47
$ git log --format=%ci -1
-

-            48
$ git show -q --pretty=format:%G? HEAD
-

-            49
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 equaeghe
-

-            50
 * Cache regenerated successfully
+            38
 * Cache regenerated successfully
 

 
         
diff --git a/equaeghe.txt b/equaeghe.txt
index 8f8c54490c0d..b466ea55fcf4 100644
--- a/equaeghe.txt
+++ b/equaeghe.txt
@@ -12,18 +12,6 @@
              'uri': 'git+ssh://git@github.com/equaeghe/gentoo-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync equaeghe
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
diff --git a/erayd.html b/erayd.html
index 9592a3582ae3..6f8d398d1b91 100644
--- a/erayd.html
+++ b/erayd.html
@@ -36,77 +36,53 @@
 

             13
$ pmaint sync erayd
 

-            14
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
warning: Pulling without specifying how to reconcile divergent branches is
 

-            18
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
discouraged. You can squelch this message by running one of the following
 

-            19
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
commands sometime before your next pull:
 

-            20
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
 

-            21
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
  git config pull.rebase false  # merge (the default strategy)
 

-            22
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase true   # rebase
 

-            23
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.ff only       # fast-forward only
 

-            24
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 

-            25
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
You can replace "git config" with "git config --global" to set a default
 

-            26
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            27
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
or --ff-only on the command line to override the configured default per
 

-            28
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
invocation.
 

-            29
warning: Pulling without specifying how to reconcile divergent branches is
+            29
 

-            30
discouraged. You can squelch this message by running one of the following
+            30
Already up to date.
 

-            31
commands sometime before your next pull:
+            31
*** syncing erayd
 

-            32
+            32
*** synced erayd
 

-            33
  git config pull.rebase false  # merge (the default strategy)
+            33
 * Sync succeeded
 

-            34
  git config pull.rebase true   # rebase
+            34
$ git log --format=%ci -1
 

-            35
  git config pull.ff only       # fast-forward only
+            35
$ git show -q --pretty=format:%G? HEAD
 

-            36
+            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 erayd
 

-            37
You can replace "git config" with "git config --global" to set a default
-

-            38
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            39
or --ff-only on the command line to override the configured default per
-

-            40
invocation.
-

-            41
-

-            42
Already up to date.
-

-            43
*** syncing erayd
-

-            44
*** synced erayd
-

-            45
 * Sync succeeded
-

-            46
$ git log --format=%ci -1
-

-            47
$ git show -q --pretty=format:%G? HEAD
-

-            48
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 erayd
-

-            49
 * Cache regenerated successfully
+            37
 * Cache regenerated successfully
 

 
         
diff --git a/erayd.txt b/erayd.txt
index 8be5ec75197c..67f97b1324ce 100644
--- a/erayd.txt
+++ b/erayd.txt
@@ -11,18 +11,6 @@
             {'type': 'git', 'uri': 'git@github.com:erayd/overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync erayd
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
diff --git a/ethereum.html b/ethereum.html
index 6837b5895b3d..89245ad738e7 100644
--- a/ethereum.html
+++ b/ethereum.html
@@ -40,77 +40,53 @@
 

             15
$ pmaint sync ethereum
 

-            16
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
warning: Pulling without specifying how to reconcile divergent branches is
 

-            20
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
discouraged. You can squelch this message by running one of the following
 

-            21
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
commands sometime before your next pull:
 

-            22
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
 

-            23
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase false  # merge (the default strategy)
 

-            24
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.rebase true   # rebase
 

-            25
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.ff only       # fast-forward only
 

-            26
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
 

-            27
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
You can replace "git config" with "git config --global" to set a default
 

-            28
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            29
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
or --ff-only on the command line to override the configured default per
 

-            30
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
invocation.
 

-            31
warning: Pulling without specifying how to reconcile divergent branches is
+            31
 

-            32
discouraged. You can squelch this message by running one of the following
+            32
Already up to date.
 

-            33
commands sometime before your next pull:
+            33
*** syncing ethereum
 

-            34
+            34
*** synced ethereum
 

-            35
  git config pull.rebase false  # merge (the default strategy)
+            35
 * Sync succeeded
 

-            36
  git config pull.rebase true   # rebase
+            36
$ git log --format=%ci -1
 

-            37
  git config pull.ff only       # fast-forward only
+            37
$ git show -q --pretty=format:%G? HEAD
 

-            38
+            38
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 ethereum
 

-            39
You can replace "git config" with "git config --global" to set a default
-

-            40
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            41
or --ff-only on the command line to override the configured default per
-

-            42
invocation.
-

-            43
-

-            44
Already up to date.
-

-            45
*** syncing ethereum
-

-            46
*** synced ethereum
-

-            47
 * Sync succeeded
-

-            48
$ git log --format=%ci -1
-

-            49
$ git show -q --pretty=format:%G? HEAD
-

-            50
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 ethereum
-

-            51
 * Cache regenerated successfully
+            39
 * Cache regenerated successfully
 

 
         
diff --git a/ethereum.txt b/ethereum.txt
index f93bd269f75a..6f28e49529ed 100644
--- a/ethereum.txt
+++ b/ethereum.txt
@@ -13,18 +13,6 @@
              'uri': 'git@github.com:coolparadox/ethereum-gentoo-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync ethereum
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
diff --git a/eugene-bright.html b/eugene-bright.html
index 35a49ab2c7ce..d5f065f960c9 100644
--- a/eugene-bright.html
+++ b/eugene-bright.html
@@ -38,77 +38,53 @@
 

             14
$ pmaint sync eugene-bright
 

-            15
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
warning: Pulling without specifying how to reconcile divergent branches is
 

-            19
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
discouraged. You can squelch this message by running one of the following
 

-            20
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
commands sometime before your next pull:
 

-            21
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
 

-            22
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase false  # merge (the default strategy)
 

-            23
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase true   # rebase
 

-            24
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.ff only       # fast-forward only
 

-            25
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 

-            26
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
You can replace "git config" with "git config --global" to set a default
 

-            27
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            28
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
or --ff-only on the command line to override the configured default per
 

-            29
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
invocation.
 

-            30
warning: Pulling without specifying how to reconcile divergent branches is
+            30
 

-            31
discouraged. You can squelch this message by running one of the following
+            31
Already up to date.
 

-            32
commands sometime before your next pull:
+            32
*** syncing eugene-bright
 

-            33
+            33
*** synced eugene-bright
 

-            34
  git config pull.rebase false  # merge (the default strategy)
+            34
 * Sync succeeded
 

-            35
  git config pull.rebase true   # rebase
+            35
$ git log --format=%ci -1
 

-            36
  git config pull.ff only       # fast-forward only
+            36
$ git show -q --pretty=format:%G? HEAD
 

-            37
+            37
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 eugene-bright
 

-            38
You can replace "git config" with "git config --global" to set a default
-

-            39
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            40
or --ff-only on the command line to override the configured default per
-

-            41
invocation.
-

-            42
-

-            43
Already up to date.
-

-            44
*** syncing eugene-bright
-

-            45
*** synced eugene-bright
-

-            46
 * Sync succeeded
-

-            47
$ git log --format=%ci -1
-

-            48
$ git show -q --pretty=format:%G? HEAD
-

-            49
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 eugene-bright
-

-            50
 * Cache regenerated successfully
+            38
 * Cache regenerated successfully
 

 
         
diff --git a/eugene-bright.txt b/eugene-bright.txt
index af85fbdae0f2..d432e8ce0e28 100644
--- a/eugene-bright.txt
+++ b/eugene-bright.txt
@@ -12,18 +12,6 @@
              'uri': 'git@github.com:eugene-bright/eugene-bright-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync eugene-bright
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
diff --git a/ext-devlibs.html b/ext-devlibs.html
index 84bf53bd11ae..17c0216b3768 100644
--- a/ext-devlibs.html
+++ b/ext-devlibs.html
@@ -30,51 +30,25 @@
 

             10
$ pmaint sync ext-devlibs
 

-            11
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            11
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            12
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
Current branch master is up to date.
 

-            15
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
*** syncing ext-devlibs
 

-            16
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
*** synced ext-devlibs
 

-            17
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
 * Sync succeeded
 

-            18
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
$ git log --format=%ci -1
 

-            19
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 ext-devlibs
 

-            20
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            21
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            22
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            23
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            24
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            25
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            26
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            27
Current branch master is up to date.
-

-            28
*** syncing ext-devlibs
-

-            29
*** synced ext-devlibs
-

-            30
 * Sync succeeded
-

-            31
$ git log --format=%ci -1
-

-            32
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 ext-devlibs
-

-            33
 * Cache regenerated successfully
+            20
 * Cache regenerated successfully
 

 
         
diff --git a/ext-devlibs.txt b/ext-devlibs.txt
index cfdbe34dc341..f2a3f91481c9 100644
--- a/ext-devlibs.txt
+++ b/ext-devlibs.txt
@@ -8,22 +8,9 @@
  'source': [{'type': 'svn', 'uri': 'svn://sidvind.com/overlays/ext-devlibs'}],
  'status': 'unofficial'}
 $ pmaint sync ext-devlibs
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 Current branch master is up to date.
 *** syncing ext-devlibs
 *** synced ext-devlibs
diff --git a/farmboy0.html b/farmboy0.html
index 3ebf4834bb60..8c5b73f6245b 100644
--- a/farmboy0.html
+++ b/farmboy0.html
@@ -42,79 +42,53 @@
 

             16
$ pmaint sync farmboy0
 

-            17
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
warning: Pulling without specifying how to reconcile divergent branches is
 

-            21
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
discouraged. You can squelch this message by running one of the following
 

-            22
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
commands sometime before your next pull:
 

-            23
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
 

-            24
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.rebase false  # merge (the default strategy)
 

-            25
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase true   # rebase
 

-            26
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.ff only       # fast-forward only
 

-            27
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
 

-            28
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
You can replace "git config" with "git config --global" to set a default
 

-            29
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            30
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
or --ff-only on the command line to override the configured default per
 

-            31
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
invocation.
 

-            32
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
 

-            33
warning: Pulling without specifying how to reconcile divergent branches is
+            33
Already up to date.
 

-            34
discouraged. You can squelch this message by running one of the following
+            34
*** syncing farmboy0
 

-            35
commands sometime before your next pull:
+            35
*** synced farmboy0
 

-            36
+            36
 * Sync succeeded
 

-            37
  git config pull.rebase false  # merge (the default strategy)
+            37
$ git log --format=%ci -1
 

-            38
  git config pull.rebase true   # rebase
+            38
$ git show -q --pretty=format:%G? HEAD
 

-            39
  git config pull.ff only       # fast-forward only
+            39
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 farmboy0
 

-            40
-

-            41
You can replace "git config" with "git config --global" to set a default
-

-            42
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            43
or --ff-only on the command line to override the configured default per
-

-            44
invocation.
-

-            45
-

-            46
Already up to date.
-

-            47
*** syncing farmboy0
-

-            48
*** synced farmboy0
-

-            49
 * Sync succeeded
-

-            50
$ git log --format=%ci -1
-

-            51
$ git show -q --pretty=format:%G? HEAD
-

-            52
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 farmboy0
-

-            53
 * Cache regenerated successfully
+            40
 * Cache regenerated successfully
 

 
         
diff --git a/farmboy0.txt b/farmboy0.txt
index 1600e6a709d4..823280219033 100644
--- a/farmboy0.txt
+++ b/farmboy0.txt
@@ -14,22 +14,9 @@
              'uri': 'git@github.com:farmboy0/portage-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync farmboy0
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/fem-overlay.html b/fem-overlay.html
index 1a69929d9505..ff38d45d8ee5 100644
--- a/fem-overlay.html
+++ b/fem-overlay.html
@@ -32,79 +32,53 @@
 

             11
$ pmaint sync fem-overlay
 

-            12
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
warning: Pulling without specifying how to reconcile divergent branches is
 

-            16
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
discouraged. You can squelch this message by running one of the following
 

-            17
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
commands sometime before your next pull:
 

-            18
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
 

-            19
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
  git config pull.rebase false  # merge (the default strategy)
 

-            20
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
  git config pull.rebase true   # rebase
 

-            21
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
  git config pull.ff only       # fast-forward only
 

-            22
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
 

-            23
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
You can replace "git config" with "git config --global" to set a default
 

-            24
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            25
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
or --ff-only on the command line to override the configured default per
 

-            26
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
invocation.
 

-            27
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
 

-            28
warning: Pulling without specifying how to reconcile divergent branches is
+            28
Already up to date.
 

-            29
discouraged. You can squelch this message by running one of the following
+            29
*** syncing fem-overlay
 

-            30
commands sometime before your next pull:
+            30
*** synced fem-overlay
 

-            31
+            31
 * Sync succeeded
 

-            32
  git config pull.rebase false  # merge (the default strategy)
+            32
$ git log --format=%ci -1
 

-            33
  git config pull.rebase true   # rebase
+            33
$ git show -q --pretty=format:%G? HEAD
 

-            34
  git config pull.ff only       # fast-forward only
+            34
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 fem-overlay
 

-            35
-

-            36
You can replace "git config" with "git config --global" to set a default
-

-            37
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            38
or --ff-only on the command line to override the configured default per
-

-            39
invocation.
-

-            40
-

-            41
Already up to date.
-

-            42
*** syncing fem-overlay
-

-            43
*** synced fem-overlay
-

-            44
 * Sync succeeded
-

-            45
$ git log --format=%ci -1
-

-            46
$ git show -q --pretty=format:%G? HEAD
-

-            47
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 fem-overlay
-

-            48
 * Cache regenerated successfully
+            35
 * Cache regenerated successfully
 

 
         
diff --git a/fem-overlay.txt b/fem-overlay.txt
index 6f7a6c6608d1..a2a0ba810160 100644
--- a/fem-overlay.txt
+++ b/fem-overlay.txt
@@ -9,22 +9,9 @@
              'uri': 'https://bitbucket.fem.tu-ilmenau.de/scm/gentoo/fem-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync fem-overlay
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/ferki.html b/ferki.html
index 402370512841..81ce466f8ab8 100644
--- a/ferki.html
+++ b/ferki.html
@@ -38,79 +38,53 @@
 

             14
$ pmaint sync ferki
 

-            15
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
warning: Pulling without specifying how to reconcile divergent branches is
 

-            19
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
discouraged. You can squelch this message by running one of the following
 

-            20
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
commands sometime before your next pull:
 

-            21
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
 

-            22
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase false  # merge (the default strategy)
 

-            23
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase true   # rebase
 

-            24
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.ff only       # fast-forward only
 

-            25
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 

-            26
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
You can replace "git config" with "git config --global" to set a default
 

-            27
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            28
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
or --ff-only on the command line to override the configured default per
 

-            29
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
invocation.
 

-            30
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
 

-            31
warning: Pulling without specifying how to reconcile divergent branches is
+            31
Already up to date.
 

-            32
discouraged. You can squelch this message by running one of the following
+            32
*** syncing ferki
 

-            33
commands sometime before your next pull:
+            33
*** synced ferki
 

-            34
+            34
 * Sync succeeded
 

-            35
  git config pull.rebase false  # merge (the default strategy)
+            35
$ git log --format=%ci -1
 

-            36
  git config pull.rebase true   # rebase
+            36
$ git show -q --pretty=format:%G? HEAD
 

-            37
  git config pull.ff only       # fast-forward only
+            37
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 ferki
 

-            38
-

-            39
You can replace "git config" with "git config --global" to set a default
-

-            40
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            41
or --ff-only on the command line to override the configured default per
-

-            42
invocation.
-

-            43
-

-            44
Already up to date.
-

-            45
*** syncing ferki
-

-            46
*** synced ferki
-

-            47
 * Sync succeeded
-

-            48
$ git log --format=%ci -1
-

-            49
$ git show -q --pretty=format:%G? HEAD
-

-            50
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 ferki
-

-            51
 * Cache regenerated successfully
+            38
 * Cache regenerated successfully
 

 
         
diff --git a/ferki.txt b/ferki.txt
index db1b7d4d2858..54958c3d8f96 100644
--- a/ferki.txt
+++ b/ferki.txt
@@ -12,22 +12,9 @@
              'uri': 'git+ssh://git@github.com/ferki/gentoo-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync ferki
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/fidonet.html b/fidonet.html
index 667ef630a362..7392d7643303 100644
--- a/fidonet.html
+++ b/fidonet.html
@@ -30,87 +30,61 @@
 

             10
$ pmaint sync fidonet
 

-            11
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            11
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            12
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
This is overlay.junc.org.
 

-            15
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
 

-            16
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
 

-            17
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
Number of files: 1 (reg: 1)
 

-            18
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
Number of created files: 0
 

-            19
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
Number of deleted files: 0
 

-            20
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
Number of regular files transferred: 1
 

-            21
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
Total file size: 32 bytes
 

-            22
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
Total transferred file size: 32 bytes
 

-            23
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
Literal data: 32 bytes
 

-            24
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
Matched data: 0 bytes
 

-            25
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
File list size: 48
 

-            26
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
File list generation time: 0.001 seconds
 

-            27
This is overlay.junc.org.
+            27
File list transfer time: 0.000 seconds
 

-            28
+            28
Total bytes sent: 85
 

-            29
+            29
Total bytes received: 134
 

-            30
Number of files: 1 (reg: 1)
+            30
 

-            31
Number of created files: 0
+            31
sent 85 bytes  received 134 bytes  87.60 bytes/sec
 

-            32
Number of deleted files: 0
+            32
total size is 32  speedup is 0.15
 

-            33
Number of regular files transferred: 1
+            33
*** syncing fidonet
 

-            34
Total file size: 32 bytes
+            34
*** synced fidonet
 

-            35
Total transferred file size: 32 bytes
+            35
 * Sync succeeded
 

-            36
Literal data: 32 bytes
+            36
$ stat --format=%y .
 

-            37
Matched data: 0 bytes
+            37
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 fidonet
 

-            38
File list size: 48
-

-            39
File list generation time: 0.001 seconds
-

-            40
File list transfer time: 0.000 seconds
-

-            41
Total bytes sent: 85
-

-            42
Total bytes received: 134
-

-            43
-

-            44
sent 85 bytes  received 134 bytes  87.60 bytes/sec
-

-            45
total size is 32  speedup is 0.15
-

-            46
*** syncing fidonet
-

-            47
*** synced fidonet
-

-            48
 * Sync succeeded
-

-            49
$ stat --format=%y .
-

-            50
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 fidonet
-

-            51
 * Cache regenerated successfully
+            38
 * Cache regenerated successfully
 

 
         
diff --git a/fidonet.txt b/fidonet.txt
index be00fa405f70..3ba2a93cbe1d 100644
--- a/fidonet.txt
+++ b/fidonet.txt
@@ -8,22 +8,9 @@
              'uri': 'rsync://fidonet.overlay.junc.org/fidonet/'}],
  'status': 'unofficial'}
 $ pmaint sync fidonet
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 This is overlay.junc.org.
 
 
diff --git a/fkmclane.html b/fkmclane.html
index 804ab973f27b..cab5170b825e 100644
--- a/fkmclane.html
+++ b/fkmclane.html
@@ -36,85 +36,57 @@
 

             13
$ pmaint sync fkmclane
 

-            14
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
warning: Pulling without specifying how to reconcile divergent branches is
 

-            17
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
discouraged. You can squelch this message by running one of the following
 

-            18
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
commands sometime before your next pull:
 

-            19
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
 

-            20
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
  git config pull.rebase false  # merge (the default strategy)
 

-            21
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
  git config pull.rebase true   # rebase
 

-            22
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.ff only       # fast-forward only
 

-            23
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
 

-            24
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
You can replace "git config" with "git config --global" to set a default
 

-            25
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            26
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
or --ff-only on the command line to override the configured default per
 

-            27
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
invocation.
 

-            28
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
 

-            29
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
Already up to date.
 

-            30
warning: Pulling without specifying how to reconcile divergent branches is
+            30
*** syncing fkmclane
 

-            31
discouraged. You can squelch this message by running one of the following
+            31
*** synced fkmclane
 

-            32
commands sometime before your next pull:
+            32
 * Sync succeeded
 

-            33
+            33
$ git log --format=%ci -1
 

-            34
  git config pull.rebase false  # merge (the default strategy)
+            34
$ git show -q --pretty=format:%G? HEAD
 

-            35
  git config pull.rebase true   # rebase
+            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 fkmclane
 

-            36
  git config pull.ff only       # fast-forward only
-

-            37
-

-            38
You can replace "git config" with "git config --global" to set a default
-

-            39
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            40
or --ff-only on the command line to override the configured default per
-

-            41
invocation.
-

-            42
-

-            43
Already up to date.
-

-            44
*** syncing fkmclane
-

-            45
*** synced fkmclane
-

-            46
 * Sync succeeded
-

-            47
$ git log --format=%ci -1
-

-            48
$ git show -q --pretty=format:%G? HEAD
-

-            49
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 fkmclane
-

-            50
 * games-action/armagetronad-0.4-r2: failed sourcing ebuild: inherit requires unknown eclass: bzr.eclass
+            36
 * games-action/armagetronad-0.4-r2: failed sourcing ebuild: inherit requires unknown eclass: bzr.eclass
 
[FATAL]
-            51
 * games-action/armagetronad-dedicated-0.4-r1: failed sourcing ebuild: inherit requires unknown eclass: bzr.eclass
+            37
 * games-action/armagetronad-dedicated-0.4-r1: failed sourcing ebuild: inherit requires unknown eclass: bzr.eclass
 
[FATAL]
-            52
 * games-misc/lolcat-99.9.20-r1: failed parsing REQUIRED_USE: '|| ( )' is unparseable
+            38
 * games-misc/lolcat-99.9.20-r1: failed parsing REQUIRED_USE: '|| ( )' is unparseable
 
[FATAL]
-            53
 * Cache regen failed with 1
+            39
 * Cache regen failed with 1
 

 
         
diff --git a/fkmclane.txt b/fkmclane.txt
index 8aa3fe39fed9..5984d7167d14 100644
--- a/fkmclane.txt
+++ b/fkmclane.txt
@@ -11,22 +11,8 @@
             {'type': 'git', 'uri': 'git://github.com/fkmclane/overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync fkmclane
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/flammie.html b/flammie.html
index c9ef6266edff..03683bcbfaec 100644
--- a/flammie.html
+++ b/flammie.html
@@ -42,79 +42,53 @@
 

             16
$ pmaint sync flammie
 

-            17
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
warning: Pulling without specifying how to reconcile divergent branches is
 

-            21
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
discouraged. You can squelch this message by running one of the following
 

-            22
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
commands sometime before your next pull:
 

-            23
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
 

-            24
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.rebase false  # merge (the default strategy)
 

-            25
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase true   # rebase
 

-            26
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.ff only       # fast-forward only
 

-            27
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
 

-            28
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
You can replace "git config" with "git config --global" to set a default
 

-            29
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            30
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
or --ff-only on the command line to override the configured default per
 

-            31
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
invocation.
 

-            32
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
 

-            33
warning: Pulling without specifying how to reconcile divergent branches is
+            33
Already up to date.
 

-            34
discouraged. You can squelch this message by running one of the following
+            34
*** syncing flammie
 

-            35
commands sometime before your next pull:
+            35
*** synced flammie
 

-            36
+            36
 * Sync succeeded
 

-            37
  git config pull.rebase false  # merge (the default strategy)
+            37
$ git log --format=%ci -1
 

-            38
  git config pull.rebase true   # rebase
+            38
$ git show -q --pretty=format:%G? HEAD
 

-            39
  git config pull.ff only       # fast-forward only
+            39
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 flammie
 

-            40
-

-            41
You can replace "git config" with "git config --global" to set a default
-

-            42
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            43
or --ff-only on the command line to override the configured default per
-

-            44
invocation.
-

-            45
-

-            46
Already up to date.
-

-            47
*** syncing flammie
-

-            48
*** synced flammie
-

-            49
 * Sync succeeded
-

-            50
$ git log --format=%ci -1
-

-            51
$ git show -q --pretty=format:%G? HEAD
-

-            52
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 flammie
-

-            53
 * Cache regenerated successfully
+            40
 * Cache regenerated successfully
 

 
         
diff --git a/flammie.txt b/flammie.txt
index 7456fe7c2b45..1bccc53d366f 100644
--- a/flammie.txt
+++ b/flammie.txt
@@ -14,22 +14,9 @@
              'uri': 'git://github.com/flammie/flammie-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync flammie
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/flavour.html b/flavour.html
index 0f80482865e3..563841f53e29 100644
--- a/flavour.html
+++ b/flavour.html
@@ -32,79 +32,51 @@
 

             11
$ pmaint sync flavour
 

-            12
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
warning: Pulling without specifying how to reconcile divergent branches is
 

-            15
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
discouraged. You can squelch this message by running one of the following
 

-            16
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
commands sometime before your next pull:
 

-            17
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
 

-            18
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
  git config pull.rebase false  # merge (the default strategy)
 

-            19
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
  git config pull.rebase true   # rebase
 

-            20
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
  git config pull.ff only       # fast-forward only
 

-            21
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
 

-            22
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
You can replace "git config" with "git config --global" to set a default
 

-            23
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            24
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
or --ff-only on the command line to override the configured default per
 

-            25
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
invocation.
 

-            26
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
 

-            27
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
Already up to date.
 

-            28
warning: Pulling without specifying how to reconcile divergent branches is
+            28
*** syncing flavour
 

-            29
discouraged. You can squelch this message by running one of the following
+            29
*** synced flavour
 

-            30
commands sometime before your next pull:
+            30
 * Sync succeeded
 

-            31
+            31
$ git log --format=%ci -1
 

-            32
  git config pull.rebase false  # merge (the default strategy)
+            32
$ git show -q --pretty=format:%G? HEAD
 

-            33
  git config pull.rebase true   # rebase
+            33
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 flavour
 

-            34
  git config pull.ff only       # fast-forward only
-

-            35
-

-            36
You can replace "git config" with "git config --global" to set a default
-

-            37
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            38
or --ff-only on the command line to override the configured default per
-

-            39
invocation.
-

-            40
-

-            41
Already up to date.
-

-            42
*** syncing flavour
-

-            43
*** synced flavour
-

-            44
 * Sync succeeded
-

-            45
$ git log --format=%ci -1
-

-            46
$ git show -q --pretty=format:%G? HEAD
-

-            47
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 flavour
-

-            48
 * Cache regenerated successfully
+            34
 * Cache regenerated successfully
 

 
         
diff --git a/flavour.txt b/flavour.txt
index 2f4f3cea95b9..4baf5e6918c0 100644
--- a/flavour.txt
+++ b/flavour.txt
@@ -9,22 +9,8 @@
             {'type': 'git', 'uri': 'git://github.com/wimmuskee/flavour.git'}],
  'status': 'unofficial'}
 $ pmaint sync flavour
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/flewkey-overlay.html b/flewkey-overlay.html
index e2ddf8d258a7..cd0d9145848c 100644
--- a/flewkey-overlay.html
+++ b/flewkey-overlay.html
@@ -32,79 +32,53 @@
 

             11
$ pmaint sync flewkey-overlay
 

-            12
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
warning: Pulling without specifying how to reconcile divergent branches is
 

-            16
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
discouraged. You can squelch this message by running one of the following
 

-            17
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
commands sometime before your next pull:
 

-            18
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
 

-            19
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
  git config pull.rebase false  # merge (the default strategy)
 

-            20
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
  git config pull.rebase true   # rebase
 

-            21
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
  git config pull.ff only       # fast-forward only
 

-            22
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
 

-            23
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
You can replace "git config" with "git config --global" to set a default
 

-            24
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            25
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
or --ff-only on the command line to override the configured default per
 

-            26
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
invocation.
 

-            27
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
 

-            28
warning: Pulling without specifying how to reconcile divergent branches is
+            28
Already up to date.
 

-            29
discouraged. You can squelch this message by running one of the following
+            29
*** syncing flewkey-overlay
 

-            30
commands sometime before your next pull:
+            30
*** synced flewkey-overlay
 

-            31
+            31
 * Sync succeeded
 

-            32
  git config pull.rebase false  # merge (the default strategy)
+            32
$ git log --format=%ci -1
 

-            33
  git config pull.rebase true   # rebase
+            33
$ git show -q --pretty=format:%G? HEAD
 

-            34
  git config pull.ff only       # fast-forward only
+            34
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 flewkey-overlay
 

-            35
-

-            36
You can replace "git config" with "git config --global" to set a default
-

-            37
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            38
or --ff-only on the command line to override the configured default per
-

-            39
invocation.
-

-            40
-

-            41
Already up to date.
-

-            42
*** syncing flewkey-overlay
-

-            43
*** synced flewkey-overlay
-

-            44
 * Sync succeeded
-

-            45
$ git log --format=%ci -1
-

-            46
$ git show -q --pretty=format:%G? HEAD
-

-            47
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 flewkey-overlay
-

-            48
 * Cache regenerated successfully
+            35
 * Cache regenerated successfully
 

 
         
diff --git a/flewkey-overlay.txt b/flewkey-overlay.txt
index 2fa31620fa1f..e4f100d14bfb 100644
--- a/flewkey-overlay.txt
+++ b/flewkey-overlay.txt
@@ -9,22 +9,9 @@
              'uri': 'https://git.sdf.org/flewkey/flewkey-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync flewkey-overlay
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/flightsim.html b/flightsim.html
index 426df3582031..d2cf72846056 100644
--- a/flightsim.html
+++ b/flightsim.html
@@ -44,79 +44,53 @@
 

             17
$ pmaint sync flightsim
 

-            18
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
warning: Pulling without specifying how to reconcile divergent branches is
 

-            22
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
discouraged. You can squelch this message by running one of the following
 

-            23
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
commands sometime before your next pull:
 

-            24
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 

-            25
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase false  # merge (the default strategy)
 

-            26
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.rebase true   # rebase
 

-            27
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.ff only       # fast-forward only
 

-            28
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
 

-            29
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
You can replace "git config" with "git config --global" to set a default
 

-            30
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            31
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
or --ff-only on the command line to override the configured default per
 

-            32
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
invocation.
 

-            33
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
 

-            34
warning: Pulling without specifying how to reconcile divergent branches is
+            34
Already up to date.
 

-            35
discouraged. You can squelch this message by running one of the following
+            35
*** syncing flightsim
 

-            36
commands sometime before your next pull:
+            36
*** synced flightsim
 

-            37
+            37
 * Sync succeeded
 

-            38
  git config pull.rebase false  # merge (the default strategy)
+            38
$ git log --format=%ci -1
 

-            39
  git config pull.rebase true   # rebase
+            39
$ git show -q --pretty=format:%G? HEAD
 

-            40
  git config pull.ff only       # fast-forward only
+            40
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 flightsim
 

-            41
-

-            42
You can replace "git config" with "git config --global" to set a default
-

-            43
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            44
or --ff-only on the command line to override the configured default per
-

-            45
invocation.
-

-            46
-

-            47
Already up to date.
-

-            48
*** syncing flightsim
-

-            49
*** synced flightsim
-

-            50
 * Sync succeeded
-

-            51
$ git log --format=%ci -1
-

-            52
$ git show -q --pretty=format:%G? HEAD
-

-            53
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 flightsim
-

-            54
 * Cache regenerated successfully
+            41
 * Cache regenerated successfully
 

 
         
diff --git a/flightsim.txt b/flightsim.txt
index d89cb3701751..1f887d8fd0c0 100644
--- a/flightsim.txt
+++ b/flightsim.txt
@@ -15,19 +15,6 @@
              'uri': 'git@github.com:rafaelmartins/flightsim-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync flightsim
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
diff --git a/floppym.html b/floppym.html
index 7cca69a5b308..0e27fadb0dea 100644
--- a/floppym.html
+++ b/floppym.html
@@ -30,79 +30,53 @@
 

             10
$ pmaint sync floppym
 

-            11
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            11
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            12
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
warning: Pulling without specifying how to reconcile divergent branches is
 

-            15
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
discouraged. You can squelch this message by running one of the following
 

-            16
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
commands sometime before your next pull:
 

-            17
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
 

-            18
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
  git config pull.rebase false  # merge (the default strategy)
 

-            19
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
  git config pull.rebase true   # rebase
 

-            20
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
  git config pull.ff only       # fast-forward only
 

-            21
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
 

-            22
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
You can replace "git config" with "git config --global" to set a default
 

-            23
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            24
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
or --ff-only on the command line to override the configured default per
 

-            25
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
invocation.
 

-            26
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
 

-            27
warning: Pulling without specifying how to reconcile divergent branches is
+            27
Already up to date.
 

-            28
discouraged. You can squelch this message by running one of the following
+            28
*** syncing floppym
 

-            29
commands sometime before your next pull:
+            29
*** synced floppym
 

-            30
+            30
 * Sync succeeded
 

-            31
  git config pull.rebase false  # merge (the default strategy)
+            31
$ git log --format=%ci -1
 

-            32
  git config pull.rebase true   # rebase
+            32
$ git show -q --pretty=format:%G? HEAD
 

-            33
  git config pull.ff only       # fast-forward only
+            33
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 floppym
 

-            34
-

-            35
You can replace "git config" with "git config --global" to set a default
-

-            36
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            37
or --ff-only on the command line to override the configured default per
-

-            38
invocation.
-

-            39
-

-            40
Already up to date.
-

-            41
*** syncing floppym
-

-            42
*** synced floppym
-

-            43
 * Sync succeeded
-

-            44
$ git log --format=%ci -1
-

-            45
$ git show -q --pretty=format:%G? HEAD
-

-            46
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 floppym
-

-            47
 * Cache regenerated successfully
+            34
 * Cache regenerated successfully
 

 
         
diff --git a/floppym.txt b/floppym.txt
index e8a60bf74922..2877595e37e8 100644
--- a/floppym.txt
+++ b/floppym.txt
@@ -8,19 +8,6 @@
  'source': [{'type': 'git', 'uri': 'https://github.com/floppym/floppym'}],
  'status': 'unofficial'}
 $ pmaint sync floppym
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
diff --git a/flow.html b/flow.html
index 6557595f2a72..a000e1c5efc5 100644
--- a/flow.html
+++ b/flow.html
@@ -32,79 +32,53 @@
 

             11
$ pmaint sync flow
 

-            12
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
warning: Pulling without specifying how to reconcile divergent branches is
 

-            16
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
discouraged. You can squelch this message by running one of the following
 

-            17
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
commands sometime before your next pull:
 

-            18
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
 

-            19
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
  git config pull.rebase false  # merge (the default strategy)
 

-            20
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
  git config pull.rebase true   # rebase
 

-            21
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
  git config pull.ff only       # fast-forward only
 

-            22
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
 

-            23
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
You can replace "git config" with "git config --global" to set a default
 

-            24
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            25
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
or --ff-only on the command line to override the configured default per
 

-            26
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
invocation.
 

-            27
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
 

-            28
warning: Pulling without specifying how to reconcile divergent branches is
+            28
Already up to date.
 

-            29
discouraged. You can squelch this message by running one of the following
+            29
*** syncing flow
 

-            30
commands sometime before your next pull:
+            30
*** synced flow
 

-            31
+            31
 * Sync succeeded
 

-            32
  git config pull.rebase false  # merge (the default strategy)
+            32
$ git log --format=%ci -1
 

-            33
  git config pull.rebase true   # rebase
+            33
$ git show -q --pretty=format:%G? HEAD
 

-            34
  git config pull.ff only       # fast-forward only
+            34
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 flow
 

-            35
-

-            36
You can replace "git config" with "git config --global" to set a default
-

-            37
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            38
or --ff-only on the command line to override the configured default per
-

-            39
invocation.
-

-            40
-

-            41
Already up to date.
-

-            42
*** syncing flow
-

-            43
*** synced flow
-

-            44
 * Sync succeeded
-

-            45
$ git log --format=%ci -1
-

-            46
$ git show -q --pretty=format:%G? HEAD
-

-            47
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 flow
-

-            48
 * Cache regenerated successfully
+            35
 * Cache regenerated successfully
 

 
         
diff --git a/flow.txt b/flow.txt
index 164d7da6e79f..7d74076a40c0 100644
--- a/flow.txt
+++ b/flow.txt
@@ -9,19 +9,6 @@
              'uri': 'https://gitlab.com/Flow/flow-s-ebuilds.git'}],
  'status': 'unofficial'}
 $ pmaint sync flow
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
diff --git a/flussence.html b/flussence.html
index 647ad58de015..649fe5d4c712 100644
--- a/flussence.html
+++ b/flussence.html
@@ -38,79 +38,53 @@
 

             14
$ pmaint sync flussence
 

-            15
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
warning: Pulling without specifying how to reconcile divergent branches is
 

-            19
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
discouraged. You can squelch this message by running one of the following
 

-            20
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
commands sometime before your next pull:
 

-            21
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
 

-            22
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase false  # merge (the default strategy)
 

-            23
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase true   # rebase
 

-            24
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.ff only       # fast-forward only
 

-            25
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 

-            26
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
You can replace "git config" with "git config --global" to set a default
 

-            27
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            28
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
or --ff-only on the command line to override the configured default per
 

-            29
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
invocation.
 

-            30
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
 

-            31
warning: Pulling without specifying how to reconcile divergent branches is
+            31
Already up to date.
 

-            32
discouraged. You can squelch this message by running one of the following
+            32
*** syncing flussence
 

-            33
commands sometime before your next pull:
+            33
*** synced flussence
 

-            34
+            34
 * Sync succeeded
 

-            35
  git config pull.rebase false  # merge (the default strategy)
+            35
$ git log --format=%ci -1
 

-            36
  git config pull.rebase true   # rebase
+            36
$ git show -q --pretty=format:%G? HEAD
 

-            37
  git config pull.ff only       # fast-forward only
+            37
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 flussence
 

-            38
-

-            39
You can replace "git config" with "git config --global" to set a default
-

-            40
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            41
or --ff-only on the command line to override the configured default per
-

-            42
invocation.
-

-            43
-

-            44
Already up to date.
-

-            45
*** syncing flussence
-

-            46
*** synced flussence
-

-            47
 * Sync succeeded
-

-            48
$ git log --format=%ci -1
-

-            49
$ git show -q --pretty=format:%G? HEAD
-

-            50
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 flussence
-

-            51
 * Cache regenerated successfully
+            38
 * Cache regenerated successfully
 

 
         
diff --git a/flussence.txt b/flussence.txt
index 38da12bff8ec..b3b13c5ab178 100644
--- a/flussence.txt
+++ b/flussence.txt
@@ -12,19 +12,6 @@
              'uri': 'ssh://git@repo.or.cz/flussence-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync flussence
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
diff --git a/fol4.html b/fol4.html
index 0a1d72f4f07b..58e8235d4cfd 100644
--- a/fol4.html
+++ b/fol4.html
@@ -30,81 +30,53 @@
 

             10
$ pmaint sync fol4
 

-            11
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            11
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            12
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
warning: Pulling without specifying how to reconcile divergent branches is
 

-            14
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
discouraged. You can squelch this message by running one of the following
 

-            15
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
commands sometime before your next pull:
 

-            16
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
 

-            17
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
  git config pull.rebase false  # merge (the default strategy)
 

-            18
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
  git config pull.rebase true   # rebase
 

-            19
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
  git config pull.ff only       # fast-forward only
 

-            20
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
 

-            21
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
You can replace "git config" with "git config --global" to set a default
 

-            22
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            23
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
or --ff-only on the command line to override the configured default per
 

-            24
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
invocation.
 

-            25
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 

-            26
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
warning: redirecting to https://gitlab.com/madsl/fol4.git/
 

-            27
warning: Pulling without specifying how to reconcile divergent branches is
+            27
Already up to date.
 

-            28
discouraged. You can squelch this message by running one of the following
+            28
*** syncing fol4
 

-            29
commands sometime before your next pull:
+            29
*** synced fol4
 

-            30
+            30
 * Sync succeeded
 

-            31
  git config pull.rebase false  # merge (the default strategy)
+            31
$ git log --format=%ci -1
 

-            32
  git config pull.rebase true   # rebase
+            32
$ git show -q --pretty=format:%G? HEAD
 

-            33
  git config pull.ff only       # fast-forward only
+            33
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 fol4
 

-            34
-

-            35
You can replace "git config" with "git config --global" to set a default
-

-            36
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            37
or --ff-only on the command line to override the configured default per
-

-            38
invocation.
-

-            39
-

-            40
warning: redirecting to https://gitlab.com/madsl/fol4.git/
-

-            41
Already up to date.
-

-            42
*** syncing fol4
-

-            43
*** synced fol4
-

-            44
 * Sync succeeded
-

-            45
$ git log --format=%ci -1
-

-            46
$ git show -q --pretty=format:%G? HEAD
-

-            47
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 fol4
-

-            48
 * Cache regenerated successfully
+            34
 * Cache regenerated successfully
 

 
         
diff --git a/fol4.txt b/fol4.txt
index 3f396591e7b2..07685bb07b9a 100644
--- a/fol4.txt
+++ b/fol4.txt
@@ -8,21 +8,7 @@
             {'type': 'git', 'uri': 'git+ssh://git@gitlab.com/madsl/fol4.git'}],
  'status': 'unofficial'}
 $ pmaint sync fol4
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
diff --git a/foo-overlay.html b/foo-overlay.html
index 684a84b8d3c8..2e611448f2c6 100644
--- a/foo-overlay.html
+++ b/foo-overlay.html
@@ -38,79 +38,51 @@
 

             14
$ pmaint sync foo-overlay
 

-            15
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
warning: Pulling without specifying how to reconcile divergent branches is
 

-            18
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
discouraged. You can squelch this message by running one of the following
 

-            19
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
commands sometime before your next pull:
 

-            20
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
 

-            21
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
  git config pull.rebase false  # merge (the default strategy)
 

-            22
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase true   # rebase
 

-            23
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.ff only       # fast-forward only
 

-            24
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 

-            25
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
You can replace "git config" with "git config --global" to set a default
 

-            26
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            27
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
or --ff-only on the command line to override the configured default per
 

-            28
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
invocation.
 

-            29
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
 

-            30
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
Already up to date.
 

-            31
warning: Pulling without specifying how to reconcile divergent branches is
+            31
*** syncing foo-overlay
 

-            32
discouraged. You can squelch this message by running one of the following
+            32
*** synced foo-overlay
 

-            33
commands sometime before your next pull:
+            33
 * Sync succeeded
 

-            34
+            34
$ git log --format=%ci -1
 

-            35
  git config pull.rebase false  # merge (the default strategy)
+            35
$ git show -q --pretty=format:%G? HEAD
 

-            36
  git config pull.rebase true   # rebase
+            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 foo-overlay
 

-            37
  git config pull.ff only       # fast-forward only
-

-            38
-

-            39
You can replace "git config" with "git config --global" to set a default
-

-            40
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            41
or --ff-only on the command line to override the configured default per
-

-            42
invocation.
-

-            43
-

-            44
Already up to date.
-

-            45
*** syncing foo-overlay
-

-            46
*** synced foo-overlay
-

-            47
 * Sync succeeded
-

-            48
$ git log --format=%ci -1
-

-            49
$ git show -q --pretty=format:%G? HEAD
-

-            50
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 foo-overlay
-

-            51
 * Cache regenerated successfully
+            37
 * Cache regenerated successfully
 

 
         
diff --git a/foo-overlay.txt b/foo-overlay.txt
index 4e44b737e735..4fa1d06571d0 100644
--- a/foo-overlay.txt
+++ b/foo-overlay.txt
@@ -12,21 +12,7 @@
              'uri': 'https://github.com/slashbeast/foo-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync foo-overlay
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
diff --git a/fordfrog.html b/fordfrog.html
index 1b271efc3eec..8130ddea0f3c 100644
--- a/fordfrog.html
+++ b/fordfrog.html
@@ -42,80 +42,30 @@
 

             16
$ pmaint sync fordfrog
 

-            17
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
Cloning into '/var/lib/repo-mirror-ci/sync/fordfrog'...
 

-            22
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
*** syncing fordfrog
 

-            23
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
*** synced fordfrog
 

-            24
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 * Sync succeeded
 

-            25
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
$ git log --format=%ci -1
 

-            26
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
$ git show -q --pretty=format:%G? HEAD
 

-            27
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 fordfrog
 

-            28
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
 * Cache regenerated successfully
 

-            29
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            30
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            31
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            32
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            33
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            34
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            35
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            36
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            37
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            38
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            39
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            40
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            41
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            42
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            43
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            44
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            45
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            46
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            47
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            48
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            49
Cloning into '/var/lib/repo-mirror-ci/sync/fordfrog'...
-

-            50
fatal: unable to access 'https://anongit.gentoo.org/git/dev/fordfrog.git/': The requested URL returned error: 504
-

-            51
*** syncing fordfrog
-

-            52
!!! failed syncing fordfrog
-

-            53
 * Sync failed with 1
-
[FATAL]
 
         
     
diff --git a/fordfrog.txt b/fordfrog.txt
index 6bd43d5fdc1a..5e2e4cd4ab3f 100644
--- a/fordfrog.txt
+++ b/fordfrog.txt
@@ -14,40 +14,15 @@
  'status': 'official'}
  * Adding new repository
 $ pmaint sync fordfrog
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 Cloning into '/var/lib/repo-mirror-ci/sync/fordfrog'...
-fatal: unable to access 'https://anongit.gentoo.org/git/dev/fordfrog.git/': The requested URL returned error: 504
 *** syncing fordfrog
-!!! failed syncing fordfrog
- * Sync failed with 1
+*** synced fordfrog
+ * Sync succeeded
+$ git log --format=%ci -1
+$ git show -q --pretty=format:%G? HEAD
+$ pmaint regen --use-local-desc --pkg-desc-index -t 1 fordfrog
+ * Cache regenerated successfully
diff --git a/fowlay.html b/fowlay.html
index 0ff8a6a01c51..96eebab9e9cf 100644
--- a/fowlay.html
+++ b/fowlay.html
@@ -34,79 +34,51 @@
 

             12
$ pmaint sync fowlay
 

-            13
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
warning: Pulling without specifying how to reconcile divergent branches is
 

-            16
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
discouraged. You can squelch this message by running one of the following
 

-            17
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
commands sometime before your next pull:
 

-            18
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
 

-            19
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
  git config pull.rebase false  # merge (the default strategy)
 

-            20
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
  git config pull.rebase true   # rebase
 

-            21
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
  git config pull.ff only       # fast-forward only
 

-            22
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
 

-            23
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
You can replace "git config" with "git config --global" to set a default
 

-            24
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            25
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
or --ff-only on the command line to override the configured default per
 

-            26
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
invocation.
 

-            27
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
 

-            28
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
Already up to date.
 

-            29
warning: Pulling without specifying how to reconcile divergent branches is
+            29
*** syncing fowlay
 

-            30
discouraged. You can squelch this message by running one of the following
+            30
*** synced fowlay
 

-            31
commands sometime before your next pull:
+            31
 * Sync succeeded
 

-            32
+            32
$ git log --format=%ci -1
 

-            33
  git config pull.rebase false  # merge (the default strategy)
+            33
$ git show -q --pretty=format:%G? HEAD
 

-            34
  git config pull.rebase true   # rebase
+            34
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 fowlay
 

-            35
  git config pull.ff only       # fast-forward only
-

-            36
-

-            37
You can replace "git config" with "git config --global" to set a default
-

-            38
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            39
or --ff-only on the command line to override the configured default per
-

-            40
invocation.
-

-            41
-

-            42
Already up to date.
-

-            43
*** syncing fowlay
-

-            44
*** synced fowlay
-

-            45
 * Sync succeeded
-

-            46
$ git log --format=%ci -1
-

-            47
$ git show -q --pretty=format:%G? HEAD
-

-            48
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 fowlay
-

-            49
 * Cache regenerated successfully
+            35
 * Cache regenerated successfully
 

 
         
diff --git a/fowlay.txt b/fowlay.txt
index bd30824d4cf2..7afec0cdb939 100644
--- a/fowlay.txt
+++ b/fowlay.txt
@@ -10,21 +10,7 @@
              'uri': 'https://github.com/fowlay/fowlay-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync fowlay
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
diff --git a/foxiverlay.html b/foxiverlay.html
index 212602d7562c..dccb87808860 100644
--- a/foxiverlay.html
+++ b/foxiverlay.html
@@ -36,79 +36,51 @@
 

             13
$ pmaint sync foxiverlay
 

-            14
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
warning: Pulling without specifying how to reconcile divergent branches is
 

-            17
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
discouraged. You can squelch this message by running one of the following
 

-            18
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
commands sometime before your next pull:
 

-            19
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
 

-            20
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
  git config pull.rebase false  # merge (the default strategy)
 

-            21
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
  git config pull.rebase true   # rebase
 

-            22
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.ff only       # fast-forward only
 

-            23
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
 

-            24
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
You can replace "git config" with "git config --global" to set a default
 

-            25
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            26
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
or --ff-only on the command line to override the configured default per
 

-            27
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
invocation.
 

-            28
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
 

-            29
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
Already up to date.
 

-            30
warning: Pulling without specifying how to reconcile divergent branches is
+            30
*** syncing foxiverlay
 

-            31
discouraged. You can squelch this message by running one of the following
+            31
*** synced foxiverlay
 

-            32
commands sometime before your next pull:
+            32
 * Sync succeeded
 

-            33
+            33
$ git log --format=%ci -1
 

-            34
  git config pull.rebase false  # merge (the default strategy)
+            34
$ git show -q --pretty=format:%G? HEAD
 

-            35
  git config pull.rebase true   # rebase
+            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 foxiverlay
 

-            36
  git config pull.ff only       # fast-forward only
-

-            37
-

-            38
You can replace "git config" with "git config --global" to set a default
-

-            39
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            40
or --ff-only on the command line to override the configured default per
-

-            41
invocation.
-

-            42
-

-            43
Already up to date.
-

-            44
*** syncing foxiverlay
-

-            45
*** synced foxiverlay
-

-            46
 * Sync succeeded
-

-            47
$ git log --format=%ci -1
-

-            48
$ git show -q --pretty=format:%G? HEAD
-

-            49
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 foxiverlay
-

-            50
 * Cache regenerated successfully
+            36
 * Cache regenerated successfully
 

 
         
diff --git a/foxiverlay.txt b/foxiverlay.txt
index 93243fdd6178..64712ad0997a 100644
--- a/foxiverlay.txt
+++ b/foxiverlay.txt
@@ -11,21 +11,7 @@
             {'type': 'git', 'uri': 'git@github.com:Pekkari/foxiverlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync foxiverlay
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
diff --git a/freeswitch.html b/freeswitch.html
index a76e92ee81e3..3f8a306ab91e 100644
--- a/freeswitch.html
+++ b/freeswitch.html
@@ -32,89 +32,61 @@
 

             11
$ pmaint sync freeswitch
 

-            12
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
warning: Pulling without specifying how to reconcile divergent branches is
 

-            15
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
discouraged. You can squelch this message by running one of the following
 

-            16
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
commands sometime before your next pull:
 

-            17
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
 

-            18
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
  git config pull.rebase false  # merge (the default strategy)
 

-            19
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
  git config pull.rebase true   # rebase
 

-            20
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
  git config pull.ff only       # fast-forward only
 

-            21
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
 

-            22
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
You can replace "git config" with "git config --global" to set a default
 

-            23
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            24
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
or --ff-only on the command line to override the configured default per
 

-            25
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
invocation.
 

-            26
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
 

-            27
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
Already up to date.
 

-            28
warning: Pulling without specifying how to reconcile divergent branches is
+            28
*** syncing freeswitch
 

-            29
discouraged. You can squelch this message by running one of the following
+            29
*** synced freeswitch
 

-            30
commands sometime before your next pull:
+            30
 * Sync succeeded
 

-            31
+            31
$ git log --format=%ci -1
 

-            32
  git config pull.rebase false  # merge (the default strategy)
+            32
$ git show -q --pretty=format:%G? HEAD
 

-            33
  git config pull.rebase true   # rebase
+            33
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 freeswitch
 

-            34
  git config pull.ff only       # fast-forward only
-

-            35
-

-            36
You can replace "git config" with "git config --global" to set a default
-

-            37
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            38
or --ff-only on the command line to override the configured default per
-

-            39
invocation.
-

-            40
-

-            41
Already up to date.
-

-            42
*** syncing freeswitch
-

-            43
*** synced freeswitch
-

-            44
 * Sync succeeded
-

-            45
$ git log --format=%ci -1
-

-            46
$ git show -q --pretty=format:%G? HEAD
-

-            47
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 freeswitch
-

-            48
 * net-dialup/capi4k-utils-3.2.2: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            34
 * net-dialup/capi4k-utils-3.2.2: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            49
 * net-dialup/misdnuser-2.0.13: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            35
 * net-dialup/misdnuser-2.0.13: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            50
 * net-libs/libSquirrelFish-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            36
 * net-libs/libSquirrelFish-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            51
 * net-libs/libisdn-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            37
 * net-libs/libisdn-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            52
 * net-voip/freeswitch-mod_ssh-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            38
 * net-voip/freeswitch-mod_ssh-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            53
 * Cache regen failed with 1
+            39
 * Cache regen failed with 1
 

 
         
diff --git a/freeswitch.txt b/freeswitch.txt
index 38703f9f20e7..d14b64570b44 100644
--- a/freeswitch.txt
+++ b/freeswitch.txt
@@ -9,21 +9,7 @@
  'source': [{'type': 'git', 'uri': 'git://github.com/alphallc/freeswitch'}],
  'status': 'unofficial'}
 $ pmaint sync freeswitch
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
diff --git a/fritteli.html b/fritteli.html
index 1f36ce091981..fa78ec9241c3 100644
--- a/fritteli.html
+++ b/fritteli.html
@@ -38,81 +38,51 @@
 

             14
$ pmaint sync fritteli
 

-            15
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
warning: Pulling without specifying how to reconcile divergent branches is
 

-            18
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
discouraged. You can squelch this message by running one of the following
 

-            19
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
commands sometime before your next pull:
 

-            20
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
 

-            21
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
  git config pull.rebase false  # merge (the default strategy)
 

-            22
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase true   # rebase
 

-            23
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.ff only       # fast-forward only
 

-            24
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 

-            25
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
You can replace "git config" with "git config --global" to set a default
 

-            26
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            27
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
or --ff-only on the command line to override the configured default per
 

-            28
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
invocation.
 

-            29
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
 

-            30
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
Already up to date.
 

-            31
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
*** syncing fritteli
 

-            32
warning: Pulling without specifying how to reconcile divergent branches is
+            32
*** synced fritteli
 

-            33
discouraged. You can squelch this message by running one of the following
+            33
 * Sync succeeded
 

-            34
commands sometime before your next pull:
+            34
$ git log --format=%ci -1
 

-            35
+            35
$ git show -q --pretty=format:%G? HEAD
 

-            36
  git config pull.rebase false  # merge (the default strategy)
+            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 fritteli
 

-            37
  git config pull.rebase true   # rebase
-

-            38
  git config pull.ff only       # fast-forward only
-

-            39
-

-            40
You can replace "git config" with "git config --global" to set a default
-

-            41
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            42
or --ff-only on the command line to override the configured default per
-

-            43
invocation.
-

-            44
-

-            45
Already up to date.
-

-            46
*** syncing fritteli
-

-            47
*** synced fritteli
-

-            48
 * Sync succeeded
-

-            49
$ git log --format=%ci -1
-

-            50
$ git show -q --pretty=format:%G? HEAD
-

-            51
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 fritteli
-

-            52
 * Cache regenerated successfully
+            37
 * Cache regenerated successfully
 

 
         
diff --git a/fritteli.txt b/fritteli.txt
index a59a3673e0f7..9ae11fd480c1 100644
--- a/fritteli.txt
+++ b/fritteli.txt
@@ -12,23 +12,8 @@
              'uri': 'git+ssh://git@github.com/fritteli/gentoo-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync fritteli
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/frostyx.html b/frostyx.html
index e846eb20611d..c6ebcc2dc1f3 100644
--- a/frostyx.html
+++ b/frostyx.html
@@ -38,85 +38,55 @@
 

             14
$ pmaint sync frostyx
 

-            15
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
warning: Pulling without specifying how to reconcile divergent branches is
 

-            18
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
discouraged. You can squelch this message by running one of the following
 

-            19
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
commands sometime before your next pull:
 

-            20
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
 

-            21
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
  git config pull.rebase false  # merge (the default strategy)
 

-            22
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase true   # rebase
 

-            23
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.ff only       # fast-forward only
 

-            24
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 

-            25
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
You can replace "git config" with "git config --global" to set a default
 

-            26
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            27
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
or --ff-only on the command line to override the configured default per
 

-            28
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
invocation.
 

-            29
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
 

-            30
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
Already up to date.
 

-            31
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
*** syncing frostyx
 

-            32
warning: Pulling without specifying how to reconcile divergent branches is
+            32
*** synced frostyx
 

-            33
discouraged. You can squelch this message by running one of the following
+            33
 * Sync succeeded
 

-            34
commands sometime before your next pull:
+            34
$ git log --format=%ci -1
 

-            35
+            35
$ git show -q --pretty=format:%G? HEAD
 

-            36
  git config pull.rebase false  # merge (the default strategy)
+            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 frostyx
 

-            37
  git config pull.rebase true   # rebase
-

-            38
  git config pull.ff only       # fast-forward only
-

-            39
-

-            40
You can replace "git config" with "git config --global" to set a default
-

-            41
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            42
or --ff-only on the command line to override the configured default per
-

-            43
invocation.
-

-            44
-

-            45
Already up to date.
-

-            46
*** syncing frostyx
-

-            47
*** synced frostyx
-

-            48
 * Sync succeeded
-

-            49
$ git log --format=%ci -1
-

-            50
$ git show -q --pretty=format:%G? HEAD
-

-            51
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 frostyx
-

-            52
 * app-misc/ti-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            37
 * app-misc/ti-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            53
 * app-misc/tracer-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            38
 * app-misc/tracer-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            54
 * Cache regen failed with 1
+            39
 * Cache regen failed with 1
 

 
         
diff --git a/frostyx.txt b/frostyx.txt
index c05c29c62aeb..e12fc2a363c5 100644
--- a/frostyx.txt
+++ b/frostyx.txt
@@ -12,23 +12,8 @@
              'uri': 'git@github.com:FrostyX/gentoo-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync frostyx
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/frr-gentoo.html b/frr-gentoo.html
index a25d644186c4..f94ad6cf56ec 100644
--- a/frr-gentoo.html
+++ b/frr-gentoo.html
@@ -38,81 +38,51 @@
 

             14
$ pmaint sync frr-gentoo
 

-            15
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
warning: Pulling without specifying how to reconcile divergent branches is
 

-            18
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
discouraged. You can squelch this message by running one of the following
 

-            19
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
commands sometime before your next pull:
 

-            20
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
 

-            21
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
  git config pull.rebase false  # merge (the default strategy)
 

-            22
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase true   # rebase
 

-            23
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.ff only       # fast-forward only
 

-            24
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 

-            25
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
You can replace "git config" with "git config --global" to set a default
 

-            26
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            27
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
or --ff-only on the command line to override the configured default per
 

-            28
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
invocation.
 

-            29
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
 

-            30
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
Already up to date.
 

-            31
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
*** syncing frr-gentoo
 

-            32
warning: Pulling without specifying how to reconcile divergent branches is
+            32
*** synced frr-gentoo
 

-            33
discouraged. You can squelch this message by running one of the following
+            33
 * Sync succeeded
 

-            34
commands sometime before your next pull:
+            34
$ git log --format=%ci -1
 

-            35
+            35
$ git show -q --pretty=format:%G? HEAD
 

-            36
  git config pull.rebase false  # merge (the default strategy)
+            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 frr-gentoo
 

-            37
  git config pull.rebase true   # rebase
-

-            38
  git config pull.ff only       # fast-forward only
-

-            39
-

-            40
You can replace "git config" with "git config --global" to set a default
-

-            41
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            42
or --ff-only on the command line to override the configured default per
-

-            43
invocation.
-

-            44
-

-            45
Already up to date.
-

-            46
*** syncing frr-gentoo
-

-            47
*** synced frr-gentoo
-

-            48
 * Sync succeeded
-

-            49
$ git log --format=%ci -1
-

-            50
$ git show -q --pretty=format:%G? HEAD
-

-            51
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 frr-gentoo
-

-            52
 * Cache regenerated successfully
+            37
 * Cache regenerated successfully
 

 
         
diff --git a/frr-gentoo.txt b/frr-gentoo.txt
index 2c3fb4a467da..d33044372719 100644
--- a/frr-gentoo.txt
+++ b/frr-gentoo.txt
@@ -12,23 +12,8 @@
              'uri': 'git+ssh://git@github.com:FRRouting/gentoo-overlay.git'}],
  'status': 'official'}
 $ pmaint sync frr-gentoo
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/fusion809.html b/fusion809.html
index 8a702b7dd977..85bfcfe94408 100644
--- a/fusion809.html
+++ b/fusion809.html
@@ -38,107 +38,77 @@
 

             14
$ pmaint sync fusion809
 

-            15
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
warning: Pulling without specifying how to reconcile divergent branches is
 

-            18
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
discouraged. You can squelch this message by running one of the following
 

-            19
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
commands sometime before your next pull:
 

-            20
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
 

-            21
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
  git config pull.rebase false  # merge (the default strategy)
 

-            22
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase true   # rebase
 

-            23
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.ff only       # fast-forward only
 

-            24
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 

-            25
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
You can replace "git config" with "git config --global" to set a default
 

-            26
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            27
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
or --ff-only on the command line to override the configured default per
 

-            28
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
invocation.
 

-            29
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
 

-            30
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
From https://github.com/fusion809/fusion809-overlay
 

-            31
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
   5557b2e..9c57b9d  master     -> origin/master
 

-            32
warning: Pulling without specifying how to reconcile divergent branches is
+            32
Updating 5557b2e..9c57b9d
 

-            33
discouraged. You can squelch this message by running one of the following
+            33
Fast-forward
 

-            34
commands sometime before your next pull:
+            34
 app-editors/gvim/Manifest                                               | 2 +-
 

-            35
+            35
 app-editors/gvim/{gvim-8.2.1892.ebuild => gvim-8.2.1895.ebuild}         | 0
 

-            36
  git config pull.rebase false  # merge (the default strategy)
+            36
 app-editors/vim-core/Manifest                                           | 2 +-
 

-            37
  git config pull.rebase true   # rebase
+            37
 .../vim-core/{vim-core-8.2.1892.ebuild => vim-core-8.2.1895.ebuild}     | 0
 

-            38
  git config pull.ff only       # fast-forward only
+            38
 app-editors/vim/Manifest                                                | 2 +-
 

-            39
+            39
 app-editors/vim/{vim-8.2.1892.ebuild => vim-8.2.1895.ebuild}            | 0
 

-            40
You can replace "git config" with "git config --global" to set a default
+            40
 6 files changed, 3 insertions(+), 3 deletions(-)
 

-            41
preference for all repositories. You can also pass --rebase, --no-rebase,
+            41
 rename app-editors/gvim/{gvim-8.2.1892.ebuild => gvim-8.2.1895.ebuild} (100%)
 

-            42
or --ff-only on the command line to override the configured default per
+            42
 rename app-editors/vim-core/{vim-core-8.2.1892.ebuild => vim-core-8.2.1895.ebuild} (100%)
 

-            43
invocation.
+            43
 rename app-editors/vim/{vim-8.2.1892.ebuild => vim-8.2.1895.ebuild} (100%)
 

-            44
+            44
*** syncing fusion809
 

-            45
From https://github.com/fusion809/fusion809-overlay
+            45
*** synced fusion809
 

-            46
   153d337..5557b2e  master     -> origin/master
+            46
 * Sync succeeded
 

-            47
Updating 153d337..5557b2e
+            47
$ git log --format=%ci -1
 

-            48
Fast-forward
+            48
$ git show -q --pretty=format:%G? HEAD
 

-            49
 app-editors/gvim/Manifest                                               | 2 +-
+            49
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 fusion809
 

-            50
 app-editors/gvim/{gvim-8.2.1891.ebuild => gvim-8.2.1892.ebuild}         | 0
-

-            51
 app-editors/vim-core/Manifest                                           | 2 +-
-

-            52
 .../vim-core/{vim-core-8.2.1891.ebuild => vim-core-8.2.1892.ebuild}     | 0
-

-            53
 app-editors/vim/Manifest                                                | 2 +-
-

-            54
 app-editors/vim/{vim-8.2.1891.ebuild => vim-8.2.1892.ebuild}            | 0
-

-            55
 6 files changed, 3 insertions(+), 3 deletions(-)
-

-            56
 rename app-editors/gvim/{gvim-8.2.1891.ebuild => gvim-8.2.1892.ebuild} (100%)
-

-            57
 rename app-editors/vim-core/{vim-core-8.2.1891.ebuild => vim-core-8.2.1892.ebuild} (100%)
-

-            58
 rename app-editors/vim/{vim-8.2.1891.ebuild => vim-8.2.1892.ebuild} (100%)
-

-            59
*** syncing fusion809
-

-            60
*** synced fusion809
-

-            61
 * Sync succeeded
-

-            62
$ git log --format=%ci -1
-

-            63
$ git show -q --pretty=format:%G? HEAD
-

-            64
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 fusion809
-

-            65
 * Cache regenerated successfully
+            50
 * Cache regenerated successfully
 

 
         
diff --git a/fusion809.txt b/fusion809.txt
index 2a8b022231c0..f80097c9e698 100644
--- a/fusion809.txt
+++ b/fusion809.txt
@@ -12,23 +12,8 @@
              'uri': 'git://github.com/fusion809/fusion809-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync fusion809
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
@@ -43,19 +28,19 @@ or --ff-only on the command line to override the configured default per
 invocation.
 
 From https://github.com/fusion809/fusion809-overlay
-   153d337..5557b2e  master     -> origin/master
-Updating 153d337..5557b2e
+   5557b2e..9c57b9d  master     -> origin/master
+Updating 5557b2e..9c57b9d
 Fast-forward
  app-editors/gvim/Manifest                                               | 2 +-
- app-editors/gvim/{gvim-8.2.1891.ebuild => gvim-8.2.1892.ebuild}         | 0
+ app-editors/gvim/{gvim-8.2.1892.ebuild => gvim-8.2.1895.ebuild}         | 0
  app-editors/vim-core/Manifest                                           | 2 +-
- .../vim-core/{vim-core-8.2.1891.ebuild => vim-core-8.2.1892.ebuild}     | 0
+ .../vim-core/{vim-core-8.2.1892.ebuild => vim-core-8.2.1895.ebuild}     | 0
  app-editors/vim/Manifest                                                | 2 +-
- app-editors/vim/{vim-8.2.1891.ebuild => vim-8.2.1892.ebuild}            | 0
+ app-editors/vim/{vim-8.2.1892.ebuild => vim-8.2.1895.ebuild}            | 0
  6 files changed, 3 insertions(+), 3 deletions(-)
- rename app-editors/gvim/{gvim-8.2.1891.ebuild => gvim-8.2.1892.ebuild} (100%)
- rename app-editors/vim-core/{vim-core-8.2.1891.ebuild => vim-core-8.2.1892.ebuild} (100%)
- rename app-editors/vim/{vim-8.2.1891.ebuild => vim-8.2.1892.ebuild} (100%)
+ rename app-editors/gvim/{gvim-8.2.1892.ebuild => gvim-8.2.1895.ebuild} (100%)
+ rename app-editors/vim-core/{vim-core-8.2.1892.ebuild => vim-core-8.2.1895.ebuild} (100%)
+ rename app-editors/vim/{vim-8.2.1892.ebuild => vim-8.2.1895.ebuild} (100%)
 *** syncing fusion809
 *** synced fusion809
  * Sync succeeded
diff --git a/fuverlay.html b/fuverlay.html
index 4b9cf067b078..58f25301a348 100644
--- a/fuverlay.html
+++ b/fuverlay.html
@@ -32,81 +32,51 @@
 

             11
$ pmaint sync fuverlay
 

-            12
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
warning: Pulling without specifying how to reconcile divergent branches is
 

-            15
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
discouraged. You can squelch this message by running one of the following
 

-            16
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
commands sometime before your next pull:
 

-            17
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
 

-            18
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
  git config pull.rebase false  # merge (the default strategy)
 

-            19
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
  git config pull.rebase true   # rebase
 

-            20
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
  git config pull.ff only       # fast-forward only
 

-            21
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
 

-            22
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
You can replace "git config" with "git config --global" to set a default
 

-            23
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            24
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
or --ff-only on the command line to override the configured default per
 

-            25
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
invocation.
 

-            26
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
 

-            27
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
Already up to date.
 

-            28
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
*** syncing fuverlay
 

-            29
warning: Pulling without specifying how to reconcile divergent branches is
+            29
*** synced fuverlay
 

-            30
discouraged. You can squelch this message by running one of the following
+            30
 * Sync succeeded
 

-            31
commands sometime before your next pull:
+            31
$ git log --format=%ci -1
 

-            32
+            32
$ git show -q --pretty=format:%G? HEAD
 

-            33
  git config pull.rebase false  # merge (the default strategy)
+            33
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 fuverlay
 

-            34
  git config pull.rebase true   # rebase
-

-            35
  git config pull.ff only       # fast-forward only
-

-            36
-

-            37
You can replace "git config" with "git config --global" to set a default
-

-            38
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            39
or --ff-only on the command line to override the configured default per
-

-            40
invocation.
-

-            41
-

-            42
Already up to date.
-

-            43
*** syncing fuverlay
-

-            44
*** synced fuverlay
-

-            45
 * Sync succeeded
-

-            46
$ git log --format=%ci -1
-

-            47
$ git show -q --pretty=format:%G? HEAD
-

-            48
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 fuverlay
-

-            49
 * Cache regenerated successfully
+            34
 * Cache regenerated successfully
 

 
         
diff --git a/fuverlay.txt b/fuverlay.txt
index 92d554f13bc0..12c051cc2bb5 100644
--- a/fuverlay.txt
+++ b/fuverlay.txt
@@ -9,23 +9,8 @@
  'source': [{'type': 'git', 'uri': 'https://github.com/funkill/fuverlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync fuverlay
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/gamarouns.html b/gamarouns.html
index cdc984469821..be29c073a943 100644
--- a/gamarouns.html
+++ b/gamarouns.html
@@ -32,81 +32,51 @@
 

             11
$ pmaint sync gamarouns
 

-            12
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
warning: Pulling without specifying how to reconcile divergent branches is
 

-            15
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
discouraged. You can squelch this message by running one of the following
 

-            16
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
commands sometime before your next pull:
 

-            17
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
 

-            18
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
  git config pull.rebase false  # merge (the default strategy)
 

-            19
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
  git config pull.rebase true   # rebase
 

-            20
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
  git config pull.ff only       # fast-forward only
 

-            21
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
 

-            22
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
You can replace "git config" with "git config --global" to set a default
 

-            23
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            24
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
or --ff-only on the command line to override the configured default per
 

-            25
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
invocation.
 

-            26
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
 

-            27
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
Already up to date.
 

-            28
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
*** syncing gamarouns
 

-            29
warning: Pulling without specifying how to reconcile divergent branches is
+            29
*** synced gamarouns
 

-            30
discouraged. You can squelch this message by running one of the following
+            30
 * Sync succeeded
 

-            31
commands sometime before your next pull:
+            31
$ git log --format=%ci -1
 

-            32
+            32
$ git show -q --pretty=format:%G? HEAD
 

-            33
  git config pull.rebase false  # merge (the default strategy)
+            33
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 gamarouns
 

-            34
  git config pull.rebase true   # rebase
-

-            35
  git config pull.ff only       # fast-forward only
-

-            36
-

-            37
You can replace "git config" with "git config --global" to set a default
-

-            38
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            39
or --ff-only on the command line to override the configured default per
-

-            40
invocation.
-

-            41
-

-            42
Already up to date.
-

-            43
*** syncing gamarouns
-

-            44
*** synced gamarouns
-

-            45
 * Sync succeeded
-

-            46
$ git log --format=%ci -1
-

-            47
$ git show -q --pretty=format:%G? HEAD
-

-            48
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 gamarouns
-

-            49
 * Cache regenerated successfully
+            34
 * Cache regenerated successfully
 

 
         
diff --git a/gamarouns.txt b/gamarouns.txt
index 3c6cc6174258..3646ac7e37d2 100644
--- a/gamarouns.txt
+++ b/gamarouns.txt
@@ -9,23 +9,8 @@
  'source': [{'type': 'git', 'uri': 'https://github.com/Amaroun/gamarouns.git'}],
  'status': 'unofficial'}
 $ pmaint sync gamarouns
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/gambas-overlay.html b/gambas-overlay.html
index c6241f7efb45..23371b9d533b 100644
--- a/gambas-overlay.html
+++ b/gambas-overlay.html
@@ -34,81 +34,51 @@
 

             12
$ pmaint sync gambas-overlay
 

-            13
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
warning: Pulling without specifying how to reconcile divergent branches is
 

-            16
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
discouraged. You can squelch this message by running one of the following
 

-            17
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
commands sometime before your next pull:
 

-            18
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
 

-            19
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
  git config pull.rebase false  # merge (the default strategy)
 

-            20
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
  git config pull.rebase true   # rebase
 

-            21
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
  git config pull.ff only       # fast-forward only
 

-            22
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
 

-            23
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
You can replace "git config" with "git config --global" to set a default
 

-            24
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            25
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
or --ff-only on the command line to override the configured default per
 

-            26
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
invocation.
 

-            27
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
 

-            28
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
Already up to date.
 

-            29
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
*** syncing gambas-overlay
 

-            30
warning: Pulling without specifying how to reconcile divergent branches is
+            30
*** synced gambas-overlay
 

-            31
discouraged. You can squelch this message by running one of the following
+            31
 * Sync succeeded
 

-            32
commands sometime before your next pull:
+            32
$ git log --format=%ci -1
 

-            33
+            33
$ git show -q --pretty=format:%G? HEAD
 

-            34
  git config pull.rebase false  # merge (the default strategy)
+            34
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 gambas-overlay
 

-            35
  git config pull.rebase true   # rebase
-

-            36
  git config pull.ff only       # fast-forward only
-

-            37
-

-            38
You can replace "git config" with "git config --global" to set a default
-

-            39
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            40
or --ff-only on the command line to override the configured default per
-

-            41
invocation.
-

-            42
-

-            43
Already up to date.
-

-            44
*** syncing gambas-overlay
-

-            45
*** synced gambas-overlay
-

-            46
 * Sync succeeded
-

-            47
$ git log --format=%ci -1
-

-            48
$ git show -q --pretty=format:%G? HEAD
-

-            49
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 gambas-overlay
-

-            50
 * Cache regenerated successfully
+            35
 * Cache regenerated successfully
 

 
         
diff --git a/gambas-overlay.txt b/gambas-overlay.txt
index c83786e1b72f..2de1fa55fda4 100644
--- a/gambas-overlay.txt
+++ b/gambas-overlay.txt
@@ -10,23 +10,8 @@
              'uri': 'https://github.com/damex/gambas-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync gambas-overlay
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/gamerlay.html b/gamerlay.html
index f1656eb803a3..10560b2a1d84 100644
--- a/gamerlay.html
+++ b/gamerlay.html
@@ -46,93 +46,53 @@
 

             18
 'status': 'unofficial'}
 

-            19
 * Adding new repository
+            19
$ pmaint sync gamerlay
 

-            20
$ pmaint sync gamerlay
+            20
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
warning: Pulling without specifying how to reconcile divergent branches is
 

-            23
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
discouraged. You can squelch this message by running one of the following
 

-            24
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
commands sometime before your next pull:
 

-            25
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 

-            26
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.rebase false  # merge (the default strategy)
 

-            27
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.rebase true   # rebase
 

-            28
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
  git config pull.ff only       # fast-forward only
 

-            29
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
 

-            30
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
You can replace "git config" with "git config --global" to set a default
 

-            31
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            32
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
or --ff-only on the command line to override the configured default per
 

-            33
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
invocation.
 

-            34
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
 

-            35
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
Already up to date.
 

-            36
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
*** syncing gamerlay
 

-            37
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            37
*** synced gamerlay
 

-            38
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            38
 * Sync succeeded
 

-            39
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            39
$ git log --format=%ci -1
 

-            40
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            40
$ git show -q --pretty=format:%G? HEAD
 

-            41
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            41
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 gamerlay
 

-            42
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            43
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            44
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            45
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            46
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            47
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            48
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            49
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            50
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            51
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            52
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            53
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            54
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            55
Cloning into '/var/lib/repo-mirror-ci/sync/gamerlay'...
-

-            56
*** syncing gamerlay
-

-            57
*** synced gamerlay
-

-            58
 * Sync succeeded
-

-            59
$ git log --format=%ci -1
-

-            60
$ git show -q --pretty=format:%G? HEAD
-

-            61
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 gamerlay
-

-            62
 * Cache regenerated successfully
+            42
 * Cache regenerated successfully
 

 
         
diff --git a/gamerlay.txt b/gamerlay.txt
index bd607dd90bc2..18d69a1de420 100644
--- a/gamerlay.txt
+++ b/gamerlay.txt
@@ -16,43 +16,23 @@
             {'type': 'git',
              'uri': 'git+ssh://git@git.gentoo.org/proj/gamerlay.git'}],
  'status': 'unofficial'}
- * Adding new repository
 $ pmaint sync gamerlay
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-Cloning into '/var/lib/repo-mirror-ci/sync/gamerlay'...
+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.
+
+Already up to date.
 *** syncing gamerlay
 *** synced gamerlay
  * Sync succeeded
diff --git a/gcarq.html b/gcarq.html
index eb26714c3fa2..0f57382b6af4 100644
--- a/gcarq.html
+++ b/gcarq.html
@@ -38,81 +38,51 @@
 

             14
$ pmaint sync gcarq
 

-            15
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
warning: Pulling without specifying how to reconcile divergent branches is
 

-            18
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
discouraged. You can squelch this message by running one of the following
 

-            19
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
commands sometime before your next pull:
 

-            20
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
 

-            21
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
  git config pull.rebase false  # merge (the default strategy)
 

-            22
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase true   # rebase
 

-            23
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.ff only       # fast-forward only
 

-            24
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 

-            25
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
You can replace "git config" with "git config --global" to set a default
 

-            26
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            27
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
or --ff-only on the command line to override the configured default per
 

-            28
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
invocation.
 

-            29
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
 

-            30
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
Already up to date.
 

-            31
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
*** syncing gcarq
 

-            32
warning: Pulling without specifying how to reconcile divergent branches is
+            32
*** synced gcarq
 

-            33
discouraged. You can squelch this message by running one of the following
+            33
 * Sync succeeded
 

-            34
commands sometime before your next pull:
+            34
$ git log --format=%ci -1
 

-            35
+            35
$ git show -q --pretty=format:%G? HEAD
 

-            36
  git config pull.rebase false  # merge (the default strategy)
+            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 gcarq
 

-            37
  git config pull.rebase true   # rebase
-

-            38
  git config pull.ff only       # fast-forward only
-

-            39
-

-            40
You can replace "git config" with "git config --global" to set a default
-

-            41
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            42
or --ff-only on the command line to override the configured default per
-

-            43
invocation.
-

-            44
-

-            45
Already up to date.
-

-            46
*** syncing gcarq
-

-            47
*** synced gcarq
-

-            48
 * Sync succeeded
-

-            49
$ git log --format=%ci -1
-

-            50
$ git show -q --pretty=format:%G? HEAD
-

-            51
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 gcarq
-

-            52
 * Cache regenerated successfully
+            37
 * Cache regenerated successfully
 

 
         
diff --git a/gcarq.txt b/gcarq.txt
index e2fb8f625654..ff05803b41d9 100644
--- a/gcarq.txt
+++ b/gcarq.txt
@@ -12,23 +12,8 @@
              'uri': 'git+ssh://git@github.com/gcarq/gcarq-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync gcarq
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/genthree.html b/genthree.html
index d4ee3984fdca..c10a1141970f 100644
--- a/genthree.html
+++ b/genthree.html
@@ -32,81 +32,51 @@
 

             11
$ pmaint sync genthree
 

-            12
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
warning: Pulling without specifying how to reconcile divergent branches is
 

-            15
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
discouraged. You can squelch this message by running one of the following
 

-            16
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
commands sometime before your next pull:
 

-            17
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
 

-            18
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
  git config pull.rebase false  # merge (the default strategy)
 

-            19
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
  git config pull.rebase true   # rebase
 

-            20
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
  git config pull.ff only       # fast-forward only
 

-            21
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
 

-            22
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
You can replace "git config" with "git config --global" to set a default
 

-            23
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            24
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
or --ff-only on the command line to override the configured default per
 

-            25
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
invocation.
 

-            26
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
 

-            27
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
Already up to date.
 

-            28
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
*** syncing genthree
 

-            29
warning: Pulling without specifying how to reconcile divergent branches is
+            29
*** synced genthree
 

-            30
discouraged. You can squelch this message by running one of the following
+            30
 * Sync succeeded
 

-            31
commands sometime before your next pull:
+            31
$ git log --format=%ci -1
 

-            32
+            32
$ git show -q --pretty=format:%G? HEAD
 

-            33
  git config pull.rebase false  # merge (the default strategy)
+            33
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 genthree
 

-            34
  git config pull.rebase true   # rebase
-

-            35
  git config pull.ff only       # fast-forward only
-

-            36
-

-            37
You can replace "git config" with "git config --global" to set a default
-

-            38
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            39
or --ff-only on the command line to override the configured default per
-

-            40
invocation.
-

-            41
-

-            42
Already up to date.
-

-            43
*** syncing genthree
-

-            44
*** synced genthree
-

-            45
 * Sync succeeded
-

-            46
$ git log --format=%ci -1
-

-            47
$ git show -q --pretty=format:%G? HEAD
-

-            48
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 genthree
-

-            49
 * Cache regenerated successfully
+            34
 * Cache regenerated successfully
 

 
         
diff --git a/genthree.txt b/genthree.txt
index 23d7ee533200..049807dbdf30 100644
--- a/genthree.txt
+++ b/genthree.txt
@@ -9,23 +9,8 @@
  'source': [{'type': 'git', 'uri': 'https://gitlab.com/genthree/overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync genthree
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/gentoo-clang.html b/gentoo-clang.html
index 02bc8dbed616..fdccc56a730b 100644
--- a/gentoo-clang.html
+++ b/gentoo-clang.html
@@ -40,81 +40,53 @@
 

             15
$ pmaint sync gentoo-clang
 

-            16
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
warning: Pulling without specifying how to reconcile divergent branches is
 

-            20
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
discouraged. You can squelch this message by running one of the following
 

-            21
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
commands sometime before your next pull:
 

-            22
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
 

-            23
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase false  # merge (the default strategy)
 

-            24
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.rebase true   # rebase
 

-            25
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.ff only       # fast-forward only
 

-            26
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
 

-            27
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
You can replace "git config" with "git config --global" to set a default
 

-            28
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            29
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
or --ff-only on the command line to override the configured default per
 

-            30
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
invocation.
 

-            31
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
 

-            32
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
Already up to date.
 

-            33
warning: Pulling without specifying how to reconcile divergent branches is
+            33
*** syncing gentoo-clang
 

-            34
discouraged. You can squelch this message by running one of the following
+            34
*** synced gentoo-clang
 

-            35
commands sometime before your next pull:
+            35
 * Sync succeeded
 

-            36
+            36
$ git log --format=%ci -1
 

-            37
  git config pull.rebase false  # merge (the default strategy)
+            37
$ git show -q --pretty=format:%G? HEAD
 

-            38
  git config pull.rebase true   # rebase
+            38
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 gentoo-clang
 

-            39
  git config pull.ff only       # fast-forward only
-

-            40
-

-            41
You can replace "git config" with "git config --global" to set a default
-

-            42
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            43
or --ff-only on the command line to override the configured default per
-

-            44
invocation.
-

-            45
-

-            46
Already up to date.
-

-            47
*** syncing gentoo-clang
-

-            48
*** synced gentoo-clang
-

-            49
 * Sync succeeded
-

-            50
$ git log --format=%ci -1
-

-            51
$ git show -q --pretty=format:%G? HEAD
-

-            52
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 gentoo-clang
-

-            53
 * Cache regenerated successfully
+            39
 * Cache regenerated successfully
 

 
         
diff --git a/gentoo-clang.txt b/gentoo-clang.txt
index 101ff6806ee7..74a95ac844b8 100644
--- a/gentoo-clang.txt
+++ b/gentoo-clang.txt
@@ -13,21 +13,7 @@
             {'type': 'git', 'uri': 'git@github.com:BilyakA/gentoo-clang.git'}],
  'status': 'unofficial'}
 $ pmaint sync gentoo-clang
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
diff --git a/gentoo-mate.html b/gentoo-mate.html
index f09950f8e07a..933b1adacc35 100644
--- a/gentoo-mate.html
+++ b/gentoo-mate.html
@@ -44,86 +44,34 @@
 

             17
$ pmaint sync gentoo-mate
 

-            18
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            23
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            24
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
Cloning into '/var/lib/repo-mirror-ci/sync/gentoo-mate'...
 

-            25
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
*** syncing gentoo-mate
 

-            26
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
*** synced gentoo-mate
 

-            27
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
 * Sync succeeded
 

-            28
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
$ git log --format=%ci -1
 

-            29
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
$ git show -q --pretty=format:%G? HEAD
 

-            30
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 gentoo-mate
 

-            31
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
 * Cache regenerated successfully
 

-            32
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            33
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            34
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            35
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            36
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            37
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            38
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            39
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            40
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            41
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            42
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            43
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            44
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            45
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            46
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            47
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            48
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            49
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            50
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            51
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            52
WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            53
Cloning into '/var/lib/repo-mirror-ci/sync/gentoo-mate'...
-

-            54
fatal: unable to access 'https://anongit.gentoo.org/git/proj/gentoo-mate.git/': The requested URL returned error: 504
-

-            55
*** syncing gentoo-mate
-

-            56
!!! failed syncing gentoo-mate
-

-            57
 * Sync failed with 1
-
[FATAL]
 
         
     
diff --git a/gentoo-mate.txt b/gentoo-mate.txt
index b7a1520ef520..cb58059dfad2 100644
--- a/gentoo-mate.txt
+++ b/gentoo-mate.txt
@@ -15,43 +15,17 @@
  'status': 'official'}
  * Adding new repository
 $ pmaint sync gentoo-mate
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 Cloning into '/var/lib/repo-mirror-ci/sync/gentoo-mate'...
-fatal: unable to access 'https://anongit.gentoo.org/git/proj/gentoo-mate.git/': The requested URL returned error: 504
 *** syncing gentoo-mate
-!!! failed syncing gentoo-mate
- * Sync failed with 1
+*** synced gentoo-mate
+ * 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-mate
+ * Cache regenerated successfully
diff --git a/gentoo-playground.html b/gentoo-playground.html
index e7a4728320c9..92d00d16d257 100644
--- a/gentoo-playground.html
+++ b/gentoo-playground.html
@@ -44,87 +44,57 @@
 

             17
$ pmaint sync gentoo-playground
 

-            18
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
warning: Pulling without specifying how to reconcile divergent branches is
 

-            21
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
discouraged. You can squelch this message by running one of the following
 

-            22
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
commands sometime before your next pull:
 

-            23
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
 

-            24
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.rebase false  # merge (the default strategy)
 

-            25
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase true   # rebase
 

-            26
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.ff only       # fast-forward only
 

-            27
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
 

-            28
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
You can replace "git config" with "git config --global" to set a default
 

-            29
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            30
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
or --ff-only on the command line to override the configured default per
 

-            31
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
invocation.
 

-            32
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
 

-            33
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
Already up to date.
 

-            34
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
*** syncing gentoo-playground
 

-            35
warning: Pulling without specifying how to reconcile divergent branches is
+            35
*** synced gentoo-playground
 

-            36
discouraged. You can squelch this message by running one of the following
+            36
 * Sync succeeded
 

-            37
commands sometime before your next pull:
+            37
$ git log --format=%ci -1
 

-            38
+            38
$ git show -q --pretty=format:%G? HEAD
 

-            39
  git config pull.rebase false  # merge (the default strategy)
+            39
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 gentoo-playground
 

-            40
  git config pull.rebase true   # rebase
-

-            41
  git config pull.ff only       # fast-forward only
-

-            42
-

-            43
You can replace "git config" with "git config --global" to set a default
-

-            44
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            45
or --ff-only on the command line to override the configured default per
-

-            46
invocation.
-

-            47
-

-            48
Already up to date.
-

-            49
*** syncing gentoo-playground
-

-            50
*** synced gentoo-playground
-

-            51
 * Sync succeeded
-

-            52
$ git log --format=%ci -1
-

-            53
$ git show -q --pretty=format:%G? HEAD
-

-            54
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 gentoo-playground
-

-            55
 * app-arch/xz-utils-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            40
 * app-arch/xz-utils-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            56
 * games-strategy/ufo-ai-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            41
 * games-strategy/ufo-ai-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            57
 * x11-themes/e-gtk-theme-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            42
 * x11-themes/e-gtk-theme-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            58
 * Cache regen failed with 1
+            43
 * Cache regen failed with 1
 

 
         
diff --git a/gentoo-playground.txt b/gentoo-playground.txt
index 01402a41ea15..4e39cafc500a 100644
--- a/gentoo-playground.txt
+++ b/gentoo-playground.txt
@@ -15,23 +15,8 @@
              'uri': 'git@github.com:sjnewbury/gentoo-playground.git'}],
  'status': 'unofficial'}
 $ pmaint sync gentoo-playground
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/gentoo-zh.html b/gentoo-zh.html
index a8e6bae63622..f2d41f19daea 100644
--- a/gentoo-zh.html
+++ b/gentoo-zh.html
@@ -32,81 +32,53 @@
 

             11
$ pmaint sync gentoo-zh
 

-            12
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
warning: Pulling without specifying how to reconcile divergent branches is
 

-            16
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
discouraged. You can squelch this message by running one of the following
 

-            17
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
commands sometime before your next pull:
 

-            18
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
 

-            19
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
  git config pull.rebase false  # merge (the default strategy)
 

-            20
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
  git config pull.rebase true   # rebase
 

-            21
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
  git config pull.ff only       # fast-forward only
 

-            22
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
 

-            23
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
You can replace "git config" with "git config --global" to set a default
 

-            24
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            25
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
or --ff-only on the command line to override the configured default per
 

-            26
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
invocation.
 

-            27
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
 

-            28
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
Already up to date.
 

-            29
warning: Pulling without specifying how to reconcile divergent branches is
+            29
*** syncing gentoo-zh
 

-            30
discouraged. You can squelch this message by running one of the following
+            30
*** synced gentoo-zh
 

-            31
commands sometime before your next pull:
+            31
 * Sync succeeded
 

-            32
+            32
$ git log --format=%ci -1
 

-            33
  git config pull.rebase false  # merge (the default strategy)
+            33
$ git show -q --pretty=format:%G? HEAD
 

-            34
  git config pull.rebase true   # rebase
+            34
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 gentoo-zh
 

-            35
  git config pull.ff only       # fast-forward only
-

-            36
-

-            37
You can replace "git config" with "git config --global" to set a default
-

-            38
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            39
or --ff-only on the command line to override the configured default per
-

-            40
invocation.
-

-            41
-

-            42
Already up to date.
-

-            43
*** syncing gentoo-zh
-

-            44
*** synced gentoo-zh
-

-            45
 * Sync succeeded
-

-            46
$ git log --format=%ci -1
-

-            47
$ git show -q --pretty=format:%G? HEAD
-

-            48
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 gentoo-zh
-

-            49
 * Cache regenerated successfully
+            35
 * Cache regenerated successfully
 

 
         
diff --git a/gentoo-zh.txt b/gentoo-zh.txt
index 651e0fff5a2c..3c78b7934af6 100644
--- a/gentoo-zh.txt
+++ b/gentoo-zh.txt
@@ -9,21 +9,7 @@
  'source': [{'type': 'git', 'uri': 'git://github.com/microcai/gentoo-zh.git'}],
  'status': 'unofficial'}
 $ pmaint sync gentoo-zh
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
diff --git a/gentoo.html b/gentoo.html
index 92105196dab8..dcbe9025d4f5 100644
--- a/gentoo.html
+++ b/gentoo.html
@@ -36,267 +36,135 @@
 

             13
 'status': 'official'}
 

-            14
 * Adding new repository
+            14
$ pmaint sync gentoo
 

-            15
$ pmaint sync gentoo
+            15
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
warning: Pulling without specifying how to reconcile divergent branches is
 

-            21
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
discouraged. You can squelch this message by running one of the following
 

-            22
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
commands sometime before your next pull:
 

-            23
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
 

-            24
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.rebase false  # merge (the default strategy)
 

-            25
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase true   # rebase
 

-            26
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.ff only       # fast-forward only
 

-            27
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
 

-            28
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
You can replace "git config" with "git config --global" to set a default
 

-            29
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            30
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
or --ff-only on the command line to override the configured default per
 

-            31
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
invocation.
 

-            32
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
 

-            33
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
From https://anongit.gentoo.org/git/repo/gentoo
 

-            34
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
   6f35bcada58..fb75467bcf4  master     -> origin/master
 

-            35
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
Updating 6f35bcada58..fb75467bcf4
 

-            36
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
Fast-forward
 

-            37
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            37
 ...8-always-tolerate-the-first-CCS-in-TLS1.3.patch | 111 +++++++++++++++++++++
 

-            38
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            38
 .../nss/{nss-3.58.ebuild => nss-3.58-r1.ebuild}    |   1 +
 

-            39
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            39
 dev-python/importlib_resources/Manifest            |   2 +-
 

-            40
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            40
 ...1.0.ebuild => importlib_resources-3.1.1.ebuild} |   0
 

-            41
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            41
 games-simulation/simutrans/Manifest                |  11 +-
 

-            42
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            42
 .../files/simutrans-0.120.2.2-Makefile.patch       |  89 -----------------
 

-            43
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            43
 .../files/simutrans-0.122.0-Fix-Makefile.patch     |  21 ++++
 

-            44
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            44
 games-simulation/simutrans/files/simutrans.desktop |   9 ++
 

-            45
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            45
 games-simulation/simutrans/metadata.xml            |  14 ++-
 

-            46
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            46
 .../simutrans/simutrans-0.120.2.2.ebuild           |  71 -------------
 

-            47
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            47
 .../simutrans/simutrans-0.122.0.ebuild             | 106 ++++++++++++++++++++
 

-            48
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            48
 media-gfx/engauge/engauge-10.6.ebuild              |  30 ++----
 

-            49
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            49
 media-plugins/kodi-pvr-hts/Manifest                |   1 +
 

-            50
WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            50
 .../kodi-pvr-hts/kodi-pvr-hts-7.2.2.ebuild         |  33 ++++++
 

-            51
Cloning into '/var/lib/repo-mirror-ci/sync/gentoo'...
+            51
 .../{prosody.service-r1 => prosody.service-r2}     |   2 +-
 

-            52
Updating files:  20% (17774/87323)
+            52
 ...y-0.11.7-r1.ebuild => prosody-0.11.7-r2.ebuild} |   2 +-
 

-            53
Updating files:  21% (18338/87323)
+            53
 net-im/skypeforlinux/Manifest                      |   1 +
 

-            54
Updating files:  22% (19212/87323)
+            54
 .../skypeforlinux/skypeforlinux-8.65.0.78.ebuild   |  98 ++++++++++++++++++
 

-            55
Updating files:  23% (20085/87323)
+            55
 ...lip-3.20.9-r2.ebuild => hplip-3.20.9-r3.ebuild} |   1 -
 

-            56
Updating files:  24% (20958/87323)
+            56
 profiles/package.mask                              |   6 ++
 

-            57
Updating files:  25% (21831/87323)
+            57
 sys-apps/ipmicfg/ipmicfg-1.32.0.200820.ebuild      |   2 +-
 

-            58
Updating files:  26% (22704/87323)
+            58
 21 files changed, 420 insertions(+), 191 deletions(-)
 

-            59
Updating files:  27% (23578/87323)
+            59
 create mode 100644 dev-libs/nss/files/nss-3.58-always-tolerate-the-first-CCS-in-TLS1.3.patch
 

-            60
Updating files:  28% (24451/87323)
+            60
 rename dev-libs/nss/{nss-3.58.ebuild => nss-3.58-r1.ebuild} (99%)
 

-            61
Updating files:  29% (25324/87323)
+            61
 rename dev-python/importlib_resources/{importlib_resources-3.1.0.ebuild => importlib_resources-3.1.1.ebuild} (100%)
 

-            62
Updating files:  30% (26197/87323)
+            62
 delete mode 100644 games-simulation/simutrans/files/simutrans-0.120.2.2-Makefile.patch
 

-            63
Updating files:  31% (27071/87323)
+            63
 create mode 100644 games-simulation/simutrans/files/simutrans-0.122.0-Fix-Makefile.patch
 

-            64
Updating files:  32% (27944/87323)
+            64
 create mode 100644 games-simulation/simutrans/files/simutrans.desktop
 

-            65
Updating files:  33% (28817/87323)
+            65
 delete mode 100644 games-simulation/simutrans/simutrans-0.120.2.2.ebuild
 

-            66
Updating files:  34% (29690/87323)
+            66
 create mode 100644 games-simulation/simutrans/simutrans-0.122.0.ebuild
 

-            67
Updating files:  35% (30564/87323)
+            67
 create mode 100644 media-plugins/kodi-pvr-hts/kodi-pvr-hts-7.2.2.ebuild
 

-            68
Updating files:  36% (31437/87323)
+            68
 rename net-im/prosody/files/{prosody.service-r1 => prosody.service-r2} (83%)
 

-            69
Updating files:  37% (32310/87323)
+            69
 rename net-im/prosody/{prosody-0.11.7-r1.ebuild => prosody-0.11.7-r2.ebuild} (97%)
 

-            70
Updating files:  38% (33183/87323)
+            70
 create mode 100644 net-im/skypeforlinux/skypeforlinux-8.65.0.78.ebuild
 

-            71
Updating files:  39% (34056/87323)
+            71
 rename net-print/hplip/{hplip-3.20.9-r2.ebuild => hplip-3.20.9-r3.ebuild} (99%)
 

-            72
Updating files:  40% (34930/87323)
+            72
*** syncing gentoo
 

-            73
Updating files:  41% (35803/87323)
+            73
*** synced gentoo
 

-            74
Updating files:  41% (36528/87323)
+            74
 * Sync succeeded
 

-            75
Updating files:  42% (36676/87323)
+            75
$ git log --format=%ci -1
 

-            76
Updating files:  43% (37549/87323)
+            76
$ git show -q --pretty=format:%G? HEAD
 

-            77
Updating files:  44% (38423/87323)
+            77
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 gentoo
 

-            78
Updating files:  45% (39296/87323)
-

-            79
Updating files:  46% (40169/87323)
-

-            80
Updating files:  47% (41042/87323)
-

-            81
Updating files:  48% (41916/87323)
-

-            82
Updating files:  49% (42789/87323)
-

-            83
Updating files:  50% (43662/87323)
-

-            84
Updating files:  51% (44535/87323)
-

-            85
Updating files:  52% (45408/87323)
-

-            86
Updating files:  53% (46282/87323)
-

-            87
Updating files:  54% (47155/87323)
-

-            88
Updating files:  55% (48028/87323)
-

-            89
Updating files:  56% (48901/87323)
-

-            90
Updating files:  57% (49775/87323)
-

-            91
Updating files:  58% (50648/87323)
-

-            92
Updating files:  59% (51521/87323)
-

-            93
Updating files:  60% (52394/87323)
-

-            94
Updating files:  61% (53268/87323)
-

-            95
Updating files:  61% (53764/87323)
-

-            96
Updating files:  62% (54141/87323)
-

-            97
Updating files:  63% (55014/87323)
-

-            98
Updating files:  64% (55887/87323)
-

-            99
Updating files:  65% (56760/87323)
-

-            100
Updating files:  66% (57634/87323)
-

-            101
Updating files:  67% (58507/87323)
-

-            102
Updating files:  68% (59380/87323)
-

-            103
Updating files:  69% (60253/87323)
-

-            104
Updating files:  70% (61127/87323)
-

-            105
Updating files:  71% (62000/87323)
-

-            106
Updating files:  72% (62873/87323)
-

-            107
Updating files:  73% (63746/87323)
-

-            108
Updating files:  74% (64620/87323)
-

-            109
Updating files:  75% (65493/87323)
-

-            110
Updating files:  76% (66366/87323)
-

-            111
Updating files:  77% (67239/87323)
-

-            112
Updating files:  78% (68112/87323)
-

-            113
Updating files:  79% (68986/87323)
-

-            114
Updating files:  79% (69751/87323)
-

-            115
Updating files:  80% (69859/87323)
-

-            116
Updating files:  81% (70732/87323)
-

-            117
Updating files:  82% (71605/87323)
-

-            118
Updating files:  83% (72479/87323)
-

-            119
Updating files:  84% (73352/87323)
-

-            120
Updating files:  85% (74225/87323)
-

-            121
Updating files:  86% (75098/87323)
-

-            122
Updating files:  87% (75972/87323)
-

-            123
Updating files:  88% (76845/87323)
-

-            124
Updating files:  89% (77718/87323)
-

-            125
Updating files:  90% (78591/87323)
-

-            126
Updating files:  91% (79464/87323)
-

-            127
Updating files:  92% (80338/87323)
-

-            128
Updating files:  92% (80974/87323)
-

-            129
Updating files:  93% (81211/87323)
-

-            130
Updating files:  94% (82084/87323)
-

-            131
Updating files:  95% (82957/87323)
-

-            132
Updating files:  96% (83831/87323)
-

-            133
Updating files:  97% (84704/87323)
-

-            134
Updating files:  98% (85577/87323)
-

-            135
Updating files:  99% (86450/87323)
-

-            136
Updating files: 100% (87323/87323)
-

-            137
Updating files: 100% (87323/87323), done.
-

-            138
*** syncing gentoo
-

-            139
*** synced gentoo
-

-            140
 * Sync succeeded
-

-            141
$ git log --format=%ci -1
-

-            142
$ git show -q --pretty=format:%G? HEAD
-

-            143
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 gentoo
-

-            144
 * Cache regenerated successfully
+            78
 * Cache regenerated successfully
 

 
         
diff --git a/gentoo.txt b/gentoo.txt
index cae14897cc5e..ba715a5a9f70 100644
--- a/gentoo.txt
+++ b/gentoo.txt
@@ -11,45 +11,64 @@
             {'type': 'git',
              'uri': 'git+ssh://git@git.gentoo.org/repo/gentoo.git'}],
  'status': 'official'}
- * Adding new repository
 $ pmaint sync gentoo
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-Cloning into '/var/lib/repo-mirror-ci/sync/gentoo'...
-Updating files:  20% (17774/87323)
Updating files:  21% (18338/87323)
Updating files:  22% (19212/87323)
Updating files:  23% (20085/87323)
Updating files:  24% (20958/87323)
Updating files:  25% (21831/87323)
Updating files:  26% (22704/87323)
Updating files:  27% (23578/87323)
Updating files:  28% (24451/87323)
Updating files:  29% (25324/87323)
Updating files:  30% (26197/87323)
Updating files:  31% (27071/87323)
Updating files:  32% (27944/87323)
Updating files:  33% (28817/87323)
Updating files:  34% (29690/87323)
Updating files:  35% (30564/87323)
Updating files:  36% (31437/87323)
Updating files:  37% (32310/87323)
Updating files:  38% (33183/87323)
Updating files:  39% (34056/87323)
Updating files:  40% (34930/87323)
Updating files:  41% (35803/87323)
Updating files:  41% (36528/87323)
Updating files:  42% (36676/87323)
Updating files:  43% (37549/87323)
Updating files:  44% (38423/87323)
Updating files:  45% (39296/87323)
Updating files:  46% (40169/87323)
Updating files:  47% (41042/87323)
Updating files:  48% (41916/87323)
Updating files:  49% (42789/87323)
Updating files:  50% (43662/87323)
Updating files:  51% (44535/87323)
Updating files:  52% (45408/87323)
Updating files:  53% (46282/87323)
Updating files:  54% (47155/87323)
Updating files:  55% (48028/87323)
Updating files:  56% (48901/87323)
Updating files:  57% (49775/87323)
Updating files:  58% (50648/87323)
Updating files:  59% (51521/87323)
Updating files:  60% (52394/87323)
Updating files:  61% (53268/87323)
Updating files:  61% (53764/87323)
Updating files:  62% (54141/87323)
Updating files:  63% (55014/87323)
Updating files:  64% (55887/87323)
Updating files:  65% (56760/87323)
Updating files:  66% (57634/87323)
Updating files:  67% (58507/87323)
Updating files:  68% (59380/87323)
Updating files:  69% (60253/87323)
Updating files:  70% (61127/87323)
Updating files:  71% (62000/87323)
Updating files:  72% (62873/87323)
Updating files:  73% (63746/87323)
Updating files:  74% (64620/87323)
Updating files:  75% (65493/87323)
Updating files:  76% (66366/87323)
Updating files:  77% (67239/87323)
Updating files:  78% (68112/87323)
Updating files:  79% (68986/87323)
Updating files:  79% (69751/87323)
Updating files:  80% (69859/87323)
Updating files:  81% (70732/87323)
Updating files:  82% (71605/87323)
Updating files:  83% (72479/87323)
Updating files:  84% (73352/87323)
Updating files:  85% (74225/87323)
Updating files:  86% (75098/87323)
Updating files:  87% (75972/87323)
Updating files:  88% (76845/87323)
Updating files:  89% (77718/87323)
Updating files:  90% (78591/87323)
Updating files:  91% (79464/87323)
Updating files:  92% (80338/87323)
Updating files:  92% (80974/87323)
Updating files:  93% (81211/87323)
Updating files:  94% (82084/87323)
Updating files:  95% (82957/87323)
Updating files:  96% (83831/87323)
Updating files:  97% (84704/87323)
Updating files:  98% (85577/87323)
Updating files:  99% (86450/87323)
Updating files: 100% (87323/87323)
Updating files: 100% (87323/87323), done.
+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
+   6f35bcada58..fb75467bcf4  master     -> origin/master
+Updating 6f35bcada58..fb75467bcf4
+Fast-forward
+ ...8-always-tolerate-the-first-CCS-in-TLS1.3.patch | 111 +++++++++++++++++++++
+ .../nss/{nss-3.58.ebuild => nss-3.58-r1.ebuild}    |   1 +
+ dev-python/importlib_resources/Manifest            |   2 +-
+ ...1.0.ebuild => importlib_resources-3.1.1.ebuild} |   0
+ games-simulation/simutrans/Manifest                |  11 +-
+ .../files/simutrans-0.120.2.2-Makefile.patch       |  89 -----------------
+ .../files/simutrans-0.122.0-Fix-Makefile.patch     |  21 ++++
+ games-simulation/simutrans/files/simutrans.desktop |   9 ++
+ games-simulation/simutrans/metadata.xml            |  14 ++-
+ .../simutrans/simutrans-0.120.2.2.ebuild           |  71 -------------
+ .../simutrans/simutrans-0.122.0.ebuild             | 106 ++++++++++++++++++++
+ media-gfx/engauge/engauge-10.6.ebuild              |  30 ++----
+ media-plugins/kodi-pvr-hts/Manifest                |   1 +
+ .../kodi-pvr-hts/kodi-pvr-hts-7.2.2.ebuild         |  33 ++++++
+ .../{prosody.service-r1 => prosody.service-r2}     |   2 +-
+ ...y-0.11.7-r1.ebuild => prosody-0.11.7-r2.ebuild} |   2 +-
+ net-im/skypeforlinux/Manifest                      |   1 +
+ .../skypeforlinux/skypeforlinux-8.65.0.78.ebuild   |  98 ++++++++++++++++++
+ ...lip-3.20.9-r2.ebuild => hplip-3.20.9-r3.ebuild} |   1 -
+ profiles/package.mask                              |   6 ++
+ sys-apps/ipmicfg/ipmicfg-1.32.0.200820.ebuild      |   2 +-
+ 21 files changed, 420 insertions(+), 191 deletions(-)
+ create mode 100644 dev-libs/nss/files/nss-3.58-always-tolerate-the-first-CCS-in-TLS1.3.patch
+ rename dev-libs/nss/{nss-3.58.ebuild => nss-3.58-r1.ebuild} (99%)
+ rename dev-python/importlib_resources/{importlib_resources-3.1.0.ebuild => importlib_resources-3.1.1.ebuild} (100%)
+ delete mode 100644 games-simulation/simutrans/files/simutrans-0.120.2.2-Makefile.patch
+ create mode 100644 games-simulation/simutrans/files/simutrans-0.122.0-Fix-Makefile.patch
+ create mode 100644 games-simulation/simutrans/files/simutrans.desktop
+ delete mode 100644 games-simulation/simutrans/simutrans-0.120.2.2.ebuild
+ create mode 100644 games-simulation/simutrans/simutrans-0.122.0.ebuild
+ create mode 100644 media-plugins/kodi-pvr-hts/kodi-pvr-hts-7.2.2.ebuild
+ rename net-im/prosody/files/{prosody.service-r1 => prosody.service-r2} (83%)
+ rename net-im/prosody/{prosody-0.11.7-r1.ebuild => prosody-0.11.7-r2.ebuild} (97%)
+ create mode 100644 net-im/skypeforlinux/skypeforlinux-8.65.0.78.ebuild
+ rename net-print/hplip/{hplip-3.20.9-r2.ebuild => hplip-3.20.9-r3.ebuild} (99%)
 *** syncing gentoo
 *** synced gentoo
  * Sync succeeded
diff --git a/gerislay.html b/gerislay.html
index f4bff5117662..b7bc35dc28db 100644
--- a/gerislay.html
+++ b/gerislay.html
@@ -46,88 +46,36 @@
 

             18
$ pmaint sync gerislay
 

-            19
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            23
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            24
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            25
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            26
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
Cloning into '/var/lib/repo-mirror-ci/sync/gerislay'...
 

-            27
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
*** syncing gerislay
 

-            28
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
*** synced gerislay
 

-            29
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
 * Sync succeeded
 

-            30
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
$ git log --format=%ci -1
 

-            31
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
$ git show -q --pretty=format:%G? HEAD
 

-            32
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 gerislay
 

-            33
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
 * Cache regenerated successfully
 

-            34
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            35
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            36
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            37
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            38
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            39
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            40
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            41
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            42
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            43
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            44
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            45
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            46
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            47
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            48
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            49
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            50
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            51
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            52
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            53
WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            54
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            55
Cloning into '/var/lib/repo-mirror-ci/sync/gerislay'...
-

-            56
fatal: unable to access 'https://anongit.gentoo.org/git/repo/user/gerislay.git/': The requested URL returned error: 504
-

-            57
*** syncing gerislay
-

-            58
!!! failed syncing gerislay
-

-            59
 * Sync failed with 1
-
[FATAL]
 
         
     
diff --git a/gerislay.txt b/gerislay.txt
index e06c93d1ad40..87f05610e5b2 100644
--- a/gerislay.txt
+++ b/gerislay.txt
@@ -16,44 +16,18 @@
  'status': 'unofficial'}
  * Adding new repository
 $ pmaint sync gerislay
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 Cloning into '/var/lib/repo-mirror-ci/sync/gerislay'...
-fatal: unable to access 'https://anongit.gentoo.org/git/repo/user/gerislay.git/': The requested URL returned error: 504
 *** syncing gerislay
-!!! failed syncing gerislay
- * Sync failed with 1
+*** synced gerislay
+ * Sync succeeded
+$ git log --format=%ci -1
+$ git show -q --pretty=format:%G? HEAD
+$ pmaint regen --use-local-desc --pkg-desc-index -t 1 gerislay
+ * Cache regenerated successfully
diff --git a/gig.html b/gig.html
index f16fe8a5ffd1..970d44e3660f 100644
--- a/gig.html
+++ b/gig.html
@@ -28,81 +28,53 @@
 

             9
$ pmaint sync gig
 

-            10
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            10
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            11
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            11
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            12
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
warning: Pulling without specifying how to reconcile divergent branches is
 

-            14
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
discouraged. You can squelch this message by running one of the following
 

-            15
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
commands sometime before your next pull:
 

-            16
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
 

-            17
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
  git config pull.rebase false  # merge (the default strategy)
 

-            18
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
  git config pull.rebase true   # rebase
 

-            19
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
  git config pull.ff only       # fast-forward only
 

-            20
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
 

-            21
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
You can replace "git config" with "git config --global" to set a default
 

-            22
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            23
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
or --ff-only on the command line to override the configured default per
 

-            24
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
invocation.
 

-            25
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 

-            26
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
Already up to date.
 

-            27
warning: Pulling without specifying how to reconcile divergent branches is
+            27
*** syncing gig
 

-            28
discouraged. You can squelch this message by running one of the following
+            28
*** synced gig
 

-            29
commands sometime before your next pull:
+            29
 * Sync succeeded
 

-            30
+            30
$ git log --format=%ci -1
 

-            31
  git config pull.rebase false  # merge (the default strategy)
+            31
$ git show -q --pretty=format:%G? HEAD
 

-            32
  git config pull.rebase true   # rebase
+            32
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 gig
 

-            33
  git config pull.ff only       # fast-forward only
-

-            34
-

-            35
You can replace "git config" with "git config --global" to set a default
-

-            36
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            37
or --ff-only on the command line to override the configured default per
-

-            38
invocation.
-

-            39
-

-            40
Already up to date.
-

-            41
*** syncing gig
-

-            42
*** synced gig
-

-            43
 * Sync succeeded
-

-            44
$ git log --format=%ci -1
-

-            45
$ git show -q --pretty=format:%G? HEAD
-

-            46
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 gig
-

-            47
 * Cache regenerated successfully
+            33
 * Cache regenerated successfully
 

 
         
diff --git a/gig.txt b/gig.txt
index 9cc536635adf..5994ec7e2879 100644
--- a/gig.txt
+++ b/gig.txt
@@ -7,21 +7,7 @@
  'source': [{'type': 'git', 'uri': 'https://github.com/Gig-OS/gig.git'}],
  'status': 'unofficial'}
 $ pmaint sync gig
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
diff --git a/gitlab.html b/gitlab.html
index 041b88eaa9b0..2cc7d160e04a 100644
--- a/gitlab.html
+++ b/gitlab.html
@@ -32,87 +32,53 @@
 

             11
$ pmaint sync gitlab
 

-            12
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
warning: Pulling without specifying how to reconcile divergent branches is
 

-            16
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
discouraged. You can squelch this message by running one of the following
 

-            17
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
commands sometime before your next pull:
 

-            18
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
 

-            19
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
  git config pull.rebase false  # merge (the default strategy)
 

-            20
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
  git config pull.rebase true   # rebase
 

-            21
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
  git config pull.ff only       # fast-forward only
 

-            22
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
 

-            23
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
You can replace "git config" with "git config --global" to set a default
 

-            24
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            25
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
or --ff-only on the command line to override the configured default per
 

-            26
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
invocation.
 

-            27
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
 

-            28
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
Already up to date.
 

-            29
WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
*** syncing gitlab
 

-            30
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
*** synced gitlab
 

-            31
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
 * Sync succeeded
 

-            32
warning: Pulling without specifying how to reconcile divergent branches is
+            32
$ git log --format=%ci -1
 

-            33
discouraged. You can squelch this message by running one of the following
+            33
$ git show -q --pretty=format:%G? HEAD
 

-            34
commands sometime before your next pull:
+            34
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 gitlab
 

-            35
-

-            36
  git config pull.rebase false  # merge (the default strategy)
-

-            37
  git config pull.rebase true   # rebase
-

-            38
  git config pull.ff only       # fast-forward only
-

-            39
-

-            40
You can replace "git config" with "git config --global" to set a default
-

-            41
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            42
or --ff-only on the command line to override the configured default per
-

-            43
invocation.
-

-            44
-

-            45
Already up to date.
-

-            46
*** syncing gitlab
-

-            47
*** synced gitlab
-

-            48
 * Sync succeeded
-

-            49
$ git log --format=%ci -1
-

-            50
$ git show -q --pretty=format:%G? HEAD
-

-            51
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 gitlab
-

-            52
 * Cache regenerated successfully
+            35
 * Cache regenerated successfully
 

 
         
diff --git a/gitlab.txt b/gitlab.txt
index 21eee089130f..3231e77644d1 100644
--- a/gitlab.txt
+++ b/gitlab.txt
@@ -9,26 +9,9 @@
              'uri': 'https://gitlab.awesome-it.de/overlays/gitlab.git'}],
  'status': 'unofficial'}
 $ pmaint sync gitlab
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/glarbs-overlay.html b/glarbs-overlay.html
index c3853e4e0bb3..dbf910a8037c 100644
--- a/glarbs-overlay.html
+++ b/glarbs-overlay.html
@@ -36,87 +36,53 @@
 

             13
$ pmaint sync glarbs-overlay
 

-            14
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
warning: Pulling without specifying how to reconcile divergent branches is
 

-            18
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
discouraged. You can squelch this message by running one of the following
 

-            19
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
commands sometime before your next pull:
 

-            20
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
 

-            21
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
  git config pull.rebase false  # merge (the default strategy)
 

-            22
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase true   # rebase
 

-            23
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.ff only       # fast-forward only
 

-            24
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 

-            25
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
You can replace "git config" with "git config --global" to set a default
 

-            26
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            27
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
or --ff-only on the command line to override the configured default per
 

-            28
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
invocation.
 

-            29
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
 

-            30
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
Already up to date.
 

-            31
WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
*** syncing glarbs-overlay
 

-            32
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
*** synced glarbs-overlay
 

-            33
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
 * Sync succeeded
 

-            34
warning: Pulling without specifying how to reconcile divergent branches is
+            34
$ git log --format=%ci -1
 

-            35
discouraged. You can squelch this message by running one of the following
+            35
$ git show -q --pretty=format:%G? HEAD
 

-            36
commands sometime before your next pull:
+            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 glarbs-overlay
 

-            37
-

-            38
  git config pull.rebase false  # merge (the default strategy)
-

-            39
  git config pull.rebase true   # rebase
-

-            40
  git config pull.ff only       # fast-forward only
-

-            41
-

-            42
You can replace "git config" with "git config --global" to set a default
-

-            43
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            44
or --ff-only on the command line to override the configured default per
-

-            45
invocation.
-

-            46
-

-            47
Already up to date.
-

-            48
*** syncing glarbs-overlay
-

-            49
*** synced glarbs-overlay
-

-            50
 * Sync succeeded
-

-            51
$ git log --format=%ci -1
-

-            52
$ git show -q --pretty=format:%G? HEAD
-

-            53
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 glarbs-overlay
-

-            54
 * Cache regenerated successfully
+            37
 * Cache regenerated successfully
 

 
         
diff --git a/glarbs-overlay.txt b/glarbs-overlay.txt
index 30fbf574f999..63653a1e503c 100644
--- a/glarbs-overlay.txt
+++ b/glarbs-overlay.txt
@@ -11,26 +11,9 @@
              'uri': 'https://gitlab.com/et-8/glarbs-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync glarbs-overlay
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/glicOne.html b/glicOne.html
index 928d699cb54e..ab3c0b46c19e 100644
--- a/glicOne.html
+++ b/glicOne.html
@@ -38,97 +38,61 @@
 

             14
$ pmaint sync glicOne
 

-            15
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
warning: Pulling without specifying how to reconcile divergent branches is
 

-            19
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
discouraged. You can squelch this message by running one of the following
 

-            20
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
commands sometime before your next pull:
 

-            21
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
 

-            22
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase false  # merge (the default strategy)
 

-            23
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase true   # rebase
 

-            24
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.ff only       # fast-forward only
 

-            25
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 

-            26
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
You can replace "git config" with "git config --global" to set a default
 

-            27
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            28
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
or --ff-only on the command line to override the configured default per
 

-            29
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
invocation.
 

-            30
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
 

-            31
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
Already up to date.
 

-            32
WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
*** syncing glicOne
 

-            33
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
*** synced glicOne
 

-            34
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
 * Sync succeeded
 

-            35
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
$ git log --format=%ci -1
 

-            36
warning: Pulling without specifying how to reconcile divergent branches is
+            36
$ git show -q --pretty=format:%G? HEAD
 

-            37
discouraged. You can squelch this message by running one of the following
+            37
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 glicOne
 

-            38
commands sometime before your next pull:
-

-            39
-

-            40
  git config pull.rebase false  # merge (the default strategy)
-

-            41
  git config pull.rebase true   # rebase
-

-            42
  git config pull.ff only       # fast-forward only
-

-            43
-

-            44
You can replace "git config" with "git config --global" to set a default
-

-            45
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            46
or --ff-only on the command line to override the configured default per
-

-            47
invocation.
-

-            48
-

-            49
Already up to date.
-

-            50
*** syncing glicOne
-

-            51
*** synced glicOne
-

-            52
 * Sync succeeded
-

-            53
$ git log --format=%ci -1
-

-            54
$ git show -q --pretty=format:%G? HEAD
-

-            55
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 glicOne
-

-            56
 * dev-python/phply-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            38
 * dev-python/phply-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            57
 * dev-ruby/hashicorp-checkpoint-0.1.5: failed parsing REQUIRED_USE: '|| ( )' is unparseable
+            39
 * dev-ruby/hashicorp-checkpoint-0.1.5: failed parsing REQUIRED_USE: '|| ( )' is unparseable
 
[FATAL]
-            58
 * net-analyzer/whatweb-0.4.9: failed parsing REQUIRED_USE: '|| ( )' is unparseable
+            40
 * net-analyzer/whatweb-0.4.9: failed parsing REQUIRED_USE: '|| ( )' is unparseable
 
[FATAL]
-            59
 * x11-libs/bamf-9999: failed sourcing ebuild: inherit requires unknown eclass: bzr.eclass
+            41
 * x11-libs/bamf-9999: failed sourcing ebuild: inherit requires unknown eclass: bzr.eclass
 
[FATAL]
-            60
 * Cache regen failed with 1
+            42
 * Cache regen failed with 1
 

 
         
diff --git a/glicOne.txt b/glicOne.txt
index b3dd813cfba2..7273024ea547 100644
--- a/glicOne.txt
+++ b/glicOne.txt
@@ -12,27 +12,9 @@
              'uri': 'git@gitlab.com:glicOne/glicOne-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync glicOne
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/gnome-next.html b/gnome-next.html
index a0d108564bcc..e351cee8f077 100644
--- a/gnome-next.html
+++ b/gnome-next.html
@@ -36,89 +36,53 @@
 

             13
$ pmaint sync gnome-next
 

-            14
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
warning: Pulling without specifying how to reconcile divergent branches is
 

-            18
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
discouraged. You can squelch this message by running one of the following
 

-            19
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
commands sometime before your next pull:
 

-            20
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
 

-            21
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
  git config pull.rebase false  # merge (the default strategy)
 

-            22
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase true   # rebase
 

-            23
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.ff only       # fast-forward only
 

-            24
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 

-            25
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
You can replace "git config" with "git config --global" to set a default
 

-            26
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            27
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
or --ff-only on the command line to override the configured default per
 

-            28
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
invocation.
 

-            29
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
 

-            30
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
Already up to date.
 

-            31
WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
*** syncing gnome-next
 

-            32
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
*** synced gnome-next
 

-            33
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
 * Sync succeeded
 

-            34
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
$ git log --format=%ci -1
 

-            35
warning: Pulling without specifying how to reconcile divergent branches is
+            35
$ git show -q --pretty=format:%G? HEAD
 

-            36
discouraged. You can squelch this message by running one of the following
+            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 gnome-next
 

-            37
commands sometime before your next pull:
-

-            38
-

-            39
  git config pull.rebase false  # merge (the default strategy)
-

-            40
  git config pull.rebase true   # rebase
-

-            41
  git config pull.ff only       # fast-forward only
-

-            42
-

-            43
You can replace "git config" with "git config --global" to set a default
-

-            44
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            45
or --ff-only on the command line to override the configured default per
-

-            46
invocation.
-

-            47
-

-            48
Already up to date.
-

-            49
*** syncing gnome-next
-

-            50
*** synced gnome-next
-

-            51
 * Sync succeeded
-

-            52
$ git log --format=%ci -1
-

-            53
$ git show -q --pretty=format:%G? HEAD
-

-            54
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 gnome-next
-

-            55
 * Cache regenerated successfully
+            37
 * Cache regenerated successfully
 

 
         
diff --git a/gnome-next.txt b/gnome-next.txt
index 1e2bbf4c0df6..59630aec619a 100644
--- a/gnome-next.txt
+++ b/gnome-next.txt
@@ -11,27 +11,9 @@
             {'type': 'git', 'uri': 'git@github.com:Heather/gentoo-gnome.git'}],
  'status': 'unofficial'}
 $ pmaint sync gnome-next
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/gnome.html b/gnome.html
index 893a76a7bbc2..a136bf1282d6 100644
--- a/gnome.html
+++ b/gnome.html
@@ -38,107 +38,55 @@
 

             14
 'status': 'official'}
 

-            15
 * Adding new repository
+            15
$ pmaint sync gnome
 

-            16
$ pmaint sync gnome
+            16
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
warning: Pulling without specifying how to reconcile divergent branches is
 

-            20
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
discouraged. You can squelch this message by running one of the following
 

-            21
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
commands sometime before your next pull:
 

-            22
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
 

-            23
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase false  # merge (the default strategy)
 

-            24
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.rebase true   # rebase
 

-            25
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.ff only       # fast-forward only
 

-            26
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
 

-            27
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
You can replace "git config" with "git config --global" to set a default
 

-            28
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            29
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
or --ff-only on the command line to override the configured default per
 

-            30
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
invocation.
 

-            31
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
 

-            32
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
Already up to date.
 

-            33
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
*** syncing gnome
 

-            34
WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
*** synced gnome
 

-            35
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
 * Sync succeeded
 

-            36
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
$ git log --format=%ci -1
 

-            37
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            37
$ git show -q --pretty=format:%G? HEAD
 

-            38
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            38
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 gnome
 

-            39
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            40
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            41
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            42
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            43
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            44
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            45
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            46
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            47
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            48
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            49
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            50
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            51
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            52
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            53
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            54
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            55
WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            56
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            57
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            58
Cloning into '/var/lib/repo-mirror-ci/sync/gnome'...
-

-            59
*** syncing gnome
-

-            60
*** synced gnome
-

-            61
 * Sync succeeded
-

-            62
$ git log --format=%ci -1
-

-            63
$ git show -q --pretty=format:%G? HEAD
-

-            64
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 gnome
-

-            65
 * Cache regenerated successfully
+            39
 * Cache regenerated successfully
 

 
         
diff --git a/gnome.txt b/gnome.txt
index 7f344306a1e3..3c1ddd4bb52d 100644
--- a/gnome.txt
+++ b/gnome.txt
@@ -12,50 +12,24 @@
             {'type': 'git',
              'uri': 'git+ssh://git@git.gentoo.org/proj/gnome.git'}],
  'status': 'official'}
- * Adding new repository
 $ pmaint sync gnome
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-Cloning into '/var/lib/repo-mirror-ci/sync/gnome'...
+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.
+
+Already up to date.
 *** syncing gnome
 *** synced gnome
  * Sync succeeded
diff --git a/gnuradio.html b/gnuradio.html
index 762e3206955d..49137552922b 100644
--- a/gnuradio.html
+++ b/gnuradio.html
@@ -30,89 +30,53 @@
 

             10
$ pmaint sync gnuradio
 

-            11
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            11
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            12
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
warning: Pulling without specifying how to reconcile divergent branches is
 

-            15
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
discouraged. You can squelch this message by running one of the following
 

-            16
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
commands sometime before your next pull:
 

-            17
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
 

-            18
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
  git config pull.rebase false  # merge (the default strategy)
 

-            19
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
  git config pull.rebase true   # rebase
 

-            20
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
  git config pull.ff only       # fast-forward only
 

-            21
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
 

-            22
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
You can replace "git config" with "git config --global" to set a default
 

-            23
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            24
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
or --ff-only on the command line to override the configured default per
 

-            25
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
invocation.
 

-            26
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
 

-            27
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
Already up to date.
 

-            28
WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
*** syncing gnuradio
 

-            29
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
*** synced gnuradio
 

-            30
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
 * Sync succeeded
 

-            31
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
$ git log --format=%ci -1
 

-            32
warning: Pulling without specifying how to reconcile divergent branches is
+            32
$ git show -q --pretty=format:%G? HEAD
 

-            33
discouraged. You can squelch this message by running one of the following
+            33
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 gnuradio
 

-            34
commands sometime before your next pull:
-

-            35
-

-            36
  git config pull.rebase false  # merge (the default strategy)
-

-            37
  git config pull.rebase true   # rebase
-

-            38
  git config pull.ff only       # fast-forward only
-

-            39
-

-            40
You can replace "git config" with "git config --global" to set a default
-

-            41
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            42
or --ff-only on the command line to override the configured default per
-

-            43
invocation.
-

-            44
-

-            45
Already up to date.
-

-            46
*** syncing gnuradio
-

-            47
*** synced gnuradio
-

-            48
 * Sync succeeded
-

-            49
$ git log --format=%ci -1
-

-            50
$ git show -q --pretty=format:%G? HEAD
-

-            51
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 gnuradio
-

-            52
 * Cache regenerated successfully
+            34
 * Cache regenerated successfully
 

 
         
diff --git a/gnuradio.txt b/gnuradio.txt
index 2e480e4bae8c..0e75d12dd99a 100644
--- a/gnuradio.txt
+++ b/gnuradio.txt
@@ -8,27 +8,9 @@
              'uri': 'https://github.com/hololeap/gentoo-gnuradio'}],
  'status': 'unofficial'}
 $ pmaint sync gnuradio
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/gnustep.html b/gnustep.html
index 46824e12fd48..03991c697d31 100644
--- a/gnustep.html
+++ b/gnustep.html
@@ -40,100 +40,38 @@
 

             15
$ pmaint sync gnustep
 

-            16
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            23
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            24
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
Cloning into '/var/lib/repo-mirror-ci/sync/gnustep'...
 

-            25
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
*** syncing gnustep
 

-            26
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
*** synced gnustep
 

-            27
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
 * Sync succeeded
 

-            28
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
$ git log --format=%ci -1
 

-            29
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
$ git show -q --pretty=format:%G? HEAD
 

-            30
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 gnustep
 

-            31
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
 * Cache regenerated successfully
 

-            32
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            33
WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            34
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            35
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            36
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            37
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            38
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            39
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            40
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            41
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            42
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            43
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            44
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            45
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            46
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            47
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            48
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            49
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            50
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            51
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            52
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            53
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            54
WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            55
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            56
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            57
WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            58
Cloning into '/var/lib/repo-mirror-ci/sync/gnustep'...
-

-            59
fatal: unable to access 'https://anongit.gentoo.org/git/proj/gnustep.git/': The requested URL returned error: 504
-

-            60
*** syncing gnustep
-

-            61
!!! failed syncing gnustep
-

-            62
 * Sync failed with 1
-
[FATAL]
 
         
     
diff --git a/gnustep.txt b/gnustep.txt
index 85a123c3a717..3a899297cdbe 100644
--- a/gnustep.txt
+++ b/gnustep.txt
@@ -13,50 +13,19 @@
  'status': 'official'}
  * Adding new repository
 $ pmaint sync gnustep
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 Cloning into '/var/lib/repo-mirror-ci/sync/gnustep'...
-fatal: unable to access 'https://anongit.gentoo.org/git/proj/gnustep.git/': The requested URL returned error: 504
 *** syncing gnustep
-!!! failed syncing gnustep
- * Sync failed with 1
+*** synced gnustep
+ * Sync succeeded
+$ git log --format=%ci -1
+$ git show -q --pretty=format:%G? HEAD
+$ pmaint regen --use-local-desc --pkg-desc-index -t 1 gnustep
+ * Cache regenerated successfully
diff --git a/gnux32.html b/gnux32.html
index d1556fdbffe2..d2900ae72dbe 100644
--- a/gnux32.html
+++ b/gnux32.html
@@ -34,89 +34,55 @@
 

             12
$ pmaint sync gnux32
 

-            13
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
warning: Pulling without specifying how to reconcile divergent branches is
 

-            18
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
discouraged. You can squelch this message by running one of the following
 

-            19
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
commands sometime before your next pull:
 

-            20
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
 

-            21
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
  git config pull.rebase false  # merge (the default strategy)
 

-            22
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase true   # rebase
 

-            23
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.ff only       # fast-forward only
 

-            24
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 

-            25
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
You can replace "git config" with "git config --global" to set a default
 

-            26
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            27
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
or --ff-only on the command line to override the configured default per
 

-            28
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
invocation.
 

-            29
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
 

-            30
WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
Already up to date.
 

-            31
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
*** syncing gnux32
 

-            32
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
*** synced gnux32
 

-            33
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
 * Sync succeeded
 

-            34
warning: Pulling without specifying how to reconcile divergent branches is
+            34
$ git log --format=%ci -1
 

-            35
discouraged. You can squelch this message by running one of the following
+            35
$ git show -q --pretty=format:%G? HEAD
 

-            36
commands sometime before your next pull:
+            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 gnux32
 

-            37
-

-            38
  git config pull.rebase false  # merge (the default strategy)
-

-            39
  git config pull.rebase true   # rebase
-

-            40
  git config pull.ff only       # fast-forward only
-

-            41
-

-            42
You can replace "git config" with "git config --global" to set a default
-

-            43
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            44
or --ff-only on the command line to override the configured default per
-

-            45
invocation.
-

-            46
-

-            47
Already up to date.
-

-            48
*** syncing gnux32
-

-            49
*** synced gnux32
-

-            50
 * Sync succeeded
-

-            51
$ git log --format=%ci -1
-

-            52
$ git show -q --pretty=format:%G? HEAD
-

-            53
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 gnux32
-

-            54
 * Cache regenerated successfully
+            37
 * Cache regenerated successfully
 

 
         
diff --git a/gnux32.txt b/gnux32.txt
index 4d0b84478eaf..9492fe2d0c3d 100644
--- a/gnux32.txt
+++ b/gnux32.txt
@@ -10,27 +10,10 @@
             {'type': 'git', 'uri': 'git://github.com/1camper/gnux32.git'}],
  'status': 'unofficial'}
 $ pmaint sync gnux32
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/go-overlay.html b/go-overlay.html
index e5ee824d0b94..d16ed2b976a9 100644
--- a/go-overlay.html
+++ b/go-overlay.html
@@ -32,91 +32,55 @@
 

             11
$ pmaint sync go-overlay
 

-            12
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
warning: Pulling without specifying how to reconcile divergent branches is
 

-            17
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
discouraged. You can squelch this message by running one of the following
 

-            18
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
commands sometime before your next pull:
 

-            19
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
 

-            20
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
  git config pull.rebase false  # merge (the default strategy)
 

-            21
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
  git config pull.rebase true   # rebase
 

-            22
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.ff only       # fast-forward only
 

-            23
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
 

-            24
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
You can replace "git config" with "git config --global" to set a default
 

-            25
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            26
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
or --ff-only on the command line to override the configured default per
 

-            27
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
invocation.
 

-            28
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
 

-            29
WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
Already up to date.
 

-            30
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
*** syncing go-overlay
 

-            31
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
*** synced go-overlay
 

-            32
WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
 * Sync succeeded
 

-            33
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
$ git log --format=%ci -1
 

-            34
warning: Pulling without specifying how to reconcile divergent branches is
+            34
$ git show -q --pretty=format:%G? HEAD
 

-            35
discouraged. You can squelch this message by running one of the following
+            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 go-overlay
 

-            36
commands sometime before your next pull:
-

-            37
-

-            38
  git config pull.rebase false  # merge (the default strategy)
-

-            39
  git config pull.rebase true   # rebase
-

-            40
  git config pull.ff only       # fast-forward only
-

-            41
-

-            42
You can replace "git config" with "git config --global" to set a default
-

-            43
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            44
or --ff-only on the command line to override the configured default per
-

-            45
invocation.
-

-            46
-

-            47
Already up to date.
-

-            48
*** syncing go-overlay
-

-            49
*** synced go-overlay
-

-            50
 * Sync succeeded
-

-            51
$ git log --format=%ci -1
-

-            52
$ git show -q --pretty=format:%G? HEAD
-

-            53
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 go-overlay
-

-            54
 * Cache regenerated successfully
+            36
 * Cache regenerated successfully
 

 
         
diff --git a/go-overlay.txt b/go-overlay.txt
index 6ddc8c73c095..5e9c3f6dd3ab 100644
--- a/go-overlay.txt
+++ b/go-overlay.txt
@@ -9,28 +9,10 @@
              'uri': 'https://github.com/Dr-Terrible/go-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync go-overlay
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/godin.html b/godin.html
index 234790f01be0..64124696b5c8 100644
--- a/godin.html
+++ b/godin.html
@@ -38,93 +38,55 @@
 

             14
$ pmaint sync godin
 

-            15
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
warning: Pulling without specifying how to reconcile divergent branches is
 

-            20
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
discouraged. You can squelch this message by running one of the following
 

-            21
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
commands sometime before your next pull:
 

-            22
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
 

-            23
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase false  # merge (the default strategy)
 

-            24
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.rebase true   # rebase
 

-            25
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.ff only       # fast-forward only
 

-            26
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
 

-            27
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
You can replace "git config" with "git config --global" to set a default
 

-            28
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            29
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
or --ff-only on the command line to override the configured default per
 

-            30
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
invocation.
 

-            31
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
 

-            32
WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
Already up to date.
 

-            33
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
*** syncing godin
 

-            34
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
*** synced godin
 

-            35
WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
 * Sync succeeded
 

-            36
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
$ git log --format=%ci -1
 

-            37
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            37
$ git show -q --pretty=format:%G? HEAD
 

-            38
warning: Pulling without specifying how to reconcile divergent branches is
+            38
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 godin
 

-            39
discouraged. You can squelch this message by running one of the following
-

-            40
commands sometime before your next pull:
-

-            41
-

-            42
  git config pull.rebase false  # merge (the default strategy)
-

-            43
  git config pull.rebase true   # rebase
-

-            44
  git config pull.ff only       # fast-forward only
-

-            45
-

-            46
You can replace "git config" with "git config --global" to set a default
-

-            47
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            48
or --ff-only on the command line to override the configured default per
-

-            49
invocation.
-

-            50
-

-            51
Already up to date.
-

-            52
*** syncing godin
-

-            53
*** synced godin
-

-            54
 * Sync succeeded
-

-            55
$ git log --format=%ci -1
-

-            56
$ git show -q --pretty=format:%G? HEAD
-

-            57
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 godin
-

-            58
 * Cache regenerated successfully
+            39
 * Cache regenerated successfully
 

 
         
diff --git a/godin.txt b/godin.txt
index da8c839d283f..72e675603445 100644
--- a/godin.txt
+++ b/godin.txt
@@ -12,29 +12,10 @@
              'uri': 'git://github.com/Godin/gentoo-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync godin
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/goris.html b/goris.html
index 01cf8dad3722..ac08169276e6 100644
--- a/goris.html
+++ b/goris.html
@@ -44,106 +44,38 @@
 

             17
$ pmaint sync goris
 

-            18
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            23
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            24
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            25
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            26
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
Cloning into '/var/lib/repo-mirror-ci/sync/goris'...
 

-            27
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
*** syncing goris
 

-            28
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
*** synced goris
 

-            29
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
 * Sync succeeded
 

-            30
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
$ git log --format=%ci -1
 

-            31
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
$ git show -q --pretty=format:%G? HEAD
 

-            32
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 goris
 

-            33
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
 * Cache regenerated successfully
 

-            34
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            35
WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            36
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            37
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            38
WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            39
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            40
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            41
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            42
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            43
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            44
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            45
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            46
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            47
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            48
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            49
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            50
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            51
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            52
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            53
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            54
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            55
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            56
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            57
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            58
WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            59
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            60
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            61
WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            62
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            63
Cloning into '/var/lib/repo-mirror-ci/sync/goris'...
-

-            64
fatal: unable to access 'https://anongit.gentoo.org/git/repo/user/goris.git/': The requested URL returned error: 504
-

-            65
*** syncing goris
-

-            66
!!! failed syncing goris
-

-            67
 * Sync failed with 1
-
[FATAL]
 
         
     
diff --git a/goris.txt b/goris.txt
index 86aee6d7a245..9d48082348c4 100644
--- a/goris.txt
+++ b/goris.txt
@@ -15,53 +15,19 @@
  'status': 'unofficial'}
  * Adding new repository
 $ pmaint sync goris
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 Cloning into '/var/lib/repo-mirror-ci/sync/goris'...
-fatal: unable to access 'https://anongit.gentoo.org/git/repo/user/goris.git/': The requested URL returned error: 504
 *** syncing goris
-!!! failed syncing goris
- * Sync failed with 1
+*** synced goris
+ * Sync succeeded
+$ git log --format=%ci -1
+$ git show -q --pretty=format:%G? HEAD
+$ pmaint regen --use-local-desc --pkg-desc-index -t 1 goris
+ * Cache regenerated successfully
diff --git a/graaff.html b/graaff.html
index 0b87ee91af9e..ebf09ea08976 100644
--- a/graaff.html
+++ b/graaff.html
@@ -46,106 +46,38 @@
 

             18
$ pmaint sync graaff
 

-            19
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            23
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            24
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            25
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            26
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            27
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
Cloning into '/var/lib/repo-mirror-ci/sync/graaff'...
 

-            28
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
*** syncing graaff
 

-            29
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
*** synced graaff
 

-            30
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
 * Sync succeeded
 

-            31
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
$ git log --format=%ci -1
 

-            32
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
$ git show -q --pretty=format:%G? HEAD
 

-            33
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 graaff
 

-            34
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
 * Cache regenerated successfully
 

-            35
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            36
WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            37
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            38
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            39
WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            40
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            41
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            42
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            43
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            44
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            45
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            46
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            47
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            48
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            49
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            50
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            51
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            52
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            53
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            54
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            55
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            56
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            57
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            58
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            59
WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            60
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            61
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            62
WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            63
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            64
Cloning into '/var/lib/repo-mirror-ci/sync/graaff'...
-

-            65
fatal: unable to access 'https://anongit.gentoo.org/git/dev/graaff.git/': The requested URL returned error: 504
-

-            66
*** syncing graaff
-

-            67
!!! failed syncing graaff
-

-            68
 * Sync failed with 1
-
[FATAL]
 
         
     
diff --git a/graaff.txt b/graaff.txt
index 5acda5c03f1f..fc4ee244b5db 100644
--- a/graaff.txt
+++ b/graaff.txt
@@ -16,53 +16,19 @@
  'status': 'official'}
  * Adding new repository
 $ pmaint sync graaff
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 Cloning into '/var/lib/repo-mirror-ci/sync/graaff'...
-fatal: unable to access 'https://anongit.gentoo.org/git/dev/graaff.git/': The requested URL returned error: 504
 *** syncing graaff
-!!! failed syncing graaff
- * Sync failed with 1
+*** synced graaff
+ * Sync succeeded
+$ git log --format=%ci -1
+$ git show -q --pretty=format:%G? HEAD
+$ pmaint regen --use-local-desc --pkg-desc-index -t 1 graaff
+ * Cache regenerated successfully
diff --git a/grub2-themes.html b/grub2-themes.html
index c3ef7c764868..9fe0b1775b18 100644
--- a/grub2-themes.html
+++ b/grub2-themes.html
@@ -38,117 +38,57 @@
 

             14
 'status': 'official'}
 

-            15
 * Adding new repository
+            15
$ pmaint sync grub2-themes
 

-            16
$ pmaint sync grub2-themes
+            16
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
warning: Pulling without specifying how to reconcile divergent branches is
 

-            21
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
discouraged. You can squelch this message by running one of the following
 

-            22
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
commands sometime before your next pull:
 

-            23
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
 

-            24
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.rebase false  # merge (the default strategy)
 

-            25
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase true   # rebase
 

-            26
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.ff only       # fast-forward only
 

-            27
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
 

-            28
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
You can replace "git config" with "git config --global" to set a default
 

-            29
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            30
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
or --ff-only on the command line to override the configured default per
 

-            31
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
invocation.
 

-            32
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
 

-            33
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
Already up to date.
 

-            34
WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
*** syncing grub2-themes
 

-            35
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
*** synced grub2-themes
 

-            36
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
 * Sync succeeded
 

-            37
WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            37
$ git log --format=%ci -1
 

-            38
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            38
$ git show -q --pretty=format:%G? HEAD
 

-            39
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            39
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 grub2-themes
 

-            40
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            41
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            42
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            43
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            44
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            45
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            46
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            47
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            48
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            49
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            50
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            51
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            52
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            53
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            54
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            55
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            56
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            57
WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            58
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            59
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            60
WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            61
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            62
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            63
Cloning into '/var/lib/repo-mirror-ci/sync/grub2-themes'...
-

-            64
*** syncing grub2-themes
-

-            65
*** synced grub2-themes
-

-            66
 * Sync succeeded
-

-            67
$ git log --format=%ci -1
-

-            68
$ git show -q --pretty=format:%G? HEAD
-

-            69
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 grub2-themes
-

-            70
 * Cache regenerated successfully
+            40
 * Cache regenerated successfully
 

 
         
diff --git a/grub2-themes.txt b/grub2-themes.txt
index 4ec30e1f8150..24633b66658c 100644
--- a/grub2-themes.txt
+++ b/grub2-themes.txt
@@ -12,55 +12,25 @@
             {'type': 'git',
              'uri': 'git+ssh://git@git.gentoo.org/repo/proj/grub2-themes.git'}],
  'status': 'official'}
- * Adding new repository
 $ pmaint sync grub2-themes
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-Cloning into '/var/lib/repo-mirror-ci/sync/grub2-themes'...
+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.
+
+Already up to date.
 *** syncing grub2-themes
 *** synced grub2-themes
  * Sync succeeded
diff --git a/gsview-overlay.html b/gsview-overlay.html
index bfbb8ab4c177..e2b0e18eb82d 100644
--- a/gsview-overlay.html
+++ b/gsview-overlay.html
@@ -44,93 +44,55 @@
 

             17
$ pmaint sync gsview-overlay
 

-            18
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
warning: Pulling without specifying how to reconcile divergent branches is
 

-            23
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
discouraged. You can squelch this message by running one of the following
 

-            24
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
commands sometime before your next pull:
 

-            25
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 

-            26
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.rebase false  # merge (the default strategy)
 

-            27
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.rebase true   # rebase
 

-            28
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
  git config pull.ff only       # fast-forward only
 

-            29
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
 

-            30
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
You can replace "git config" with "git config --global" to set a default
 

-            31
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            32
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
or --ff-only on the command line to override the configured default per
 

-            33
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
invocation.
 

-            34
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
 

-            35
WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
Already up to date.
 

-            36
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
*** syncing gsview-overlay
 

-            37
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            37
*** synced gsview-overlay
 

-            38
WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            38
 * Sync succeeded
 

-            39
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            39
$ git log --format=%ci -1
 

-            40
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            40
$ git show -q --pretty=format:%G? HEAD
 

-            41
warning: Pulling without specifying how to reconcile divergent branches is
+            41
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 gsview-overlay
 

-            42
discouraged. You can squelch this message by running one of the following
-

-            43
commands sometime before your next pull:
-

-            44
-

-            45
  git config pull.rebase false  # merge (the default strategy)
-

-            46
  git config pull.rebase true   # rebase
-

-            47
  git config pull.ff only       # fast-forward only
-

-            48
-

-            49
You can replace "git config" with "git config --global" to set a default
-

-            50
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            51
or --ff-only on the command line to override the configured default per
-

-            52
invocation.
-

-            53
-

-            54
Already up to date.
-

-            55
*** syncing gsview-overlay
-

-            56
*** synced gsview-overlay
-

-            57
 * Sync succeeded
-

-            58
$ git log --format=%ci -1
-

-            59
$ git show -q --pretty=format:%G? HEAD
-

-            60
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 gsview-overlay
-

-            61
 * Cache regenerated successfully
+            42
 * Cache regenerated successfully
 

 
         
diff --git a/gsview-overlay.txt b/gsview-overlay.txt
index f28acc31b6a0..8cfbc84e66b4 100644
--- a/gsview-overlay.txt
+++ b/gsview-overlay.txt
@@ -15,29 +15,10 @@
              'uri': 'git@github.com:uleysky/gsview-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync gsview-overlay
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/guru.html b/guru.html
index b7490d436f82..d312d445dc3b 100644
--- a/guru.html
+++ b/guru.html
@@ -34,123 +34,93 @@
 

             12
 'status': 'official'}
 

-            13
 * Adding new repository
+            13
$ pmaint sync guru
 

-            14
$ pmaint sync guru
+            14
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
warning: Pulling without specifying how to reconcile divergent branches is
 

-            19
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
discouraged. You can squelch this message by running one of the following
 

-            20
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
commands sometime before your next pull:
 

-            21
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
 

-            22
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase false  # merge (the default strategy)
 

-            23
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase true   # rebase
 

-            24
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.ff only       # fast-forward only
 

-            25
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 

-            26
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
You can replace "git config" with "git config --global" to set a default
 

-            27
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            28
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
or --ff-only on the command line to override the configured default per
 

-            29
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
invocation.
 

-            30
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
 

-            31
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
From https://anongit.gentoo.org/git/repo/proj/guru
 

-            32
WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
   3507825..4d7ceb0  master     -> origin/master
 

-            33
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
   bc5d5f4..4d7ceb0  dev        -> origin/dev
 

-            34
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
Updating 3507825..4d7ceb0
 

-            35
WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
Fast-forward
 

-            36
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
 app-admin/customrescuecd-x86/Manifest              |  2 -
 

-            37
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            37
 .../customrescuecd-x86-0.3.1.ebuild                | 55 ----------------------
 

-            38
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            38
 .../customrescuecd-x86-0.4.0.ebuild                | 55 ----------------------
 

-            39
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            39
 app-admin/customrescuecd-x86_64/Manifest           |  2 -
 

-            40
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            40
 .../customrescuecd-x86_64-0.10.3.ebuild            | 55 ----------------------
 

-            41
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            41
 .../customrescuecd-x86_64-0.11.0.ebuild            | 55 ----------------------
 

-            42
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            42
 dev-python/asyncpg/Manifest                        |  2 +-
 

-            43
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            43
 ...asyncpg-0.20.1.ebuild => asyncpg-0.21.0.ebuild} |  9 ++--
 

-            44
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            44
 8 files changed, 6 insertions(+), 229 deletions(-)
 

-            45
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            45
 delete mode 100644 app-admin/customrescuecd-x86/customrescuecd-x86-0.3.1.ebuild
 

-            46
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            46
 delete mode 100644 app-admin/customrescuecd-x86/customrescuecd-x86-0.4.0.ebuild
 

-            47
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            47
 delete mode 100644 app-admin/customrescuecd-x86_64/customrescuecd-x86_64-0.10.3.ebuild
 

-            48
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            48
 delete mode 100644 app-admin/customrescuecd-x86_64/customrescuecd-x86_64-0.11.0.ebuild
 

-            49
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            49
 rename dev-python/asyncpg/{asyncpg-0.20.1.ebuild => asyncpg-0.21.0.ebuild} (78%)
 

-            50
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            50
*** syncing guru
 

-            51
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            51
*** synced guru
 

-            52
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            52
 * Sync succeeded
 

-            53
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            53
$ git log --format=%ci -1
 

-            54
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            54
$ git show -q --pretty=format:%G? HEAD
 

-            55
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            55
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 guru
 

-            56
WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            57
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            58
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            59
WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            60
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            61
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            62
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            63
WARNING:pkgcore:grub2-themes repo at '/var/lib/repo-mirror-ci/sync/grub2-themes', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            64
Cloning into '/var/lib/repo-mirror-ci/sync/guru'...
-

-            65
*** syncing guru
-

-            66
*** synced guru
-

-            67
 * Sync succeeded
-

-            68
$ git log --format=%ci -1
-

-            69
$ git show -q --pretty=format:%G? HEAD
-

-            70
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 guru
-

-            71
 * Cache regenerated successfully
+            56
 * Cache regenerated successfully
 

 
         
diff --git a/guru.txt b/guru.txt
index 6c6702e1def8..8bc70b0c81d6 100644
--- a/guru.txt
+++ b/guru.txt
@@ -10,58 +10,43 @@
             {'type': 'git',
              'uri': 'git+ssh://git@git.gentoo.org/repo/proj/guru.git'}],
  'status': 'official'}
- * Adding new repository
 $ pmaint sync guru
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:grub2-themes repo at '/var/lib/repo-mirror-ci/sync/grub2-themes', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-Cloning into '/var/lib/repo-mirror-ci/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
+   3507825..4d7ceb0  master     -> origin/master
+   bc5d5f4..4d7ceb0  dev        -> origin/dev
+Updating 3507825..4d7ceb0
+Fast-forward
+ app-admin/customrescuecd-x86/Manifest              |  2 -
+ .../customrescuecd-x86-0.3.1.ebuild                | 55 ----------------------
+ .../customrescuecd-x86-0.4.0.ebuild                | 55 ----------------------
+ app-admin/customrescuecd-x86_64/Manifest           |  2 -
+ .../customrescuecd-x86_64-0.10.3.ebuild            | 55 ----------------------
+ .../customrescuecd-x86_64-0.11.0.ebuild            | 55 ----------------------
+ dev-python/asyncpg/Manifest                        |  2 +-
+ ...asyncpg-0.20.1.ebuild => asyncpg-0.21.0.ebuild} |  9 ++--
+ 8 files changed, 6 insertions(+), 229 deletions(-)
+ delete mode 100644 app-admin/customrescuecd-x86/customrescuecd-x86-0.3.1.ebuild
+ delete mode 100644 app-admin/customrescuecd-x86/customrescuecd-x86-0.4.0.ebuild
+ delete mode 100644 app-admin/customrescuecd-x86_64/customrescuecd-x86_64-0.10.3.ebuild
+ delete mode 100644 app-admin/customrescuecd-x86_64/customrescuecd-x86_64-0.11.0.ebuild
+ rename dev-python/asyncpg/{asyncpg-0.20.1.ebuild => asyncpg-0.21.0.ebuild} (78%)
 *** syncing guru
 *** synced guru
  * Sync succeeded
diff --git a/haarp.html b/haarp.html
index 495f299184ea..17aa341eb2d8 100644
--- a/haarp.html
+++ b/haarp.html
@@ -30,93 +30,55 @@
 

             10
$ pmaint sync haarp
 

-            11
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            11
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            12
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
warning: Pulling without specifying how to reconcile divergent branches is
 

-            16
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
discouraged. You can squelch this message by running one of the following
 

-            17
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
commands sometime before your next pull:
 

-            18
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
 

-            19
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
  git config pull.rebase false  # merge (the default strategy)
 

-            20
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
  git config pull.rebase true   # rebase
 

-            21
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
  git config pull.ff only       # fast-forward only
 

-            22
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
 

-            23
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
You can replace "git config" with "git config --global" to set a default
 

-            24
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            25
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
or --ff-only on the command line to override the configured default per
 

-            26
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
invocation.
 

-            27
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
 

-            28
WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
Already up to date.
 

-            29
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
*** syncing haarp
 

-            30
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
*** synced haarp
 

-            31
WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
 * Sync succeeded
 

-            32
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
$ git log --format=%ci -1
 

-            33
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
$ git show -q --pretty=format:%G? HEAD
 

-            34
warning: Pulling without specifying how to reconcile divergent branches is
+            34
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 haarp
 

-            35
discouraged. You can squelch this message by running one of the following
-

-            36
commands sometime before your next pull:
-

-            37
-

-            38
  git config pull.rebase false  # merge (the default strategy)
-

-            39
  git config pull.rebase true   # rebase
-

-            40
  git config pull.ff only       # fast-forward only
-

-            41
-

-            42
You can replace "git config" with "git config --global" to set a default
-

-            43
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            44
or --ff-only on the command line to override the configured default per
-

-            45
invocation.
-

-            46
-

-            47
Already up to date.
-

-            48
*** syncing haarp
-

-            49
*** synced haarp
-

-            50
 * Sync succeeded
-

-            51
$ git log --format=%ci -1
-

-            52
$ git show -q --pretty=format:%G? HEAD
-

-            53
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 haarp
-

-            54
 * Cache regenerated successfully
+            35
 * Cache regenerated successfully
 

 
         
diff --git a/haarp.txt b/haarp.txt
index 85ceb3b362a2..1b65696034fa 100644
--- a/haarp.txt
+++ b/haarp.txt
@@ -8,29 +8,10 @@
  'source': [{'type': 'git', 'uri': 'git://anongit.gentoo.org/user/haarp.git'}],
  'status': 'unofficial'}
 $ pmaint sync haarp
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/hamper-overlay.html b/hamper-overlay.html
index a4f05178b16e..6fb44a1dfcec 100644
--- a/hamper-overlay.html
+++ b/hamper-overlay.html
@@ -38,97 +38,55 @@
 

             14
$ pmaint sync hamper-overlay
 

-            15
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
warning: Pulling without specifying how to reconcile divergent branches is
 

-            20
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
discouraged. You can squelch this message by running one of the following
 

-            21
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
commands sometime before your next pull:
 

-            22
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
 

-            23
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase false  # merge (the default strategy)
 

-            24
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.rebase true   # rebase
 

-            25
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.ff only       # fast-forward only
 

-            26
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
 

-            27
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
You can replace "git config" with "git config --global" to set a default
 

-            28
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            29
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
or --ff-only on the command line to override the configured default per
 

-            30
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
invocation.
 

-            31
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
 

-            32
WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
Already up to date.
 

-            33
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
*** syncing hamper-overlay
 

-            34
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
*** synced hamper-overlay
 

-            35
WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
 * Sync succeeded
 

-            36
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
$ git log --format=%ci -1
 

-            37
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            37
$ git show -q --pretty=format:%G? HEAD
 

-            38
WARNING:pkgcore:grub2-themes repo at '/var/lib/repo-mirror-ci/sync/grub2-themes', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            38
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 hamper-overlay
 

-            39
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            40
warning: Pulling without specifying how to reconcile divergent branches is
-

-            41
discouraged. You can squelch this message by running one of the following
-

-            42
commands sometime before your next pull:
-

-            43
-

-            44
  git config pull.rebase false  # merge (the default strategy)
-

-            45
  git config pull.rebase true   # rebase
-

-            46
  git config pull.ff only       # fast-forward only
-

-            47
-

-            48
You can replace "git config" with "git config --global" to set a default
-

-            49
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            50
or --ff-only on the command line to override the configured default per
-

-            51
invocation.
-

-            52
-

-            53
Already up to date.
-

-            54
*** syncing hamper-overlay
-

-            55
*** synced hamper-overlay
-

-            56
 * Sync succeeded
-

-            57
$ git log --format=%ci -1
-

-            58
$ git show -q --pretty=format:%G? HEAD
-

-            59
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 hamper-overlay
-

-            60
 * Cache regenerated successfully
+            39
 * Cache regenerated successfully
 

 
         
diff --git a/hamper-overlay.txt b/hamper-overlay.txt
index 6732042a6136..5d8a1b0f38ad 100644
--- a/hamper-overlay.txt
+++ b/hamper-overlay.txt
@@ -12,31 +12,10 @@
              'uri': 'git://github.com/hamper/hamper-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync hamper-overlay
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:grub2-themes repo at '/var/lib/repo-mirror-ci/sync/grub2-themes', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/han.html b/han.html
index 3509737e8b41..c43b0dd625f1 100644
--- a/han.html
+++ b/han.html
@@ -38,97 +38,55 @@
 

             14
$ pmaint sync han
 

-            15
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
warning: Pulling without specifying how to reconcile divergent branches is
 

-            20
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
discouraged. You can squelch this message by running one of the following
 

-            21
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
commands sometime before your next pull:
 

-            22
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
 

-            23
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase false  # merge (the default strategy)
 

-            24
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.rebase true   # rebase
 

-            25
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.ff only       # fast-forward only
 

-            26
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
 

-            27
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
You can replace "git config" with "git config --global" to set a default
 

-            28
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            29
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
or --ff-only on the command line to override the configured default per
 

-            30
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
invocation.
 

-            31
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
 

-            32
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
Already up to date.
 

-            33
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
*** syncing han
 

-            34
WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
*** synced han
 

-            35
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
 * Sync succeeded
 

-            36
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
$ git log --format=%ci -1
 

-            37
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            37
$ git show -q --pretty=format:%G? HEAD
 

-            38
WARNING:pkgcore:guru repo at '/var/lib/repo-mirror-ci/sync/guru', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            38
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 han
 

-            39
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            40
warning: Pulling without specifying how to reconcile divergent branches is
-

-            41
discouraged. You can squelch this message by running one of the following
-

-            42
commands sometime before your next pull:
-

-            43
-

-            44
  git config pull.rebase false  # merge (the default strategy)
-

-            45
  git config pull.rebase true   # rebase
-

-            46
  git config pull.ff only       # fast-forward only
-

-            47
-

-            48
You can replace "git config" with "git config --global" to set a default
-

-            49
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            50
or --ff-only on the command line to override the configured default per
-

-            51
invocation.
-

-            52
-

-            53
Already up to date.
-

-            54
*** syncing han
-

-            55
*** synced han
-

-            56
 * Sync succeeded
-

-            57
$ git log --format=%ci -1
-

-            58
$ git show -q --pretty=format:%G? HEAD
-

-            59
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 han
-

-            60
 * Cache regenerated successfully
+            39
 * Cache regenerated successfully
 

 
         
diff --git a/han.txt b/han.txt
index a0554e6f2427..63ffa40ffb3c 100644
--- a/han.txt
+++ b/han.txt
@@ -12,31 +12,10 @@
              'uri': 'git+ssh://git@github.com/hanmertens/han-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync han
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:guru repo at '/var/lib/repo-mirror-ci/sync/guru', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/hangul-typing.html b/hangul-typing.html
index 694444d1924b..c10fdb870546 100644
--- a/hangul-typing.html
+++ b/hangul-typing.html
@@ -38,97 +38,55 @@
 

             14
$ pmaint sync hangul-typing
 

-            15
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
warning: Pulling without specifying how to reconcile divergent branches is
 

-            20
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
discouraged. You can squelch this message by running one of the following
 

-            21
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
commands sometime before your next pull:
 

-            22
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
 

-            23
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase false  # merge (the default strategy)
 

-            24
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.rebase true   # rebase
 

-            25
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.ff only       # fast-forward only
 

-            26
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
 

-            27
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
You can replace "git config" with "git config --global" to set a default
 

-            28
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            29
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
or --ff-only on the command line to override the configured default per
 

-            30
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
invocation.
 

-            31
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
 

-            32
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
Already up to date.
 

-            33
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
*** syncing hangul-typing
 

-            34
WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
*** synced hangul-typing
 

-            35
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
 * Sync succeeded
 

-            36
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
$ git log --format=%ci -1
 

-            37
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            37
$ git show -q --pretty=format:%G? HEAD
 

-            38
WARNING:pkgcore:guru repo at '/var/lib/repo-mirror-ci/sync/guru', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            38
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 hangul-typing
 

-            39
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            40
warning: Pulling without specifying how to reconcile divergent branches is
-

-            41
discouraged. You can squelch this message by running one of the following
-

-            42
commands sometime before your next pull:
-

-            43
-

-            44
  git config pull.rebase false  # merge (the default strategy)
-

-            45
  git config pull.rebase true   # rebase
-

-            46
  git config pull.ff only       # fast-forward only
-

-            47
-

-            48
You can replace "git config" with "git config --global" to set a default
-

-            49
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            50
or --ff-only on the command line to override the configured default per
-

-            51
invocation.
-

-            52
-

-            53
Already up to date.
-

-            54
*** syncing hangul-typing
-

-            55
*** synced hangul-typing
-

-            56
 * Sync succeeded
-

-            57
$ git log --format=%ci -1
-

-            58
$ git show -q --pretty=format:%G? HEAD
-

-            59
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 hangul-typing
-

-            60
 * Cache regenerated successfully
+            39
 * Cache regenerated successfully
 

 
         
diff --git a/hangul-typing.txt b/hangul-typing.txt
index ead280485f19..1f27f26260da 100644
--- a/hangul-typing.txt
+++ b/hangul-typing.txt
@@ -12,31 +12,10 @@
              'uri': 'git+ssh://git@gitlab.com/espresso.tiger/hangul-typing.git'}],
  'status': 'unofficial'}
 $ pmaint sync hangul-typing
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:guru repo at '/var/lib/repo-mirror-ci/sync/guru', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/haskell.html b/haskell.html
index 4381f4b866af..fc398f5df1f8 100644
--- a/haskell.html
+++ b/haskell.html
@@ -38,97 +38,55 @@
 

             14
$ pmaint sync haskell
 

-            15
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
warning: Pulling without specifying how to reconcile divergent branches is
 

-            20
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
discouraged. You can squelch this message by running one of the following
 

-            21
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
commands sometime before your next pull:
 

-            22
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
 

-            23
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase false  # merge (the default strategy)
 

-            24
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.rebase true   # rebase
 

-            25
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.ff only       # fast-forward only
 

-            26
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
 

-            27
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
You can replace "git config" with "git config --global" to set a default
 

-            28
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            29
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
or --ff-only on the command line to override the configured default per
 

-            30
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
invocation.
 

-            31
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
 

-            32
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
Already up to date.
 

-            33
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
*** syncing haskell
 

-            34
WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
*** synced haskell
 

-            35
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
 * Sync succeeded
 

-            36
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
$ git log --format=%ci -1
 

-            37
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            37
$ git show -q --pretty=format:%G? HEAD
 

-            38
WARNING:pkgcore:guru repo at '/var/lib/repo-mirror-ci/sync/guru', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            38
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 haskell
 

-            39
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            40
warning: Pulling without specifying how to reconcile divergent branches is
-

-            41
discouraged. You can squelch this message by running one of the following
-

-            42
commands sometime before your next pull:
-

-            43
-

-            44
  git config pull.rebase false  # merge (the default strategy)
-

-            45
  git config pull.rebase true   # rebase
-

-            46
  git config pull.ff only       # fast-forward only
-

-            47
-

-            48
You can replace "git config" with "git config --global" to set a default
-

-            49
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            50
or --ff-only on the command line to override the configured default per
-

-            51
invocation.
-

-            52
-

-            53
Already up to date.
-

-            54
*** syncing haskell
-

-            55
*** synced haskell
-

-            56
 * Sync succeeded
-

-            57
$ git log --format=%ci -1
-

-            58
$ git show -q --pretty=format:%G? HEAD
-

-            59
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 haskell
-

-            60
 * Cache regenerated successfully
+            39
 * Cache regenerated successfully
 

 
         
diff --git a/haskell.txt b/haskell.txt
index 29acf7c3366a..ccc410a129c3 100644
--- a/haskell.txt
+++ b/haskell.txt
@@ -12,31 +12,10 @@
              'uri': 'https://github.com/gentoo-haskell/gentoo-haskell.git'}],
  'status': 'official'}
 $ pmaint sync haskell
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:guru repo at '/var/lib/repo-mirror-ci/sync/guru', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/heindsight.html b/heindsight.html
index 2cf590a6d112..dc213ae335ce 100644
--- a/heindsight.html
+++ b/heindsight.html
@@ -38,97 +38,55 @@
 

             14
$ pmaint sync heindsight
 

-            15
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
warning: Pulling without specifying how to reconcile divergent branches is
 

-            20
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
discouraged. You can squelch this message by running one of the following
 

-            21
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
commands sometime before your next pull:
 

-            22
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
 

-            23
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase false  # merge (the default strategy)
 

-            24
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.rebase true   # rebase
 

-            25
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.ff only       # fast-forward only
 

-            26
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
 

-            27
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
You can replace "git config" with "git config --global" to set a default
 

-            28
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            29
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
or --ff-only on the command line to override the configured default per
 

-            30
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
invocation.
 

-            31
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
 

-            32
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
Already up to date.
 

-            33
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
*** syncing heindsight
 

-            34
WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
*** synced heindsight
 

-            35
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
 * Sync succeeded
 

-            36
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
$ git log --format=%ci -1
 

-            37
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            37
$ git show -q --pretty=format:%G? HEAD
 

-            38
WARNING:pkgcore:guru repo at '/var/lib/repo-mirror-ci/sync/guru', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            38
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 heindsight
 

-            39
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            40
warning: Pulling without specifying how to reconcile divergent branches is
-

-            41
discouraged. You can squelch this message by running one of the following
-

-            42
commands sometime before your next pull:
-

-            43
-

-            44
  git config pull.rebase false  # merge (the default strategy)
-

-            45
  git config pull.rebase true   # rebase
-

-            46
  git config pull.ff only       # fast-forward only
-

-            47
-

-            48
You can replace "git config" with "git config --global" to set a default
-

-            49
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            50
or --ff-only on the command line to override the configured default per
-

-            51
invocation.
-

-            52
-

-            53
Already up to date.
-

-            54
*** syncing heindsight
-

-            55
*** synced heindsight
-

-            56
 * Sync succeeded
-

-            57
$ git log --format=%ci -1
-

-            58
$ git show -q --pretty=format:%G? HEAD
-

-            59
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 heindsight
-

-            60
 * Cache regenerated successfully
+            39
 * Cache regenerated successfully
 

 
         
diff --git a/heindsight.txt b/heindsight.txt
index a095ba1c5e52..f30c768e62b8 100644
--- a/heindsight.txt
+++ b/heindsight.txt
@@ -12,31 +12,10 @@
              'uri': 'git+ssh://git@github.com/heindsight/gentoo_overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync heindsight
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:guru repo at '/var/lib/repo-mirror-ci/sync/guru', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/hering-overlay.html b/hering-overlay.html
index ae9867486ed1..af9ab0735c5a 100644
--- a/hering-overlay.html
+++ b/hering-overlay.html
@@ -34,97 +34,55 @@
 

             12
$ pmaint sync hering-overlay
 

-            13
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
warning: Pulling without specifying how to reconcile divergent branches is
 

-            18
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
discouraged. You can squelch this message by running one of the following
 

-            19
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
commands sometime before your next pull:
 

-            20
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
 

-            21
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
  git config pull.rebase false  # merge (the default strategy)
 

-            22
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase true   # rebase
 

-            23
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.ff only       # fast-forward only
 

-            24
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 

-            25
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
You can replace "git config" with "git config --global" to set a default
 

-            26
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            27
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
or --ff-only on the command line to override the configured default per
 

-            28
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
invocation.
 

-            29
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
 

-            30
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
Already up to date.
 

-            31
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
*** syncing hering-overlay
 

-            32
WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
*** synced hering-overlay
 

-            33
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
 * Sync succeeded
 

-            34
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
$ git log --format=%ci -1
 

-            35
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
$ git show -q --pretty=format:%G? HEAD
 

-            36
WARNING:pkgcore:guru repo at '/var/lib/repo-mirror-ci/sync/guru', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 hering-overlay
 

-            37
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            38
warning: Pulling without specifying how to reconcile divergent branches is
-

-            39
discouraged. You can squelch this message by running one of the following
-

-            40
commands sometime before your next pull:
-

-            41
-

-            42
  git config pull.rebase false  # merge (the default strategy)
-

-            43
  git config pull.rebase true   # rebase
-

-            44
  git config pull.ff only       # fast-forward only
-

-            45
-

-            46
You can replace "git config" with "git config --global" to set a default
-

-            47
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            48
or --ff-only on the command line to override the configured default per
-

-            49
invocation.
-

-            50
-

-            51
Already up to date.
-

-            52
*** syncing hering-overlay
-

-            53
*** synced hering-overlay
-

-            54
 * Sync succeeded
-

-            55
$ git log --format=%ci -1
-

-            56
$ git show -q --pretty=format:%G? HEAD
-

-            57
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 hering-overlay
-

-            58
 * Cache regenerated successfully
+            37
 * Cache regenerated successfully
 

 
         
diff --git a/hering-overlay.txt b/hering-overlay.txt
index 1458b72f163d..4d411c04eb91 100644
--- a/hering-overlay.txt
+++ b/hering-overlay.txt
@@ -10,31 +10,10 @@
              'uri': 'https://github.com/internethering/hering-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync hering-overlay
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:guru repo at '/var/lib/repo-mirror-ci/sync/guru', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/hexedit-overlay.html b/hexedit-overlay.html
index b1ca38d4037e..40d7895386e6 100644
--- a/hexedit-overlay.html
+++ b/hexedit-overlay.html
@@ -34,97 +34,59 @@
 

             12
$ pmaint sync hexedit-overlay
 

-            13
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
warning: Pulling without specifying how to reconcile divergent branches is
 

-            20
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
discouraged. You can squelch this message by running one of the following
 

-            21
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
commands sometime before your next pull:
 

-            22
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
 

-            23
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase false  # merge (the default strategy)
 

-            24
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.rebase true   # rebase
 

-            25
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.ff only       # fast-forward only
 

-            26
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
 

-            27
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
You can replace "git config" with "git config --global" to set a default
 

-            28
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            29
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
or --ff-only on the command line to override the configured default per
 

-            30
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
invocation.
 

-            31
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
 

-            32
WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
Already up to date.
 

-            33
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
*** syncing hexedit-overlay
 

-            34
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
*** synced hexedit-overlay
 

-            35
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
 * Sync succeeded
 

-            36
WARNING:pkgcore:guru repo at '/var/lib/repo-mirror-ci/sync/guru', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
$ git log --format=%ci -1
 

-            37
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            37
$ git show -q --pretty=format:%G? HEAD
 

-            38
warning: Pulling without specifying how to reconcile divergent branches is
+            38
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 hexedit-overlay
 

-            39
discouraged. You can squelch this message by running one of the following
-

-            40
commands sometime before your next pull:
-

-            41
-

-            42
  git config pull.rebase false  # merge (the default strategy)
-

-            43
  git config pull.rebase true   # rebase
-

-            44
  git config pull.ff only       # fast-forward only
-

-            45
-

-            46
You can replace "git config" with "git config --global" to set a default
-

-            47
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            48
or --ff-only on the command line to override the configured default per
-

-            49
invocation.
-

-            50
-

-            51
Already up to date.
-

-            52
*** syncing hexedit-overlay
-

-            53
*** synced hexedit-overlay
-

-            54
 * Sync succeeded
-

-            55
$ git log --format=%ci -1
-

-            56
$ git show -q --pretty=format:%G? HEAD
-

-            57
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 hexedit-overlay
-

-            58
 * Cache regenerated successfully
+            39
 * Cache regenerated successfully
 

 
         
diff --git a/hexedit-overlay.txt b/hexedit-overlay.txt
index d361daa536f2..81909889ccf2 100644
--- a/hexedit-overlay.txt
+++ b/hexedit-overlay.txt
@@ -10,31 +10,12 @@
              'uri': 'https://git.ifproject.ru/hexedit/gentoo-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync hexedit-overlay
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:guru repo at '/var/lib/repo-mirror-ci/sync/guru', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/hhvm.html b/hhvm.html
index 92c46bed3f05..f859172028c0 100644
--- a/hhvm.html
+++ b/hhvm.html
@@ -38,107 +38,69 @@
 

             14
$ pmaint sync hhvm
 

-            15
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
warning: Pulling without specifying how to reconcile divergent branches is
 

-            22
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
discouraged. You can squelch this message by running one of the following
 

-            23
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
commands sometime before your next pull:
 

-            24
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 

-            25
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase false  # merge (the default strategy)
 

-            26
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.rebase true   # rebase
 

-            27
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.ff only       # fast-forward only
 

-            28
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
 

-            29
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
You can replace "git config" with "git config --global" to set a default
 

-            30
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            31
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
or --ff-only on the command line to override the configured default per
 

-            32
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
invocation.
 

-            33
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
 

-            34
WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
Already up to date.
 

-            35
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
*** syncing hhvm
 

-            36
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
*** synced hhvm
 

-            37
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            37
 * Sync succeeded
 

-            38
WARNING:pkgcore:guru repo at '/var/lib/repo-mirror-ci/sync/guru', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            38
$ git log --format=%ci -1
 

-            39
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            39
$ git show -q --pretty=format:%G? HEAD
 

-            40
warning: Pulling without specifying how to reconcile divergent branches is
+            40
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 hhvm
 

-            41
discouraged. You can squelch this message by running one of the following
-

-            42
commands sometime before your next pull:
-

-            43
-

-            44
  git config pull.rebase false  # merge (the default strategy)
-

-            45
  git config pull.rebase true   # rebase
-

-            46
  git config pull.ff only       # fast-forward only
-

-            47
-

-            48
You can replace "git config" with "git config --global" to set a default
-

-            49
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            50
or --ff-only on the command line to override the configured default per
-

-            51
invocation.
-

-            52
-

-            53
Already up to date.
-

-            54
*** syncing hhvm
-

-            55
*** synced hhvm
-

-            56
 * Sync succeeded
-

-            57
$ git log --format=%ci -1
-

-            58
$ git show -q --pretty=format:%G? HEAD
-

-            59
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 hhvm
-

-            60
 * dev-php/hhvm-3.12.7: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            41
 * dev-php/hhvm-3.12.7: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            61
 * dev-php/hhvm-3.14.4: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            42
 * dev-php/hhvm-3.14.4: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            62
 * dev-php/hhvm-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            43
 * dev-php/hhvm-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            63
 * dev-util/arcanist-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            44
 * dev-util/arcanist-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            64
 * dev-util/libphutil-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            45
 * dev-util/libphutil-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            65
 * Cache regen failed with 1
+            46
 * Cache regen failed with 1
 

 
         
diff --git a/hhvm.txt b/hhvm.txt
index 988f09a48e6f..c3e4f2b3cb5d 100644
--- a/hhvm.txt
+++ b/hhvm.txt
@@ -12,31 +12,12 @@
              'uri': 'git://github.com/reanimus/hhvm-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync hhvm
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:guru repo at '/var/lib/repo-mirror-ci/sync/guru', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/hibiscus.html b/hibiscus.html
index b76090f06167..361bf62c8186 100644
--- a/hibiscus.html
+++ b/hibiscus.html
@@ -44,114 +44,46 @@
 

             17
$ pmaint sync hibiscus
 

-            18
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            23
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            24
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            25
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            26
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            27
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            28
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            29
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            30
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
Cloning into '/var/lib/repo-mirror-ci/sync/hibiscus'...
 

-            31
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
*** syncing hibiscus
 

-            32
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
*** synced hibiscus
 

-            33
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
 * Sync succeeded
 

-            34
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
$ git log --format=%ci -1
 

-            35
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
$ git show -q --pretty=format:%G? HEAD
 

-            36
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 hibiscus
 

-            37
WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            37
 * Cache regenerated successfully
 

-            38
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            39
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            40
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            41
WARNING:pkgcore:guru repo at '/var/lib/repo-mirror-ci/sync/guru', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            42
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            43
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            44
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            45
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            46
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            47
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            48
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            49
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            50
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            51
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            52
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            53
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            54
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            55
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            56
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            57
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            58
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            59
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            60
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            61
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            62
WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            63
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            64
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            65
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            66
WARNING:pkgcore:guru repo at '/var/lib/repo-mirror-ci/sync/guru', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            67
Cloning into '/var/lib/repo-mirror-ci/sync/hibiscus'...
-

-            68
fatal: unable to access 'https://anongit.gentoo.org/git/user/hibiscus.git/': The requested URL returned error: 504
-

-            69
*** syncing hibiscus
-

-            70
!!! failed syncing hibiscus
-

-            71
 * Sync failed with 1
-
[FATAL]
 
         
     
diff --git a/hibiscus.txt b/hibiscus.txt
index 461f54c81ffb..3e6d1bbfbf01 100644
--- a/hibiscus.txt
+++ b/hibiscus.txt
@@ -15,57 +15,23 @@
  'status': 'unofficial'}
  * Adding new repository
 $ pmaint sync hibiscus
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:guru repo at '/var/lib/repo-mirror-ci/sync/guru', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:guru repo at '/var/lib/repo-mirror-ci/sync/guru', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 Cloning into '/var/lib/repo-mirror-ci/sync/hibiscus'...
-fatal: unable to access 'https://anongit.gentoo.org/git/user/hibiscus.git/': The requested URL returned error: 504
 *** syncing hibiscus
-!!! failed syncing hibiscus
- * Sync failed with 1
+*** synced hibiscus
+ * Sync succeeded
+$ git log --format=%ci -1
+$ git show -q --pretty=format:%G? HEAD
+$ pmaint regen --use-local-desc --pkg-desc-index -t 1 hibiscus
+ * Cache regenerated successfully
diff --git a/holgersson-overlay.html b/holgersson-overlay.html
index 0b5a47b5b7b9..0e755be92c3c 100644
--- a/holgersson-overlay.html
+++ b/holgersson-overlay.html
@@ -32,97 +32,59 @@
 

             11
$ pmaint sync holgersson-overlay
 

-            12
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
warning: Pulling without specifying how to reconcile divergent branches is
 

-            19
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
discouraged. You can squelch this message by running one of the following
 

-            20
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
commands sometime before your next pull:
 

-            21
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
 

-            22
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase false  # merge (the default strategy)
 

-            23
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase true   # rebase
 

-            24
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.ff only       # fast-forward only
 

-            25
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 

-            26
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
You can replace "git config" with "git config --global" to set a default
 

-            27
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            28
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
or --ff-only on the command line to override the configured default per
 

-            29
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
invocation.
 

-            30
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
 

-            31
WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
Already up to date.
 

-            32
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
*** syncing holgersson-overlay
 

-            33
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
*** synced holgersson-overlay
 

-            34
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
 * Sync succeeded
 

-            35
WARNING:pkgcore:guru repo at '/var/lib/repo-mirror-ci/sync/guru', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
$ git log --format=%ci -1
 

-            36
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
$ git show -q --pretty=format:%G? HEAD
 

-            37
warning: Pulling without specifying how to reconcile divergent branches is
+            37
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 holgersson-overlay
 

-            38
discouraged. You can squelch this message by running one of the following
-

-            39
commands sometime before your next pull:
-

-            40
-

-            41
  git config pull.rebase false  # merge (the default strategy)
-

-            42
  git config pull.rebase true   # rebase
-

-            43
  git config pull.ff only       # fast-forward only
-

-            44
-

-            45
You can replace "git config" with "git config --global" to set a default
-

-            46
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            47
or --ff-only on the command line to override the configured default per
-

-            48
invocation.
-

-            49
-

-            50
Already up to date.
-

-            51
*** syncing holgersson-overlay
-

-            52
*** synced holgersson-overlay
-

-            53
 * Sync succeeded
-

-            54
$ git log --format=%ci -1
-

-            55
$ git show -q --pretty=format:%G? HEAD
-

-            56
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 holgersson-overlay
-

-            57
 * Cache regenerated successfully
+            38
 * Cache regenerated successfully
 

 
         
diff --git a/holgersson-overlay.txt b/holgersson-overlay.txt
index 1602aa1f088b..038bebbf4069 100644
--- a/holgersson-overlay.txt
+++ b/holgersson-overlay.txt
@@ -9,31 +9,12 @@
              'uri': 'https://git.holgersson.xyz/foss/holgersson-overlay'}],
  'status': 'unofficial'}
 $ pmaint sync holgersson-overlay
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:guru repo at '/var/lib/repo-mirror-ci/sync/guru', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/hossie.html b/hossie.html
index a5d81b20ab71..022446583df2 100644
--- a/hossie.html
+++ b/hossie.html
@@ -28,97 +28,59 @@
 

             9
$ pmaint sync hossie
 

-            10
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            10
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            11
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            11
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            12
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
warning: Pulling without specifying how to reconcile divergent branches is
 

-            17
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
discouraged. You can squelch this message by running one of the following
 

-            18
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
commands sometime before your next pull:
 

-            19
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
 

-            20
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
  git config pull.rebase false  # merge (the default strategy)
 

-            21
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
  git config pull.rebase true   # rebase
 

-            22
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.ff only       # fast-forward only
 

-            23
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
 

-            24
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
You can replace "git config" with "git config --global" to set a default
 

-            25
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            26
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
or --ff-only on the command line to override the configured default per
 

-            27
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
invocation.
 

-            28
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
 

-            29
WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
Already up to date.
 

-            30
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
*** syncing hossie
 

-            31
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
*** synced hossie
 

-            32
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
 * Sync succeeded
 

-            33
WARNING:pkgcore:guru repo at '/var/lib/repo-mirror-ci/sync/guru', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
$ git log --format=%ci -1
 

-            34
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
$ git show -q --pretty=format:%G? HEAD
 

-            35
warning: Pulling without specifying how to reconcile divergent branches is
+            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 hossie
 

-            36
discouraged. You can squelch this message by running one of the following
-

-            37
commands sometime before your next pull:
-

-            38
-

-            39
  git config pull.rebase false  # merge (the default strategy)
-

-            40
  git config pull.rebase true   # rebase
-

-            41
  git config pull.ff only       # fast-forward only
-

-            42
-

-            43
You can replace "git config" with "git config --global" to set a default
-

-            44
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            45
or --ff-only on the command line to override the configured default per
-

-            46
invocation.
-

-            47
-

-            48
Already up to date.
-

-            49
*** syncing hossie
-

-            50
*** synced hossie
-

-            51
 * Sync succeeded
-

-            52
$ git log --format=%ci -1
-

-            53
$ git show -q --pretty=format:%G? HEAD
-

-            54
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 hossie
-

-            55
 * Cache regenerated successfully
+            36
 * Cache regenerated successfully
 

 
         
diff --git a/hossie.txt b/hossie.txt
index 71bfcf2827ac..651740fb2cca 100644
--- a/hossie.txt
+++ b/hossie.txt
@@ -7,31 +7,12 @@
              'uri': 'https://git.hossie.de/scm/gen/gentoo-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync hossie
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:guru repo at '/var/lib/repo-mirror-ci/sync/guru', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/ikelos.html b/ikelos.html
index 9cef9f16051c..450923ba68e6 100644
--- a/ikelos.html
+++ b/ikelos.html
@@ -42,114 +42,46 @@
 

             16
$ pmaint sync ikelos
 

-            17
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            23
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            24
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            25
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            26
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            27
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            28
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            29
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
Cloning into '/var/lib/repo-mirror-ci/sync/ikelos'...
 

-            30
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
*** syncing ikelos
 

-            31
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
*** synced ikelos
 

-            32
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
 * Sync succeeded
 

-            33
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
$ git log --format=%ci -1
 

-            34
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
$ git show -q --pretty=format:%G? HEAD
 

-            35
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 ikelos
 

-            36
WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
 * Cache regenerated successfully
 

-            37
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            38
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            39
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            40
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            41
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            42
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            43
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            44
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            45
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            46
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            47
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            48
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            49
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            50
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            51
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            52
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            53
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            54
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            55
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            56
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            57
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            58
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            59
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            60
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            61
WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            62
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            63
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            64
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            65
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            66
Cloning into '/var/lib/repo-mirror-ci/sync/ikelos'...
-

-            67
fatal: unable to access 'https://anongit.gentoo.org/git/dev/ikelos.git/': The requested URL returned error: 504
-

-            68
*** syncing ikelos
-

-            69
!!! failed syncing ikelos
-

-            70
 * Sync failed with 1
-
[FATAL]
 
         
     
diff --git a/ikelos.txt b/ikelos.txt
index 487e0cf67352..3100f6f87f0e 100644
--- a/ikelos.txt
+++ b/ikelos.txt
@@ -14,57 +14,23 @@
  'status': 'unofficial'}
  * Adding new repository
 $ pmaint sync ikelos
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 Cloning into '/var/lib/repo-mirror-ci/sync/ikelos'...
-fatal: unable to access 'https://anongit.gentoo.org/git/dev/ikelos.git/': The requested URL returned error: 504
 *** syncing ikelos
-!!! failed syncing ikelos
- * Sync failed with 1
+*** synced ikelos
+ * Sync succeeded
+$ git log --format=%ci -1
+$ git show -q --pretty=format:%G? HEAD
+$ pmaint regen --use-local-desc --pkg-desc-index -t 1 ikelos
+ * Cache regenerated successfully
diff --git a/imaging.html b/imaging.html
index 8f1152cfac06..79f80a81a58e 100644
--- a/imaging.html
+++ b/imaging.html
@@ -28,99 +28,59 @@
 

             9
$ pmaint sync imaging
 

-            10
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            10
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            11
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            11
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            12
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
warning: Pulling without specifying how to reconcile divergent branches is
 

-            17
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
discouraged. You can squelch this message by running one of the following
 

-            18
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
commands sometime before your next pull:
 

-            19
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
 

-            20
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
  git config pull.rebase false  # merge (the default strategy)
 

-            21
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
  git config pull.rebase true   # rebase
 

-            22
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.ff only       # fast-forward only
 

-            23
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
 

-            24
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
You can replace "git config" with "git config --global" to set a default
 

-            25
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            26
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
or --ff-only on the command line to override the configured default per
 

-            27
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
invocation.
 

-            28
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
 

-            29
WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
Already up to date.
 

-            30
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
*** syncing imaging
 

-            31
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
*** synced imaging
 

-            32
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
 * Sync succeeded
 

-            33
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
$ git log --format=%ci -1
 

-            34
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
$ git show -q --pretty=format:%G? HEAD
 

-            35
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 imaging
 

-            36
warning: Pulling without specifying how to reconcile divergent branches is
-

-            37
discouraged. You can squelch this message by running one of the following
-

-            38
commands sometime before your next pull:
-

-            39
-

-            40
  git config pull.rebase false  # merge (the default strategy)
-

-            41
  git config pull.rebase true   # rebase
-

-            42
  git config pull.ff only       # fast-forward only
-

-            43
-

-            44
You can replace "git config" with "git config --global" to set a default
-

-            45
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            46
or --ff-only on the command line to override the configured default per
-

-            47
invocation.
-

-            48
-

-            49
Already up to date.
-

-            50
*** syncing imaging
-

-            51
*** synced imaging
-

-            52
 * Sync succeeded
-

-            53
$ git log --format=%ci -1
-

-            54
$ git show -q --pretty=format:%G? HEAD
-

-            55
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 imaging
-

-            56
 * Cache regenerated successfully
+            36
 * Cache regenerated successfully
 

 
         
diff --git a/imaging.txt b/imaging.txt
index 552baaec81d1..b742f181e266 100644
--- a/imaging.txt
+++ b/imaging.txt
@@ -7,32 +7,12 @@
              'uri': 'https://github.com/gerddie/gentoo-imaging.git'}],
  'status': 'unofficial'}
 $ pmaint sync imaging
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/index.html b/index.html
index d7c3b4a5bada..6d51e01fbd17 100644
--- a/index.html
+++ b/index.html
@@ -18,15 +18,18 @@
 67AlexandreFournier
         ArchFehall good!2020-04-22 15:59:45 +0300
 22ArchFeh
-        AstroFloydsync failed for repositoryAstroFloyd
+        AstroFloydall good!2020-10-05 21:33:20 +0200
+134AstroFloyd
         AzPall good!2020-10-17 22:46:05 +0200
 15AzP
         Case_Ofall good!2020-10-10 04:41:35 +0200
 15Case_Of
-        Drauthiussync failed for repositoryDrauthius
-        DuPolsync failed for repositoryDuPol
-        FireBurncache regen failed2020-10-23 15:27:20 +0100
-55FireBurn
+        Drauthiusall good!2020-09-17 16:30:24 +0200
+12Drauthius
+        DuPolall good!2020-02-18 21:05:32 +0100
+12DuPol
+        FireBurncache regen failed2020-10-23 17:05:43 +0100
+58FireBurn
         HomeAssistantRepositoryall good!2020-10-23 08:13:31 +0200
 2533HomeAssistantRepository
         JRGall good!2020-09-11 13:52:29 -0400
@@ -45,7 +48,8 @@
 138SwordArMor
         aceall good!2020-10-02 11:27:41 +0200
 31ace
-        activehomesync failed for repositoryactivehome
+        activehomeall good!2020-07-21 16:01:39 +0700
+4activehome
         aeon-gentoo-overlayall good!2019-05-19 12:32:23 +0200
 3aeon-gentoo-overlay
         ag-opsall good!2020-09-02 23:15:27 -0500
@@ -58,23 +62,28 @@
 7alatar-lay
         alesharikall good!2020-10-18 15:27:47 +0300
 18alesharik
-        alexcepoisync failed for repositoryalexcepoi
+        alexcepoiall good!2018-01-21 15:49:24 +0000
+2alexcepoi
         alexxyall good!2020-02-11 14:50:24 +0300
 3alexxy
         alinefrcache regen failed2020-05-12 19:16:58 +0000
 28alinefr
-        alucosync failed for repositoryaluco
+        alucoall good!2017-05-22 00:05:14 +0200
+24aluco
         amedeosall good!2020-10-17 20:46:50 +0200
 34amedeos
-        anarchysync failed for repositoryanarchy
-        anaximandersync failed for repositoryanaximander
+        anarchyall good!2020-10-09 06:00:27 -0500
+12anarchy
+        anaximanderall good!2020-09-30 10:25:23 +0200
+3anaximander
         anders-larssonall good!2020-10-23 05:56:48 +0000
 34anders-larsson
         andjscottcache regen failed2016-10-17 16:03:33 +0100
 14andjscott
         andrey_utkinall good!2020-09-04 11:23:21 +0100
 2andrey_utkin
-        andysync failed for repositoryandy
+        andycache regen failed2020-01-03 10:49:14 +0100
+23andy
         anomenall good!2020-09-19 13:40:34 +0200
 58anomen
         anycall good!2020-02-16 18:56:45 +0100
@@ -91,11 +100,12 @@
 4atom
         audio-overlayall good!2020-10-18 11:43:11 +0200
 68audio-overlay
-        averageinvalid repository metadata2020-06-29 16:12:16 -0400
-average
+        averageall good!2020-06-29 16:12:16 -0400
+18average
         awesomeall good!2020-10-10 09:34:00 +0200
 37awesome
-        axssync failed for repositoryaxs
+        axsall good!2017-12-19 14:22:25 -0500
+17axs
         barnowlall good!2020-05-12 02:13:53 -0400
 9barnowl
         barzog-overlaycache regen failed2019-12-02 16:52:17 +0300
@@ -108,7 +118,8 @@
 8bes
         bezerkerall good!2015-09-04 06:56:43 -0400
 3bezerker
-        bibletimesync failed for repositorybibletime
+        bibletimeall good!2020-08-02 21:35:41 +0300
+6bibletime
         binarydenall good!2020-10-18 19:45:56 +0200
 27binaryden
         bircophall good!2020-09-25 11:52:20 +0300
@@ -119,7 +130,8 @@
 162bitcoin
         bleeding-edgeall good!2018-09-26 10:53:10 +0200
 11bleeding-edge
-        blender-gentoo-logosync failed for repositoryblender-gentoo-logo
+        blender-gentoo-logoall good!2017-09-09 16:34:22 +0200
+3blender-gentoo-logo
         bliss-overlayall good!2020-09-20 09:16:21 -0400
 9bliss-overlay
         bloodyall good!2020-04-17 17:18:04 +0200
@@ -158,9 +170,10 @@
 1chrisadr
         chrytooall good!2019-08-19 00:07:33 +0200
 2chrytoo
-        chutzpahsync failed for repositorychutzpah
-        chymericinvalid repository metadata2020-10-21 12:12:25 -0400
-chymeric
+        chutzpahcache regen failed2020-09-22 16:29:34 -0700
+9chutzpah
+        chymericall good!2020-10-21 12:12:25 -0400
+41chymeric
         cj-overlayall good!2017-11-08 11:12:00 -0700
 7cj-overlay
         concaveoverlayall good!2019-11-23 19:42:16 +0000
@@ -173,7 +186,8 @@
 122cynede
         dMaggotall good!2017-06-01 22:09:38 -0400
 8dMaggot
-        darkelfsync failed for repositorydarkelf
+        darkelfall good!2020-09-21 18:45:53 +0200
+11darkelf
         darthgandalf-overlayall good!2020-10-03 20:01:01 +0100
 5darthgandalf-overlay
         deadbeef-overlayall good!2019-06-06 14:06:08 +0000
@@ -194,8 +208,10 @@
 13devpump-gor
         didactic-duckall good!2020-03-18 22:02:03 -0500
 80didactic-duck
-        dilfridgesync failed for repositorydilfridge
-        displacersync failed for repositorydisplacer
+        dilfridgeall good!2020-09-09 20:01:46 +0300
+16dilfridge
+        displacerall good!2020-03-03 16:11:39 +0300
+16displacer
         distrosall good!2020-08-05 14:24:19 +0300
 0distros
         djcall good!2017-12-01 14:24:16 +0100
@@ -230,7 +246,8 @@
 136elementary
         elopez-r-overlayall good!2020-10-11 01:24:54 +0200
 23elopez-r-overlay
-        emacssync failed for repositoryemacs
+        emacsall good!2020-09-25 19:57:06 +0200
+32emacs
         enlightenment-liveall good!2020-08-19 09:54:21 +0200
 22enlightenment-live
         ennuiall good!2020-04-17 23:15:42 +0200
@@ -273,7 +290,8 @@
 55fol4
         foo-overlayall good!2020-01-19 16:39:22 +0100
 12foo-overlay
-        fordfrogsync failed for repositoryfordfrog
+        fordfrogall good!2020-09-15 19:04:32 +0200
+286fordfrog
         fowlayall good!2018-04-07 14:41:09 +0200
 1fowlay
         foxiverlayall good!2019-10-26 17:15:39 +0300
@@ -286,7 +304,7 @@
 1frostyx
         frr-gentooall good!2020-09-16 11:18:22 +0200
 46frr-gentoo
-        fusion809all good!2020-10-24 00:09:48 +1000
+        fusion809all good!2020-10-24 03:18:05 +1000
 16fusion809
         fuverlayall good!2019-02-03 01:49:12 +0300
 7fuverlay
@@ -300,16 +318,18 @@
 8gcarq
         genthreeall good!2020-04-18 16:27:50 +0200
 49genthree
-        gentooall good!2020-10-23 14:46:48 +0200
-30772gentoo
+        gentooall good!2020-10-23 19:08:15 +0200
+30774gentoo
         gentoo-clangall good!2020-05-29 09:13:01 +0200
 12gentoo-clang
-        gentoo-matesync failed for repositorygentoo-mate
+        gentoo-mateall good!2020-09-07 22:21:22 -0400
+175gentoo-mate
         gentoo-playgroundcache regen failed2019-05-24 17:39:11 +0100
 32gentoo-playground
         gentoo-zhall good!2020-10-12 11:50:26 +0800
 503gentoo-zh
-        gerislaysync failed for repositorygerislay
+        gerislayall good!2020-10-23 16:47:58 +0200
+41gerislay
         gigall good!2020-10-08 12:58:57 +0800
 39gig
         gitlaball good!2020-10-22 09:38:38 +0200
@@ -324,21 +344,24 @@
 194gnome-next
         gnuradioall good!2019-04-01 15:09:34 -0600
 126gnuradio
-        gnustepsync failed for repositorygnustep
+        gnustepall good!2019-01-14 17:11:46 +0100
+2gnustep
         gnux32all good!2020-05-24 11:36:38 +0200
 94gnux32
         go-overlayall good!2020-10-22 03:07:34 +0200
 244go-overlay
         godinall good!2020-02-20 12:08:54 +0100
 14godin
-        gorissync failed for repositorygoris
-        graaffsync failed for repositorygraaff
+        gorisall good!2015-10-16 19:37:55 +0400
+8goris
+        graaffall good!2020-10-22 06:39:53 +0200
+430graaff
         grub2-themesall good!2015-07-19 17:38:24 +0200
 24grub2-themes
         gsview-overlayall good!2020-10-21 12:19:15 +1000
 12gsview-overlay
-        guruall good!2020-10-23 11:26:03 +0200
-615guru
+        guruall good!2020-10-23 16:51:34 +0200
+611guru
         haarpall good!2020-10-19 23:13:58 +0200
 48haarp
         hamper-overlayall good!2020-10-16 19:48:27 +0300
@@ -357,12 +380,14 @@
 18hexedit-overlay
         hhvmcache regen failed2016-08-10 00:36:19 -0700
 3hhvm
-        hibiscussync failed for repositoryhibiscus
+        hibiscusall good!2015-10-28 17:09:06 +0100
+22hibiscus
         holgersson-overlayall good!2020-10-23 10:47:50 +0200
 26holgersson-overlay
         hossieall good!2020-08-24 14:56:19 +0200
 84hossie
-        ikelossync failed for repositoryikelos
+        ikelosall good!2020-10-09 16:31:17 +0100
+123ikelos
         imagingall good!2020-02-13 19:29:18 +0100
 44imaging
         interactive-fictionall good!2020-02-22 15:48:44 +0200
@@ -371,8 +396,10 @@
 7ixit
         jacendi-overlayall good!2019-07-09 12:35:42 +0300
 14jacendi-overlay
-        jamesbroadheadsync failed for repositoryjamesbroadhead
-        javasync failed for repositoryjava
+        jamesbroadheadall good!2017-02-25 09:15:45 +0000
+3jamesbroadhead
+        javaall good!2020-09-20 14:09:18 +0200
+137java
         jboro-overlayall good!2015-08-08 11:25:17 -0500
 2jboro-overlay
         jkoloall good!2020-07-18 01:05:16 +0200
@@ -399,7 +426,8 @@
 47k_f
         kaaall good!2020-10-22 22:38:40 +0300
 25kaa
-        kdesync failed for repositorykde
+        kdeall good!2020-10-21 23:09:36 +0200
+782kde
         keepbot-overlayall good!2020-07-03 15:17:56 +0300
 7keepbot-overlay
         khoverlayall good!2020-10-12 14:44:52 -0700
@@ -416,7 +444,8 @@
 71laurentb
         leechcraftall good!2020-10-10 10:48:51 -0500
 18leechcraft
-        leiosync failed for repositoryleio
+        leioall good!2020-02-22 13:57:49 +0200
+9leio
         leonardohnall good!2020-10-20 00:26:30 -0300
 6leonardohn
         levenkovall good!2015-02-20 13:13:52 +0300
@@ -431,7 +460,8 @@
 154linuxunderground-overlay
         linxonall good!2020-09-24 16:43:15 +0300
 222linxon
-        lispsync failed for repositorylisp
+        lispall good!2020-07-03 13:34:17 +0200
+382lisp
         lmiphayall good!2020-10-14 10:31:22 +0100
 279lmiphay
         lordvancache regen failed2018-05-08 08:47:52 +0200
@@ -452,7 +482,8 @@
 38maggu2810-overlay
         mate-de-gentooall good!2020-09-24 15:34:40 +0200
 265mate-de-gentoo
-        matrixsync failed for repositorymatrix
+        matrixall good!2020-10-15 18:52:27 +0300
+18matrix
         megacoffeeall good!2020-08-08 14:26:11 +0200
 41megacoffee
         menelkirall good!2020-10-14 09:42:36 -0300
@@ -484,9 +515,10 @@
 9mschiff
         multilib-portageall good!2020-08-23 14:27:50 +0200
 35multilib-portage
-        muslsync failed for repositorymusl
-        musl-clanginvalid repository metadata2018-03-01 16:56:29 -0500
-musl-clang
+        muslall good!2020-10-09 20:01:52 -0500
+187musl
+        musl-clangall good!2018-03-01 16:56:29 -0500
+1musl-clang
         mvall good!2020-10-17 18:03:14 +0200
 162mv
         mvacache regen failed2020-10-17 13:21:04 +0700
@@ -501,7 +533,8 @@
 913nest
         nextoocache regen failed2017-02-20 15:50:13 -0800
 21nextoo
-        nicosync failed for repositorynico
+        nicoall good!2020-02-25 19:06:03 +0100
+0nico
         nix-guixall good!2020-07-08 21:39:25 +0100
 9nix-guix
         np-hardass-overlayall good!2020-02-03 17:47:49 -0500
@@ -536,7 +569,7 @@
 26panther
         pdilungall good!2016-09-25 19:28:59 +0200
 1pdilung
-        pentooall good!2020-10-22 12:41:30 -0400
+        pentooall good!2020-10-23 12:18:41 -0400
 1249pentoo
         perl-experimentalall good!2020-08-26 10:49:03 +1200
 761perl-experimental
@@ -556,7 +589,8 @@
 2pica-pica
         picarica-overlayall good!2020-03-21 15:52:44 +0100
 14picarica-overlay
-        pigfootsync failed for repositorypigfoot
+        pigfootcache regen failed2020-06-03 17:44:22 +0800
+68pigfoot
         piniverlayall good!2020-09-30 20:06:18 +0200
 2piniverlay
         pinkbyteall good!2020-07-13 12:49:15 +0300
@@ -565,8 +599,8 @@
 19pixlra
         pkalinall good!2020-09-24 01:20:19 +0200
 97pkalin
-        plex-overlayall good!2020-10-14 17:44:57 +0200
-12plex-overlay
+        plex-overlayall good!2020-10-23 19:21:42 +0200
+13plex-overlay
         poly-call good!2020-09-20 19:47:04.000000000 +0000
 294poly-c
         posativcache regen failed2017-12-14 22:17:44 +0100
@@ -579,7 +613,8 @@
 10pross
         pyfaall good!2020-10-13 22:55:07 +0200
 6pyfa
-        pythonsync failed for repositorypython
+        pythonall good!2019-12-29 12:56:32 +0100
+2python
         qemu-initall good!2016-03-23 10:53:56 -0700
 1qemu-init
         qgpall good!2020-08-11 19:51:33 +0200
@@ -608,7 +643,8 @@
 94rdnetto-overlay
         reagentooall good!2020-10-07 19:00:25 +0300
 80reagentoo
-        rebutiasync failed for repositoryrebutia
+        rebutiaall good!2020-08-15 22:02:08 +0200
+28rebutia
         regina-gentooall good!2020-01-19 11:59:50 +0000
 3regina-gentoo
         ricerlayall good!2020-10-10 13:24:39 +0300
@@ -647,13 +683,16 @@
 8sam_c
         sarnex-overlayall good!2017-10-01 00:04:35 -0400
 5sarnex-overlay
-        sattviksync failed for repositorysattvik
-        sciencesync failed for repositoryscience
+        sattvikall good!2020-10-16 11:15:26 -0500
+37sattvik
+        scienceall good!2020-10-22 13:04:16 +0000
+845science
         scrillall good!2020-06-26 15:18:11 +0300
 25scrill
         seadepall good!2017-11-25 19:15:52 +0100
 6seadep
-        sedensync failed for repositoryseden
+        sedenall good!2020-10-20 13:53:17 +0200
+41seden
         seedscache regen failed2019-03-23 08:55:45 +0300
 25seeds
         setkehall good!2020-05-19 14:57:04 +1000
@@ -664,7 +703,7 @@
 30sft
         sgsall good!2020-10-07 10:10:58 +0200
 5sgs
-        shnurisecache regen failed2020-10-23 16:35:29 +0300
+        shnurisecache regen failed2020-10-23 18:33:19 +0300
 39shnurise
         sihnonall good!2020-09-21 21:47:58 +0100
 10sihnon
@@ -694,9 +733,10 @@
 34spikyatlinux
         spingall good!2017-03-18 17:47:33 +0100
 3sping
-        squeezeboxsync failed for repositorysqueezebox
-        src_prepare-overlayall good!2020-10-23 16:21:29 +0200
-186src_prepare-overlay
+        squeezeboxall good!2020-01-08 18:40:26 +0000
+16squeezebox
+        src_prepare-overlaycache regen failed2020-10-23 16:40:04 +0200
+185src_prepare-overlay
         ssnball good!2020-10-18 21:07:18 +0100
 365ssnb
         sspreitzall good!2020-09-24 10:35:30 +0200
@@ -721,12 +761,13 @@
 33swegener
         tabinolall good!2019-02-25 22:30:56 -0500
 6tabinol
-        tamikosync failed for repositorytamiko
+        tamikoall good!2020-05-18 02:59:08 -0500
+9tamiko
         tanteall good!2017-02-26 14:13:35 +0100
 5tante
         tarantoolall good!2020-09-14 10:50:49 +0300
 49tarantool
-        tastyteaall good!2020-10-23 16:29:15 +0200
+        tastyteaall good!2020-10-23 19:23:23 +0200
 50tastytea
         telansall good!2020-10-23 22:16:00 +1300
 28telans
@@ -744,7 +785,8 @@
 30timboudreau
         tmacedoall good!2020-08-23 16:37:57 +0100
 24tmacedo
-        tocarosync failed for repositorytocaro
+        tocaroall good!2015-03-28 19:02:11 +0100
+7tocaro
         toniz4-overlayall good!2020-10-19 22:10:29 -0300
 4(none)
         toolchainall good!2020-02-22 09:39:04 +0000
@@ -753,7 +795,8 @@
 7torbrowser
         tranquilityall good!2016-10-13 10:48:40 +0200
 5tranquility
-        triquetrasync failed for repositorytriquetra
+        triquetracache regen failed2016-01-30 16:36:07 -0600
+4triquetra
         trolltooall good!2020-08-25 09:05:29 -0600
 34trolltoo
         trytonall good!2020-10-18 21:44:56 +0200612tryton
@@ -761,8 +804,10 @@
 2twister
         twitch153cache regen failed2016-12-27 15:19:28 -0500
 3twitch153
-        ulmsync failed for repositoryulm
-        ultrabugsync failed for repositoryultrabug
+        ulmall good!2019-04-03 19:22:11 +0200
+9ulm
+        ultrabugall good!2020-10-13 16:49:30 +0200
+41ultrabug
         unity-gentooall good!2020-10-22 02:42:09 +0200
 162unity-gentoo
         usenet-overlayall good!2020-07-06 21:14:05 -0500
@@ -781,7 +826,8 @@
 51vifino-overlay
         vklimovsall good!2020-10-18 22:02:49 -0700
 20vklimovs
-        vmacssync failed for repositoryvmacs
+        vmacsall good!2020-08-01 15:59:07 -0600
+6vmacs
         vortexall good!2020-06-24 19:41:04 +0400
 75vortex
         vowstarall good!2020-10-20 15:00:56 +0800
@@ -794,7 +840,8 @@
 17wayland-desktop
         wbranaall good!2015-06-28 16:56:01 +0200
 2wbrana
-        wdzierzansync failed for repositorywdzierzan
+        wdzierzanall good!2017-02-28 21:28:13 +0100
+4wdzierzan
         webosall good!2020-02-11 02:21:46 +0200
 49webos
         weuxelall good!2018-12-18 10:17:01 +0100
@@ -852,7 +899,7 @@
 
         
 
-        
Generated based on results from 2020-10-23 15:07:14 UTC

+        
Generated based on results from 2020-10-23 17:35:43 UTC

     
 
         
\ No newline at end of file
diff --git a/interactive-fiction.html b/interactive-fiction.html
index 0900142fe2b9..1602148440f3 100644
--- a/interactive-fiction.html
+++ b/interactive-fiction.html
@@ -30,99 +30,59 @@
 

             10
$ pmaint sync interactive-fiction
 

-            11
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            11
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            12
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
warning: Pulling without specifying how to reconcile divergent branches is
 

-            18
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
discouraged. You can squelch this message by running one of the following
 

-            19
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
commands sometime before your next pull:
 

-            20
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
 

-            21
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
  git config pull.rebase false  # merge (the default strategy)
 

-            22
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase true   # rebase
 

-            23
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.ff only       # fast-forward only
 

-            24
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 

-            25
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
You can replace "git config" with "git config --global" to set a default
 

-            26
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            27
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
or --ff-only on the command line to override the configured default per
 

-            28
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
invocation.
 

-            29
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
 

-            30
WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
Already up to date.
 

-            31
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
*** syncing interactive-fiction
 

-            32
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
*** synced interactive-fiction
 

-            33
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
 * Sync succeeded
 

-            34
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
$ git log --format=%ci -1
 

-            35
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
$ git show -q --pretty=format:%G? HEAD
 

-            36
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 interactive-fiction
 

-            37
warning: Pulling without specifying how to reconcile divergent branches is
-

-            38
discouraged. You can squelch this message by running one of the following
-

-            39
commands sometime before your next pull:
-

-            40
-

-            41
  git config pull.rebase false  # merge (the default strategy)
-

-            42
  git config pull.rebase true   # rebase
-

-            43
  git config pull.ff only       # fast-forward only
-

-            44
-

-            45
You can replace "git config" with "git config --global" to set a default
-

-            46
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            47
or --ff-only on the command line to override the configured default per
-

-            48
invocation.
-

-            49
-

-            50
Already up to date.
-

-            51
*** syncing interactive-fiction
-

-            52
*** synced interactive-fiction
-

-            53
 * Sync succeeded
-

-            54
$ git log --format=%ci -1
-

-            55
$ git show -q --pretty=format:%G? HEAD
-

-            56
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 interactive-fiction
-

-            57
 * Cache regenerated successfully
+            37
 * Cache regenerated successfully
 

 
         
diff --git a/interactive-fiction.txt b/interactive-fiction.txt
index 55209b96ef62..e5ac0dcc7f03 100644
--- a/interactive-fiction.txt
+++ b/interactive-fiction.txt
@@ -8,32 +8,12 @@
              'uri': 'git://repo.or.cz/gentoo-interactive-fiction.git'}],
  'status': 'unofficial'}
 $ pmaint sync interactive-fiction
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/ixit.html b/ixit.html
index 4cab0eb9423d..5aab2eb6de2c 100644
--- a/ixit.html
+++ b/ixit.html
@@ -36,99 +36,59 @@
 

             13
$ pmaint sync ixit
 

-            14
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
warning: Pulling without specifying how to reconcile divergent branches is
 

-            21
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
discouraged. You can squelch this message by running one of the following
 

-            22
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
commands sometime before your next pull:
 

-            23
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
 

-            24
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.rebase false  # merge (the default strategy)
 

-            25
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase true   # rebase
 

-            26
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.ff only       # fast-forward only
 

-            27
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
 

-            28
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
You can replace "git config" with "git config --global" to set a default
 

-            29
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            30
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
or --ff-only on the command line to override the configured default per
 

-            31
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
invocation.
 

-            32
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
 

-            33
WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
Already up to date.
 

-            34
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
*** syncing ixit
 

-            35
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
*** synced ixit
 

-            36
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
 * Sync succeeded
 

-            37
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            37
$ git log --format=%ci -1
 

-            38
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            38
$ git show -q --pretty=format:%G? HEAD
 

-            39
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            39
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 ixit
 

-            40
warning: Pulling without specifying how to reconcile divergent branches is
-

-            41
discouraged. You can squelch this message by running one of the following
-

-            42
commands sometime before your next pull:
-

-            43
-

-            44
  git config pull.rebase false  # merge (the default strategy)
-

-            45
  git config pull.rebase true   # rebase
-

-            46
  git config pull.ff only       # fast-forward only
-

-            47
-

-            48
You can replace "git config" with "git config --global" to set a default
-

-            49
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            50
or --ff-only on the command line to override the configured default per
-

-            51
invocation.
-

-            52
-

-            53
Already up to date.
-

-            54
*** syncing ixit
-

-            55
*** synced ixit
-

-            56
 * Sync succeeded
-

-            57
$ git log --format=%ci -1
-

-            58
$ git show -q --pretty=format:%G? HEAD
-

-            59
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 ixit
-

-            60
 * Cache regenerated successfully
+            40
 * Cache regenerated successfully
 

 
         
diff --git a/ixit.txt b/ixit.txt
index 3d5e55f9e4f1..dc83da4d16ec 100644
--- a/ixit.txt
+++ b/ixit.txt
@@ -11,32 +11,12 @@
             {'type': 'git', 'uri': 'git@github.com:okias/ixit.git'}],
  'status': 'unofficial'}
 $ pmaint sync ixit
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/jacendi-overlay.html b/jacendi-overlay.html
index f56962e3dbdc..44ac1dbfcbaa 100644
--- a/jacendi-overlay.html
+++ b/jacendi-overlay.html
@@ -34,99 +34,59 @@
 

             12
$ pmaint sync jacendi-overlay
 

-            13
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
warning: Pulling without specifying how to reconcile divergent branches is
 

-            20
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
discouraged. You can squelch this message by running one of the following
 

-            21
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
commands sometime before your next pull:
 

-            22
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
 

-            23
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase false  # merge (the default strategy)
 

-            24
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.rebase true   # rebase
 

-            25
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.ff only       # fast-forward only
 

-            26
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
 

-            27
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
You can replace "git config" with "git config --global" to set a default
 

-            28
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            29
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
or --ff-only on the command line to override the configured default per
 

-            30
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
invocation.
 

-            31
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
 

-            32
WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
Already up to date.
 

-            33
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
*** syncing jacendi-overlay
 

-            34
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
*** synced jacendi-overlay
 

-            35
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
 * Sync succeeded
 

-            36
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
$ git log --format=%ci -1
 

-            37
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            37
$ git show -q --pretty=format:%G? HEAD
 

-            38
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            38
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 jacendi-overlay
 

-            39
warning: Pulling without specifying how to reconcile divergent branches is
-

-            40
discouraged. You can squelch this message by running one of the following
-

-            41
commands sometime before your next pull:
-

-            42
-

-            43
  git config pull.rebase false  # merge (the default strategy)
-

-            44
  git config pull.rebase true   # rebase
-

-            45
  git config pull.ff only       # fast-forward only
-

-            46
-

-            47
You can replace "git config" with "git config --global" to set a default
-

-            48
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            49
or --ff-only on the command line to override the configured default per
-

-            50
invocation.
-

-            51
-

-            52
Already up to date.
-

-            53
*** syncing jacendi-overlay
-

-            54
*** synced jacendi-overlay
-

-            55
 * Sync succeeded
-

-            56
$ git log --format=%ci -1
-

-            57
$ git show -q --pretty=format:%G? HEAD
-

-            58
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 jacendi-overlay
-

-            59
 * Cache regenerated successfully
+            39
 * Cache regenerated successfully
 

 
         
diff --git a/jacendi-overlay.txt b/jacendi-overlay.txt
index d8a4d4f7a222..5bca0333b2a2 100644
--- a/jacendi-overlay.txt
+++ b/jacendi-overlay.txt
@@ -10,32 +10,12 @@
              'uri': 'https://bitbucket.org/jacendi/jacendi-overlay'}],
  'status': 'unofficial'}
 $ pmaint sync jacendi-overlay
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/jamesbroadhead.html b/jamesbroadhead.html
index e8d785978bd3..022fef763f2c 100644
--- a/jamesbroadhead.html
+++ b/jamesbroadhead.html
@@ -46,116 +46,48 @@
 

             18
$ pmaint sync jamesbroadhead
 

-            19
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            23
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            24
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            25
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            26
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            27
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            28
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            29
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            30
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            31
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            32
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
Cloning into '/var/lib/repo-mirror-ci/sync/jamesbroadhead'...
 

-            33
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
*** syncing jamesbroadhead
 

-            34
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
*** synced jamesbroadhead
 

-            35
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
 * Sync succeeded
 

-            36
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
$ git log --format=%ci -1
 

-            37
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            37
$ git show -q --pretty=format:%G? HEAD
 

-            38
WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            38
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 jamesbroadhead
 

-            39
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            39
 * Cache regenerated successfully
 

-            40
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            41
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            42
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            43
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            44
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            45
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            46
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            47
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            48
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            49
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            50
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            51
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            52
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            53
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            54
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            55
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            56
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            57
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            58
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            59
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            60
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            61
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            62
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            63
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            64
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            65
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            66
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            67
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            68
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            69
Cloning into '/var/lib/repo-mirror-ci/sync/jamesbroadhead'...
-

-            70
fatal: unable to access 'https://anongit.gentoo.org/git/user/jamesbroadhead.git/': The requested URL returned error: 504
-

-            71
*** syncing jamesbroadhead
-

-            72
!!! failed syncing jamesbroadhead
-

-            73
 * Sync failed with 1
-
[FATAL]
 
         
     
diff --git a/jamesbroadhead.txt b/jamesbroadhead.txt
index d7034fbf7fc2..a02019238f43 100644
--- a/jamesbroadhead.txt
+++ b/jamesbroadhead.txt
@@ -16,58 +16,24 @@
  'status': 'unofficial'}
  * Adding new repository
 $ pmaint sync jamesbroadhead
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 Cloning into '/var/lib/repo-mirror-ci/sync/jamesbroadhead'...
-fatal: unable to access 'https://anongit.gentoo.org/git/user/jamesbroadhead.git/': The requested URL returned error: 504
 *** syncing jamesbroadhead
-!!! failed syncing jamesbroadhead
- * Sync failed with 1
+*** synced jamesbroadhead
+ * Sync succeeded
+$ git log --format=%ci -1
+$ git show -q --pretty=format:%G? HEAD
+$ pmaint regen --use-local-desc --pkg-desc-index -t 1 jamesbroadhead
+ * Cache regenerated successfully
diff --git a/java.html b/java.html
index da5824de4437..4a047a450ec5 100644
--- a/java.html
+++ b/java.html
@@ -42,118 +42,48 @@
 

             16
$ pmaint sync java
 

-            17
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            23
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            24
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            25
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            26
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            27
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            28
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            29
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            30
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
Cloning into '/var/lib/repo-mirror-ci/sync/java'...
 

-            31
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
*** syncing java
 

-            32
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
*** synced java
 

-            33
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
 * Sync succeeded
 

-            34
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
$ git log --format=%ci -1
 

-            35
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
$ git show -q --pretty=format:%G? HEAD
 

-            36
WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 java
 

-            37
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            37
 * Cache regenerated successfully
 

-            38
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            39
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            40
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            41
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            42
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            43
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            44
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            45
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            46
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            47
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            48
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            49
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            50
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            51
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            52
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            53
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            54
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            55
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            56
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            57
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            58
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            59
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            60
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            61
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            62
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            63
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            64
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            65
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            66
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            67
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            68
Cloning into '/var/lib/repo-mirror-ci/sync/java'...
-

-            69
fatal: unable to access 'https://anongit.gentoo.org/git/proj/java.git/': The requested URL returned error: 504
-

-            70
*** syncing java
-

-            71
!!! failed syncing java
-

-            72
 * Sync failed with 1
-
[FATAL]
 
         
     
diff --git a/java.txt b/java.txt
index c20948fd1b41..a323b6bd96b7 100644
--- a/java.txt
+++ b/java.txt
@@ -14,59 +14,24 @@
  'status': 'official'}
  * Adding new repository
 $ pmaint sync java
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 Cloning into '/var/lib/repo-mirror-ci/sync/java'...
-fatal: unable to access 'https://anongit.gentoo.org/git/proj/java.git/': The requested URL returned error: 504
 *** syncing java
-!!! failed syncing java
- * Sync failed with 1
+*** synced java
+ * Sync succeeded
+$ git log --format=%ci -1
+$ git show -q --pretty=format:%G? HEAD
+$ pmaint regen --use-local-desc --pkg-desc-index -t 1 java
+ * Cache regenerated successfully
diff --git a/jboro-overlay.html b/jboro-overlay.html
index 44827ed6bc25..4966391eb8d8 100644
--- a/jboro-overlay.html
+++ b/jboro-overlay.html
@@ -30,101 +30,61 @@
 

             10
$ pmaint sync jboro-overlay
 

-            11
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            11
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            12
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
warning: Pulling without specifying how to reconcile divergent branches is
 

-            19
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
discouraged. You can squelch this message by running one of the following
 

-            20
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
commands sometime before your next pull:
 

-            21
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
 

-            22
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase false  # merge (the default strategy)
 

-            23
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase true   # rebase
 

-            24
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.ff only       # fast-forward only
 

-            25
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 

-            26
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
You can replace "git config" with "git config --global" to set a default
 

-            27
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            28
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
or --ff-only on the command line to override the configured default per
 

-            29
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
invocation.
 

-            30
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
 

-            31
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
Already up to date.
 

-            32
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
*** syncing jboro-overlay
 

-            33
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
*** synced jboro-overlay
 

-            34
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
 * Sync succeeded
 

-            35
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
$ git log --format=%ci -1
 

-            36
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
$ git show -q --pretty=format:%G? HEAD
 

-            37
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            37
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 jboro-overlay
 

-            38
warning: Pulling without specifying how to reconcile divergent branches is
-

-            39
discouraged. You can squelch this message by running one of the following
-

-            40
commands sometime before your next pull:
-

-            41
-

-            42
  git config pull.rebase false  # merge (the default strategy)
-

-            43
  git config pull.rebase true   # rebase
-

-            44
  git config pull.ff only       # fast-forward only
-

-            45
-

-            46
You can replace "git config" with "git config --global" to set a default
-

-            47
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            48
or --ff-only on the command line to override the configured default per
-

-            49
invocation.
-

-            50
-

-            51
Already up to date.
-

-            52
*** syncing jboro-overlay
-

-            53
*** synced jboro-overlay
-

-            54
 * Sync succeeded
-

-            55
$ git log --format=%ci -1
-

-            56
$ git show -q --pretty=format:%G? HEAD
-

-            57
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 jboro-overlay
-

-            58
 * Cache regenerated successfully
+            38
 * Cache regenerated successfully
 

 
         
diff --git a/jboro-overlay.txt b/jboro-overlay.txt
index cd1cb8d7dee8..8718eb2c72af 100644
--- a/jboro-overlay.txt
+++ b/jboro-overlay.txt
@@ -8,22 +8,6 @@
  'source': [{'type': 'git', 'uri': 'https://github.com/JBoro/portage.git'}],
  'status': 'unofficial'}
 $ pmaint sync jboro-overlay
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
@@ -31,10 +15,6 @@ WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't
 WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/jkolo.html b/jkolo.html
index 682ca2f86210..f9ef5ce44688 100644
--- a/jkolo.html
+++ b/jkolo.html
@@ -32,101 +32,61 @@
 

             11
$ pmaint sync jkolo
 

-            12
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
warning: Pulling without specifying how to reconcile divergent branches is
 

-            20
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
discouraged. You can squelch this message by running one of the following
 

-            21
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
commands sometime before your next pull:
 

-            22
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
 

-            23
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase false  # merge (the default strategy)
 

-            24
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.rebase true   # rebase
 

-            25
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.ff only       # fast-forward only
 

-            26
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
 

-            27
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
You can replace "git config" with "git config --global" to set a default
 

-            28
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            29
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
or --ff-only on the command line to override the configured default per
 

-            30
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
invocation.
 

-            31
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
 

-            32
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
Already up to date.
 

-            33
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
*** syncing jkolo
 

-            34
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
*** synced jkolo
 

-            35
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
 * Sync succeeded
 

-            36
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
$ git log --format=%ci -1
 

-            37
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            37
$ git show -q --pretty=format:%G? HEAD
 

-            38
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            38
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 jkolo
 

-            39
warning: Pulling without specifying how to reconcile divergent branches is
-

-            40
discouraged. You can squelch this message by running one of the following
-

-            41
commands sometime before your next pull:
-

-            42
-

-            43
  git config pull.rebase false  # merge (the default strategy)
-

-            44
  git config pull.rebase true   # rebase
-

-            45
  git config pull.ff only       # fast-forward only
-

-            46
-

-            47
You can replace "git config" with "git config --global" to set a default
-

-            48
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            49
or --ff-only on the command line to override the configured default per
-

-            50
invocation.
-

-            51
-

-            52
Already up to date.
-

-            53
*** syncing jkolo
-

-            54
*** synced jkolo
-

-            55
 * Sync succeeded
-

-            56
$ git log --format=%ci -1
-

-            57
$ git show -q --pretty=format:%G? HEAD
-

-            58
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 jkolo
-

-            59
 * Cache regenerated successfully
+            39
 * Cache regenerated successfully
 

 
         
diff --git a/jkolo.txt b/jkolo.txt
index 813b9c60fccc..aa7df074f64f 100644
--- a/jkolo.txt
+++ b/jkolo.txt
@@ -9,22 +9,6 @@
              'uri': 'https://git.kolosowscy.pl/jurek/gentoo-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync jkolo
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
@@ -32,10 +16,6 @@ WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't
 WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/jm-overlay.html b/jm-overlay.html
index 6c9d89664ca6..f3270c6b4925 100644
--- a/jm-overlay.html
+++ b/jm-overlay.html
@@ -32,101 +32,59 @@
 

             11
$ pmaint sync jm-overlay
 

-            12
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
warning: Pulling without specifying how to reconcile divergent branches is
 

-            19
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
discouraged. You can squelch this message by running one of the following
 

-            20
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
commands sometime before your next pull:
 

-            21
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
 

-            22
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase false  # merge (the default strategy)
 

-            23
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase true   # rebase
 

-            24
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.ff only       # fast-forward only
 

-            25
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 

-            26
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
You can replace "git config" with "git config --global" to set a default
 

-            27
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            28
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
or --ff-only on the command line to override the configured default per
 

-            29
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
invocation.
 

-            30
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
 

-            31
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
Already up to date.
 

-            32
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
*** syncing jm-overlay
 

-            33
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
*** synced jm-overlay
 

-            34
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
 * Sync succeeded
 

-            35
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
$ git log --format=%ci -1
 

-            36
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
$ git show -q --pretty=format:%G? HEAD
 

-            37
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            37
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 jm-overlay
 

-            38
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            39
warning: Pulling without specifying how to reconcile divergent branches is
-

-            40
discouraged. You can squelch this message by running one of the following
-

-            41
commands sometime before your next pull:
-

-            42
-

-            43
  git config pull.rebase false  # merge (the default strategy)
-

-            44
  git config pull.rebase true   # rebase
-

-            45
  git config pull.ff only       # fast-forward only
-

-            46
-

-            47
You can replace "git config" with "git config --global" to set a default
-

-            48
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            49
or --ff-only on the command line to override the configured default per
-

-            50
invocation.
-

-            51
-

-            52
Already up to date.
-

-            53
*** syncing jm-overlay
-

-            54
*** synced jm-overlay
-

-            55
 * Sync succeeded
-

-            56
$ git log --format=%ci -1
-

-            57
$ git show -q --pretty=format:%G? HEAD
-

-            58
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 jm-overlay
-

-            59
 * Cache regenerated successfully
+            38
 * Cache regenerated successfully
 

 
         
diff --git a/jm-overlay.txt b/jm-overlay.txt
index 44e578bdaa17..91b04b7a0775 100644
--- a/jm-overlay.txt
+++ b/jm-overlay.txt
@@ -9,33 +9,12 @@
              'uri': 'https://github.com/Jannis234/jm-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync jm-overlay
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/jmbsvicetto.html b/jmbsvicetto.html
index 2a377b00d7b5..29114475592e 100644
--- a/jmbsvicetto.html
+++ b/jmbsvicetto.html
@@ -40,131 +40,61 @@
 

             15
 'status': 'official'}
 

-            16
 * Adding new repository
+            16
$ pmaint sync jmbsvicetto
 

-            17
$ pmaint sync jmbsvicetto
+            17
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            23
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
warning: Pulling without specifying how to reconcile divergent branches is
 

-            24
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
discouraged. You can squelch this message by running one of the following
 

-            25
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
commands sometime before your next pull:
 

-            26
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
 

-            27
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.rebase false  # merge (the default strategy)
 

-            28
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
  git config pull.rebase true   # rebase
 

-            29
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
  git config pull.ff only       # fast-forward only
 

-            30
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
 

-            31
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
You can replace "git config" with "git config --global" to set a default
 

-            32
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            33
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
or --ff-only on the command line to override the configured default per
 

-            34
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
invocation.
 

-            35
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
 

-            36
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
Already up to date.
 

-            37
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            37
*** syncing jmbsvicetto
 

-            38
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            38
*** synced jmbsvicetto
 

-            39
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            39
 * Sync succeeded
 

-            40
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            40
$ git log --format=%ci -1
 

-            41
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            41
$ git show -q --pretty=format:%G? HEAD
 

-            42
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            42
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 jmbsvicetto
 

-            43
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            44
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            45
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            46
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            47
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            48
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            49
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            50
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            51
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            52
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            53
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            54
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            55
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            56
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            57
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            58
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            59
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            60
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            61
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            62
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            63
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            64
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            65
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            66
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            67
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            68
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            69
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            70
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            71
Cloning into '/var/lib/repo-mirror-ci/sync/jmbsvicetto'...
-

-            72
*** syncing jmbsvicetto
-

-            73
*** synced jmbsvicetto
-

-            74
 * Sync succeeded
-

-            75
$ git log --format=%ci -1
-

-            76
$ git show -q --pretty=format:%G? HEAD
-

-            77
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 jmbsvicetto
-

-            78
 * Cache regenerated successfully
+            43
 * Cache regenerated successfully
 

 
         
diff --git a/jmbsvicetto.txt b/jmbsvicetto.txt
index b48ec8ce4947..ba431c424d2d 100644
--- a/jmbsvicetto.txt
+++ b/jmbsvicetto.txt
@@ -13,62 +13,27 @@
             {'type': 'git',
              'uri': 'git+ssh://git@git.gentoo.org/dev/jmbsvicetto.git'}],
  'status': 'official'}
- * Adding new repository
 $ pmaint sync jmbsvicetto
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-Cloning into '/var/lib/repo-mirror-ci/sync/jmbsvicetto'...
+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.
+
+Already up to date.
 *** syncing jmbsvicetto
 *** synced jmbsvicetto
  * Sync succeeded
diff --git a/jmesmon.html b/jmesmon.html
index 280f34664ccc..07f188623eeb 100644
--- a/jmesmon.html
+++ b/jmesmon.html
@@ -32,115 +32,73 @@
 

             11
$ pmaint sync jmesmon
 

-            12
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
warning: Pulling without specifying how to reconcile divergent branches is
 

-            19
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
discouraged. You can squelch this message by running one of the following
 

-            20
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
commands sometime before your next pull:
 

-            21
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
 

-            22
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase false  # merge (the default strategy)
 

-            23
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase true   # rebase
 

-            24
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.ff only       # fast-forward only
 

-            25
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 

-            26
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
You can replace "git config" with "git config --global" to set a default
 

-            27
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            28
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
or --ff-only on the command line to override the configured default per
 

-            29
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
invocation.
 

-            30
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
 

-            31
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
Already up to date.
 

-            32
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
*** syncing jmesmon
 

-            33
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
*** synced jmesmon
 

-            34
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
 * Sync succeeded
 

-            35
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
$ git log --format=%ci -1
 

-            36
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
$ git show -q --pretty=format:%G? HEAD
 

-            37
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            37
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 jmesmon
 

-            38
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            39
warning: Pulling without specifying how to reconcile divergent branches is
-

-            40
discouraged. You can squelch this message by running one of the following
-

-            41
commands sometime before your next pull:
-

-            42
-

-            43
  git config pull.rebase false  # merge (the default strategy)
-

-            44
  git config pull.rebase true   # rebase
-

-            45
  git config pull.ff only       # fast-forward only
-

-            46
-

-            47
You can replace "git config" with "git config --global" to set a default
-

-            48
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            49
or --ff-only on the command line to override the configured default per
-

-            50
invocation.
-

-            51
-

-            52
Already up to date.
-

-            53
*** syncing jmesmon
-

-            54
*** synced jmesmon
-

-            55
 * Sync succeeded
-

-            56
$ git log --format=%ci -1
-

-            57
$ git show -q --pretty=format:%G? HEAD
-

-            58
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 jmesmon
-

-            59
 * app-backup/rsnapshot-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            38
 * app-backup/rsnapshot-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            60
 * app-crypt/seccure-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            39
 * app-crypt/seccure-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            61
 * app-crypt/ssss-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            40
 * app-crypt/ssss-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            62
 * app-crypt/transcrypt-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            41
 * app-crypt/transcrypt-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            63
 * dev-embedded/lm4tools-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            42
 * dev-embedded/lm4tools-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            64
 * dev-vcs/git-crypt-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            43
 * dev-vcs/git-crypt-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            65
 * sys-apps/makedumpfile-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            44
 * sys-apps/makedumpfile-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            66
 * Cache regen failed with 1
+            45
 * Cache regen failed with 1
 

 
         
diff --git a/jmesmon.txt b/jmesmon.txt
index e543f2156019..ff91a1798525 100644
--- a/jmesmon.txt
+++ b/jmesmon.txt
@@ -9,33 +9,12 @@
  'source': [{'type': 'git', 'uri': 'git://github.com/jmesmon/overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync jmesmon
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/johnmh.html b/johnmh.html
index 8e2d0ed4a751..ea30030a2061 100644
--- a/johnmh.html
+++ b/johnmh.html
@@ -40,103 +40,59 @@
 

             15
$ pmaint sync johnmh
 

-            16
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
warning: Pulling without specifying how to reconcile divergent branches is
 

-            23
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
discouraged. You can squelch this message by running one of the following
 

-            24
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
commands sometime before your next pull:
 

-            25
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 

-            26
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.rebase false  # merge (the default strategy)
 

-            27
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.rebase true   # rebase
 

-            28
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
  git config pull.ff only       # fast-forward only
 

-            29
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
 

-            30
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
You can replace "git config" with "git config --global" to set a default
 

-            31
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            32
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
or --ff-only on the command line to override the configured default per
 

-            33
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
invocation.
 

-            34
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
 

-            35
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
Already up to date.
 

-            36
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
*** syncing johnmh
 

-            37
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            37
*** synced johnmh
 

-            38
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            38
 * Sync succeeded
 

-            39
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            39
$ git log --format=%ci -1
 

-            40
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            40
$ git show -q --pretty=format:%G? HEAD
 

-            41
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            41
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 johnmh
 

-            42
WARNING:pkgcore:jmbsvicetto repo at '/var/lib/repo-mirror-ci/sync/jmbsvicetto', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            43
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            44
warning: Pulling without specifying how to reconcile divergent branches is
-

-            45
discouraged. You can squelch this message by running one of the following
-

-            46
commands sometime before your next pull:
-

-            47
-

-            48
  git config pull.rebase false  # merge (the default strategy)
-

-            49
  git config pull.rebase true   # rebase
-

-            50
  git config pull.ff only       # fast-forward only
-

-            51
-

-            52
You can replace "git config" with "git config --global" to set a default
-

-            53
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            54
or --ff-only on the command line to override the configured default per
-

-            55
invocation.
-

-            56
-

-            57
Already up to date.
-

-            58
*** syncing johnmh
-

-            59
*** synced johnmh
-

-            60
 * Sync succeeded
-

-            61
$ git log --format=%ci -1
-

-            62
$ git show -q --pretty=format:%G? HEAD
-

-            63
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 johnmh
-

-            64
 * Cache regenerated successfully
+            42
 * Cache regenerated successfully
 

 
         
diff --git a/johnmh.txt b/johnmh.txt
index 40bc585d3c14..c587ded2005b 100644
--- a/johnmh.txt
+++ b/johnmh.txt
@@ -13,34 +13,12 @@
              'uri': 'git+ssh://git@git.gentoo.org/repo/user/johnmh.git'}],
  'status': 'unofficial'}
 $ pmaint sync johnmh
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jmbsvicetto repo at '/var/lib/repo-mirror-ci/sync/jmbsvicetto', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/johu.html b/johu.html
index 5a271c6a0ce9..6e3707fc81a3 100644
--- a/johu.html
+++ b/johu.html
@@ -38,135 +38,61 @@
 

             14
 'status': 'official'}
 

-            15
 * Adding new repository
+            15
$ pmaint sync johu
 

-            16
$ pmaint sync johu
+            16
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
warning: Pulling without specifying how to reconcile divergent branches is
 

-            23
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
discouraged. You can squelch this message by running one of the following
 

-            24
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
commands sometime before your next pull:
 

-            25
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 

-            26
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.rebase false  # merge (the default strategy)
 

-            27
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.rebase true   # rebase
 

-            28
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
  git config pull.ff only       # fast-forward only
 

-            29
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
 

-            30
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
You can replace "git config" with "git config --global" to set a default
 

-            31
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            32
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
or --ff-only on the command line to override the configured default per
 

-            33
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
invocation.
 

-            34
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
 

-            35
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
Already up to date.
 

-            36
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
*** syncing johu
 

-            37
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            37
*** synced johu
 

-            38
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            38
 * Sync succeeded
 

-            39
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            39
$ git log --format=%ci -1
 

-            40
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            40
$ git show -q --pretty=format:%G? HEAD
 

-            41
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            41
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 johu
 

-            42
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            43
WARNING:pkgcore:jmbsvicetto repo at '/var/lib/repo-mirror-ci/sync/jmbsvicetto', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            44
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            45
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            46
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            47
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            48
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            49
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            50
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            51
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            52
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            53
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            54
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            55
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            56
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            57
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            58
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            59
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            60
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            61
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            62
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            63
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            64
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            65
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            66
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            67
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            68
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            69
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            70
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            71
WARNING:pkgcore:jmbsvicetto repo at '/var/lib/repo-mirror-ci/sync/jmbsvicetto', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            72
Cloning into '/var/lib/repo-mirror-ci/sync/johu'...
-

-            73
*** syncing johu
-

-            74
*** synced johu
-

-            75
 * Sync succeeded
-

-            76
$ git log --format=%ci -1
-

-            77
$ git show -q --pretty=format:%G? HEAD
-

-            78
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 johu
-

-            79
 * Cache regenerated successfully
+            42
 * Cache regenerated successfully
 

 
         
diff --git a/johu.txt b/johu.txt
index 05e0d5b70524..288623c9b8d6 100644
--- a/johu.txt
+++ b/johu.txt
@@ -12,64 +12,27 @@
             {'type': 'git',
              'uri': 'git+ssh://git@git.gentoo.org/dev/johu.git'}],
  'status': 'official'}
- * Adding new repository
 $ pmaint sync johu
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jmbsvicetto repo at '/var/lib/repo-mirror-ci/sync/jmbsvicetto', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jmbsvicetto repo at '/var/lib/repo-mirror-ci/sync/jmbsvicetto', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-Cloning into '/var/lib/repo-mirror-ci/sync/johu'...
+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.
+
+Already up to date.
 *** syncing johu
 *** synced johu
  * Sync succeeded
diff --git a/jollheef-overlay.html b/jollheef-overlay.html
index fa7a46d4bddf..7727901bcb22 100644
--- a/jollheef-overlay.html
+++ b/jollheef-overlay.html
@@ -42,109 +42,65 @@
 

             16
$ pmaint sync jollheef-overlay
 

-            17
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            23
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
warning: Pulling without specifying how to reconcile divergent branches is
 

-            24
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
discouraged. You can squelch this message by running one of the following
 

-            25
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
commands sometime before your next pull:
 

-            26
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
 

-            27
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.rebase false  # merge (the default strategy)
 

-            28
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
  git config pull.rebase true   # rebase
 

-            29
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
  git config pull.ff only       # fast-forward only
 

-            30
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
 

-            31
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
You can replace "git config" with "git config --global" to set a default
 

-            32
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            33
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
or --ff-only on the command line to override the configured default per
 

-            34
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
invocation.
 

-            35
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
 

-            36
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
Already up to date.
 

-            37
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            37
*** syncing jollheef-overlay
 

-            38
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            38
*** synced jollheef-overlay
 

-            39
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            39
 * Sync succeeded
 

-            40
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            40
$ git log --format=%ci -1
 

-            41
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            41
$ git show -q --pretty=format:%G? HEAD
 

-            42
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            42
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 jollheef-overlay
 

-            43
WARNING:pkgcore:johu repo at '/var/lib/repo-mirror-ci/sync/johu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            44
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            45
warning: Pulling without specifying how to reconcile divergent branches is
-

-            46
discouraged. You can squelch this message by running one of the following
-

-            47
commands sometime before your next pull:
-

-            48
-

-            49
  git config pull.rebase false  # merge (the default strategy)
-

-            50
  git config pull.rebase true   # rebase
-

-            51
  git config pull.ff only       # fast-forward only
-

-            52
-

-            53
You can replace "git config" with "git config --global" to set a default
-

-            54
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            55
or --ff-only on the command line to override the configured default per
-

-            56
invocation.
-

-            57
-

-            58
Already up to date.
-

-            59
*** syncing jollheef-overlay
-

-            60
*** synced jollheef-overlay
-

-            61
 * Sync succeeded
-

-            62
$ git log --format=%ci -1
-

-            63
$ git show -q --pretty=format:%G? HEAD
-

-            64
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 jollheef-overlay
-

-            65
 * app-misc/battery-watcher-daemon-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            43
 * app-misc/battery-watcher-daemon-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            66
 * net-im/signal-cli-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            44
 * net-im/signal-cli-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            67
 * net-print/kyocera-filters-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            45
 * net-print/kyocera-filters-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            68
 * Cache regen failed with 1
+            46
 * Cache regen failed with 1
 

 
         
diff --git a/jollheef-overlay.txt b/jollheef-overlay.txt
index 4d5cef8c964c..93aab892e266 100644
--- a/jollheef-overlay.txt
+++ b/jollheef-overlay.txt
@@ -14,34 +14,12 @@
              'uri': 'git@github.com:jollheef/jollheef-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync jollheef-overlay
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:johu repo at '/var/lib/repo-mirror-ci/sync/johu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/jorgicio.html b/jorgicio.html
index 77ac5f2ff7af..f28842f5deff 100644
--- a/jorgicio.html
+++ b/jorgicio.html
@@ -42,103 +42,61 @@
 

             16
$ pmaint sync jorgicio
 

-            17
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            23
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            24
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
warning: Pulling without specifying how to reconcile divergent branches is
 

-            25
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
discouraged. You can squelch this message by running one of the following
 

-            26
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
commands sometime before your next pull:
 

-            27
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
 

-            28
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
  git config pull.rebase false  # merge (the default strategy)
 

-            29
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
  git config pull.rebase true   # rebase
 

-            30
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
  git config pull.ff only       # fast-forward only
 

-            31
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
 

-            32
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
You can replace "git config" with "git config --global" to set a default
 

-            33
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            34
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
or --ff-only on the command line to override the configured default per
 

-            35
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
invocation.
 

-            36
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
 

-            37
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            37
Already up to date.
 

-            38
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            38
*** syncing jorgicio
 

-            39
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            39
*** synced jorgicio
 

-            40
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            40
 * Sync succeeded
 

-            41
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            41
$ git log --format=%ci -1
 

-            42
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            42
$ git show -q --pretty=format:%G? HEAD
 

-            43
WARNING:pkgcore:johu repo at '/var/lib/repo-mirror-ci/sync/johu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            43
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 jorgicio
 

-            44
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            45
warning: Pulling without specifying how to reconcile divergent branches is
-

-            46
discouraged. You can squelch this message by running one of the following
-

-            47
commands sometime before your next pull:
-

-            48
-

-            49
  git config pull.rebase false  # merge (the default strategy)
-

-            50
  git config pull.rebase true   # rebase
-

-            51
  git config pull.ff only       # fast-forward only
-

-            52
-

-            53
You can replace "git config" with "git config --global" to set a default
-

-            54
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            55
or --ff-only on the command line to override the configured default per
-

-            56
invocation.
-

-            57
-

-            58
Already up to date.
-

-            59
*** syncing jorgicio
-

-            60
*** synced jorgicio
-

-            61
 * Sync succeeded
-

-            62
$ git log --format=%ci -1
-

-            63
$ git show -q --pretty=format:%G? HEAD
-

-            64
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 jorgicio
-

-            65
 * Cache regenerated successfully
+            44
 * Cache regenerated successfully
 

 
         
diff --git a/jorgicio.txt b/jorgicio.txt
index 64bd0dbcf352..f528770f1d9c 100644
--- a/jorgicio.txt
+++ b/jorgicio.txt
@@ -14,34 +14,13 @@
              'uri': 'git@github.com:jorgicio/jorgicio-gentoo.git'}],
  'status': 'unofficial'}
 $ pmaint sync jorgicio
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:johu repo at '/var/lib/repo-mirror-ci/sync/johu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/jsteward.html b/jsteward.html
index c2753b64f725..def5660ce172 100644
--- a/jsteward.html
+++ b/jsteward.html
@@ -38,101 +38,61 @@
 

             14
$ pmaint sync jsteward
 

-            15
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
warning: Pulling without specifying how to reconcile divergent branches is
 

-            23
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
discouraged. You can squelch this message by running one of the following
 

-            24
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
commands sometime before your next pull:
 

-            25
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 

-            26
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.rebase false  # merge (the default strategy)
 

-            27
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.rebase true   # rebase
 

-            28
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
  git config pull.ff only       # fast-forward only
 

-            29
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
 

-            30
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
You can replace "git config" with "git config --global" to set a default
 

-            31
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            32
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
or --ff-only on the command line to override the configured default per
 

-            33
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
invocation.
 

-            34
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
 

-            35
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
Already up to date.
 

-            36
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
*** syncing jsteward
 

-            37
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            37
*** synced jsteward
 

-            38
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            38
 * Sync succeeded
 

-            39
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            39
$ git log --format=%ci -1
 

-            40
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            40
$ git show -q --pretty=format:%G? HEAD
 

-            41
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            41
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 jsteward
 

-            42
warning: Pulling without specifying how to reconcile divergent branches is
-

-            43
discouraged. You can squelch this message by running one of the following
-

-            44
commands sometime before your next pull:
-

-            45
-

-            46
  git config pull.rebase false  # merge (the default strategy)
-

-            47
  git config pull.rebase true   # rebase
-

-            48
  git config pull.ff only       # fast-forward only
-

-            49
-

-            50
You can replace "git config" with "git config --global" to set a default
-

-            51
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            52
or --ff-only on the command line to override the configured default per
-

-            53
invocation.
-

-            54
-

-            55
Already up to date.
-

-            56
*** syncing jsteward
-

-            57
*** synced jsteward
-

-            58
 * Sync succeeded
-

-            59
$ git log --format=%ci -1
-

-            60
$ git show -q --pretty=format:%G? HEAD
-

-            61
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 jsteward
-

-            62
 * Cache regenerated successfully
+            42
 * Cache regenerated successfully
 

 
         
diff --git a/jsteward.txt b/jsteward.txt
index 456fff6f50a7..38606780f17c 100644
--- a/jsteward.txt
+++ b/jsteward.txt
@@ -12,33 +12,13 @@
             {'type': 'git', 'uri': 'git@github.com:KireinaHoro/jsteward.git'}],
  'status': 'unofficial'}
 $ pmaint sync jsteward
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/junkdrawer.html b/junkdrawer.html
index d7def9dc715b..6ab42c94955f 100644
--- a/junkdrawer.html
+++ b/junkdrawer.html
@@ -34,101 +34,61 @@
 

             12
$ pmaint sync junkdrawer
 

-            13
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
warning: Pulling without specifying how to reconcile divergent branches is
 

-            21
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
discouraged. You can squelch this message by running one of the following
 

-            22
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
commands sometime before your next pull:
 

-            23
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
 

-            24
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.rebase false  # merge (the default strategy)
 

-            25
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase true   # rebase
 

-            26
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.ff only       # fast-forward only
 

-            27
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
 

-            28
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
You can replace "git config" with "git config --global" to set a default
 

-            29
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            30
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
or --ff-only on the command line to override the configured default per
 

-            31
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
invocation.
 

-            32
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
 

-            33
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
Already up to date.
 

-            34
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
*** syncing junkdrawer
 

-            35
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
*** synced junkdrawer
 

-            36
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
 * Sync succeeded
 

-            37
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            37
$ git log --format=%ci -1
 

-            38
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            38
$ git show -q --pretty=format:%G? HEAD
 

-            39
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            39
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 junkdrawer
 

-            40
warning: Pulling without specifying how to reconcile divergent branches is
-

-            41
discouraged. You can squelch this message by running one of the following
-

-            42
commands sometime before your next pull:
-

-            43
-

-            44
  git config pull.rebase false  # merge (the default strategy)
-

-            45
  git config pull.rebase true   # rebase
-

-            46
  git config pull.ff only       # fast-forward only
-

-            47
-

-            48
You can replace "git config" with "git config --global" to set a default
-

-            49
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            50
or --ff-only on the command line to override the configured default per
-

-            51
invocation.
-

-            52
-

-            53
Already up to date.
-

-            54
*** syncing junkdrawer
-

-            55
*** synced junkdrawer
-

-            56
 * Sync succeeded
-

-            57
$ git log --format=%ci -1
-

-            58
$ git show -q --pretty=format:%G? HEAD
-

-            59
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 junkdrawer
-

-            60
 * Cache regenerated successfully
+            40
 * Cache regenerated successfully
 

 
         
diff --git a/junkdrawer.txt b/junkdrawer.txt
index 098e5ede221a..1487bb427840 100644
--- a/junkdrawer.txt
+++ b/junkdrawer.txt
@@ -10,33 +10,13 @@
              'uri': 'https://github.com/doctaweeks/junkdrawer-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync junkdrawer
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/k_f.html b/k_f.html
index 481d55e09eff..41de071b9076 100644
--- a/k_f.html
+++ b/k_f.html
@@ -34,115 +34,75 @@
 

             12
$ pmaint sync k_f
 

-            13
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
warning: Pulling without specifying how to reconcile divergent branches is
 

-            21
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
discouraged. You can squelch this message by running one of the following
 

-            22
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
commands sometime before your next pull:
 

-            23
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
 

-            24
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.rebase false  # merge (the default strategy)
 

-            25
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase true   # rebase
 

-            26
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.ff only       # fast-forward only
 

-            27
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
 

-            28
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
You can replace "git config" with "git config --global" to set a default
 

-            29
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            30
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
or --ff-only on the command line to override the configured default per
 

-            31
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
invocation.
 

-            32
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
 

-            33
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
Already up to date.
 

-            34
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
*** syncing k_f
 

-            35
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
*** synced k_f
 

-            36
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
 * Sync succeeded
 

-            37
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            37
$ git log --format=%ci -1
 

-            38
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            38
$ git show -q --pretty=format:%G? HEAD
 

-            39
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            39
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 k_f
 

-            40
warning: Pulling without specifying how to reconcile divergent branches is
-

-            41
discouraged. You can squelch this message by running one of the following
-

-            42
commands sometime before your next pull:
-

-            43
-

-            44
  git config pull.rebase false  # merge (the default strategy)
-

-            45
  git config pull.rebase true   # rebase
-

-            46
  git config pull.ff only       # fast-forward only
-

-            47
-

-            48
You can replace "git config" with "git config --global" to set a default
-

-            49
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            50
or --ff-only on the command line to override the configured default per
-

-            51
invocation.
-

-            52
-

-            53
Already up to date.
-

-            54
*** syncing k_f
-

-            55
*** synced k_f
-

-            56
 * Sync succeeded
-

-            57
$ git log --format=%ci -1
-

-            58
$ git show -q --pretty=format:%G? HEAD
-

-            59
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 k_f
-

-            60
 * app-crypt/gnupg-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            40
 * app-crypt/gnupg-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            61
 * app-crypt/keyart-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            41
 * app-crypt/keyart-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            62
 * dev-libs/libgcrypt-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            42
 * dev-libs/libgcrypt-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            63
 * dev-libs/libgpg-error-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            43
 * dev-libs/libgpg-error-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            64
 * dev-libs/libksba-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            44
 * dev-libs/libksba-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            65
 * dev-libs/npth-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            45
 * dev-libs/npth-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            66
 * dev-python/pyGPG-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            46
 * dev-python/pyGPG-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            67
 * Cache regen failed with 1
+            47
 * Cache regen failed with 1
 

 
         
diff --git a/k_f.txt b/k_f.txt
index 76462e1e9f5d..03afd20ca137 100644
--- a/k_f.txt
+++ b/k_f.txt
@@ -10,33 +10,13 @@
              'uri': 'git://git.sumptuouscapital.com/portage-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync k_f
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/kaa.html b/kaa.html
index 7bb8985c519e..980ec88d117e 100644
--- a/kaa.html
+++ b/kaa.html
@@ -32,101 +32,61 @@
 

             11
$ pmaint sync kaa
 

-            12
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
warning: Pulling without specifying how to reconcile divergent branches is
 

-            20
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
discouraged. You can squelch this message by running one of the following
 

-            21
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
commands sometime before your next pull:
 

-            22
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
 

-            23
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase false  # merge (the default strategy)
 

-            24
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.rebase true   # rebase
 

-            25
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.ff only       # fast-forward only
 

-            26
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
 

-            27
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
You can replace "git config" with "git config --global" to set a default
 

-            28
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            29
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
or --ff-only on the command line to override the configured default per
 

-            30
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
invocation.
 

-            31
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
 

-            32
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
Already up to date.
 

-            33
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
*** syncing kaa
 

-            34
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
*** synced kaa
 

-            35
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
 * Sync succeeded
 

-            36
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
$ git log --format=%ci -1
 

-            37
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            37
$ git show -q --pretty=format:%G? HEAD
 

-            38
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            38
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 kaa
 

-            39
warning: Pulling without specifying how to reconcile divergent branches is
-

-            40
discouraged. You can squelch this message by running one of the following
-

-            41
commands sometime before your next pull:
-

-            42
-

-            43
  git config pull.rebase false  # merge (the default strategy)
-

-            44
  git config pull.rebase true   # rebase
-

-            45
  git config pull.ff only       # fast-forward only
-

-            46
-

-            47
You can replace "git config" with "git config --global" to set a default
-

-            48
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            49
or --ff-only on the command line to override the configured default per
-

-            50
invocation.
-

-            51
-

-            52
Already up to date.
-

-            53
*** syncing kaa
-

-            54
*** synced kaa
-

-            55
 * Sync succeeded
-

-            56
$ git log --format=%ci -1
-

-            57
$ git show -q --pretty=format:%G? HEAD
-

-            58
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 kaa
-

-            59
 * Cache regenerated successfully
+            39
 * Cache regenerated successfully
 

 
         
diff --git a/kaa.txt b/kaa.txt
index 26ebe0646218..190fe85b1684 100644
--- a/kaa.txt
+++ b/kaa.txt
@@ -9,33 +9,13 @@
              'uri': 'https://github.com/Oleh-Kravchenko/kaa-layman.git'}],
  'status': 'unofficial'}
 $ pmaint sync kaa
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/kde.html b/kde.html
index 2cc981272c0d..210d02c5187a 100644
--- a/kde.html
+++ b/kde.html
@@ -40,122 +40,48 @@
 

             15
$ pmaint sync kde
 

-            16
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            23
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            24
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            25
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            26
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            27
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            28
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            29
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
Cloning into '/var/lib/repo-mirror-ci/sync/kde'...
 

-            30
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
*** syncing kde
 

-            31
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
*** synced kde
 

-            32
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
 * Sync succeeded
 

-            33
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
$ git log --format=%ci -1
 

-            34
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
$ git show -q --pretty=format:%G? HEAD
 

-            35
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 kde
 

-            36
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
 * Cache regenerated successfully
 

-            37
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            38
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            39
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            40
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            41
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            42
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            43
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            44
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            45
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            46
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            47
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            48
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            49
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            50
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            51
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            52
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            53
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            54
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            55
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            56
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            57
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            58
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            59
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            60
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            61
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            62
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            63
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            64
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            65
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            66
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            67
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            68
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            69
Cloning into '/var/lib/repo-mirror-ci/sync/kde'...
-

-            70
fatal: unable to access 'https://anongit.gentoo.org/git/proj/kde.git/': The requested URL returned error: 504
-

-            71
*** syncing kde
-

-            72
!!! failed syncing kde
-

-            73
 * Sync failed with 1
-
[FATAL]
 
         
     
diff --git a/kde.txt b/kde.txt
index 7730189c5993..71e788c292d0 100644
--- a/kde.txt
+++ b/kde.txt
@@ -13,61 +13,24 @@
  'status': 'official'}
  * Adding new repository
 $ pmaint sync kde
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 Cloning into '/var/lib/repo-mirror-ci/sync/kde'...
-fatal: unable to access 'https://anongit.gentoo.org/git/proj/kde.git/': The requested URL returned error: 504
 *** syncing kde
-!!! failed syncing kde
- * Sync failed with 1
+*** synced kde
+ * Sync succeeded
+$ git log --format=%ci -1
+$ git show -q --pretty=format:%G? HEAD
+$ pmaint regen --use-local-desc --pkg-desc-index -t 1 kde
+ * Cache regenerated successfully
diff --git a/keepbot-overlay.html b/keepbot-overlay.html
index 71c43ea583f1..0b0eab6a1aed 100644
--- a/keepbot-overlay.html
+++ b/keepbot-overlay.html
@@ -38,103 +38,61 @@
 

             14
$ pmaint sync keepbot-overlay
 

-            15
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
warning: Pulling without specifying how to reconcile divergent branches is
 

-            23
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
discouraged. You can squelch this message by running one of the following
 

-            24
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
commands sometime before your next pull:
 

-            25
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 

-            26
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.rebase false  # merge (the default strategy)
 

-            27
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.rebase true   # rebase
 

-            28
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
  git config pull.ff only       # fast-forward only
 

-            29
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
 

-            30
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
You can replace "git config" with "git config --global" to set a default
 

-            31
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            32
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
or --ff-only on the command line to override the configured default per
 

-            33
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
invocation.
 

-            34
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
 

-            35
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
Already up to date.
 

-            36
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
*** syncing keepbot-overlay
 

-            37
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            37
*** synced keepbot-overlay
 

-            38
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            38
 * Sync succeeded
 

-            39
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            39
$ git log --format=%ci -1
 

-            40
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            40
$ git show -q --pretty=format:%G? HEAD
 

-            41
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            41
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 keepbot-overlay
 

-            42
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            43
warning: Pulling without specifying how to reconcile divergent branches is
-

-            44
discouraged. You can squelch this message by running one of the following
-

-            45
commands sometime before your next pull:
-

-            46
-

-            47
  git config pull.rebase false  # merge (the default strategy)
-

-            48
  git config pull.rebase true   # rebase
-

-            49
  git config pull.ff only       # fast-forward only
-

-            50
-

-            51
You can replace "git config" with "git config --global" to set a default
-

-            52
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            53
or --ff-only on the command line to override the configured default per
-

-            54
invocation.
-

-            55
-

-            56
Already up to date.
-

-            57
*** syncing keepbot-overlay
-

-            58
*** synced keepbot-overlay
-

-            59
 * Sync succeeded
-

-            60
$ git log --format=%ci -1
-

-            61
$ git show -q --pretty=format:%G? HEAD
-

-            62
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 keepbot-overlay
-

-            63
 * Cache regenerated successfully
+            42
 * Cache regenerated successfully
 

 
         
diff --git a/keepbot-overlay.txt b/keepbot-overlay.txt
index 722dfcb33ba8..1ec226a0701f 100644
--- a/keepbot-overlay.txt
+++ b/keepbot-overlay.txt
@@ -12,34 +12,13 @@
              'uri': 'git+ssh://git@github.com/d-k-ivanov/gentoo-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync keepbot-overlay
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/khoverlay.html b/khoverlay.html
index 0a9fc51b7d3a..c1f14f0236d7 100644
--- a/khoverlay.html
+++ b/khoverlay.html
@@ -36,103 +36,61 @@
 

             13
$ pmaint sync khoverlay
 

-            14
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
warning: Pulling without specifying how to reconcile divergent branches is
 

-            22
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
discouraged. You can squelch this message by running one of the following
 

-            23
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
commands sometime before your next pull:
 

-            24
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 

-            25
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase false  # merge (the default strategy)
 

-            26
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.rebase true   # rebase
 

-            27
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.ff only       # fast-forward only
 

-            28
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
 

-            29
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
You can replace "git config" with "git config --global" to set a default
 

-            30
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            31
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
or --ff-only on the command line to override the configured default per
 

-            32
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
invocation.
 

-            33
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
 

-            34
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
Already up to date.
 

-            35
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
*** syncing khoverlay
 

-            36
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
*** synced khoverlay
 

-            37
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            37
 * Sync succeeded
 

-            38
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            38
$ git log --format=%ci -1
 

-            39
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            39
$ git show -q --pretty=format:%G? HEAD
 

-            40
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            40
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 khoverlay
 

-            41
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            42
warning: Pulling without specifying how to reconcile divergent branches is
-

-            43
discouraged. You can squelch this message by running one of the following
-

-            44
commands sometime before your next pull:
-

-            45
-

-            46
  git config pull.rebase false  # merge (the default strategy)
-

-            47
  git config pull.rebase true   # rebase
-

-            48
  git config pull.ff only       # fast-forward only
-

-            49
-

-            50
You can replace "git config" with "git config --global" to set a default
-

-            51
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            52
or --ff-only on the command line to override the configured default per
-

-            53
invocation.
-

-            54
-

-            55
Already up to date.
-

-            56
*** syncing khoverlay
-

-            57
*** synced khoverlay
-

-            58
 * Sync succeeded
-

-            59
$ git log --format=%ci -1
-

-            60
$ git show -q --pretty=format:%G? HEAD
-

-            61
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 khoverlay
-

-            62
 * Cache regenerated successfully
+            41
 * Cache regenerated successfully
 

 
         
diff --git a/khoverlay.txt b/khoverlay.txt
index 8d39487cbf4f..79547ea802de 100644
--- a/khoverlay.txt
+++ b/khoverlay.txt
@@ -11,34 +11,13 @@
              'uri': 'git+ssh://git@gitlab.com/khumba/khoverlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync khoverlay
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/klondike.html b/klondike.html
index c55f834568a4..84ac0408ca03 100644
--- a/klondike.html
+++ b/klondike.html
@@ -42,135 +42,63 @@
 

             16
 'status': 'unofficial'}
 

-            17
 * Adding new repository
+            17
$ pmaint sync klondike
 

-            18
$ pmaint sync klondike
+            18
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            23
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            24
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            25
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
warning: Pulling without specifying how to reconcile divergent branches is
 

-            26
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
discouraged. You can squelch this message by running one of the following
 

-            27
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
commands sometime before your next pull:
 

-            28
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
 

-            29
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
  git config pull.rebase false  # merge (the default strategy)
 

-            30
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
  git config pull.rebase true   # rebase
 

-            31
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
  git config pull.ff only       # fast-forward only
 

-            32
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
 

-            33
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
You can replace "git config" with "git config --global" to set a default
 

-            34
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            35
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
or --ff-only on the command line to override the configured default per
 

-            36
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
invocation.
 

-            37
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            37
 

-            38
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            38
Already up to date.
 

-            39
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            39
*** syncing klondike
 

-            40
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            40
*** synced klondike
 

-            41
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            41
 * Sync succeeded
 

-            42
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            42
$ git log --format=%ci -1
 

-            43
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            43
$ git show -q --pretty=format:%G? HEAD
 

-            44
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            44
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 klondike
 

-            45
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            46
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            47
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            48
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            49
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            50
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            51
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            52
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            53
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            54
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            55
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            56
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            57
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            58
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            59
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            60
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            61
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            62
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            63
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            64
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            65
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            66
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            67
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            68
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            69
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            70
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            71
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            72
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            73
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            74
Cloning into '/var/lib/repo-mirror-ci/sync/klondike'...
-

-            75
*** syncing klondike
-

-            76
*** synced klondike
-

-            77
 * Sync succeeded
-

-            78
$ git log --format=%ci -1
-

-            79
$ git show -q --pretty=format:%G? HEAD
-

-            80
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 klondike
-

-            81
 * Cache regenerated successfully
+            45
 * Cache regenerated successfully
 

 
         
diff --git a/klondike.txt b/klondike.txt
index 90ba905b6416..a596aa093d2c 100644
--- a/klondike.txt
+++ b/klondike.txt
@@ -14,64 +14,28 @@
             {'type': 'git',
              'uri': 'git+ssh://git@git.gentoo.org/user/klondike.git'}],
  'status': 'unofficial'}
- * Adding new repository
 $ pmaint sync klondike
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-Cloning into '/var/lib/repo-mirror-ci/sync/klondike'...
+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.
+
+Already up to date.
 *** syncing klondike
 *** synced klondike
  * Sync succeeded
diff --git a/konsolebox.html b/konsolebox.html
index 7654c416d3c3..53d827f20cb4 100644
--- a/konsolebox.html
+++ b/konsolebox.html
@@ -34,103 +34,61 @@
 

             12
$ pmaint sync konsolebox
 

-            13
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
warning: Pulling without specifying how to reconcile divergent branches is
 

-            21
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
discouraged. You can squelch this message by running one of the following
 

-            22
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
commands sometime before your next pull:
 

-            23
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
 

-            24
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.rebase false  # merge (the default strategy)
 

-            25
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase true   # rebase
 

-            26
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.ff only       # fast-forward only
 

-            27
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
 

-            28
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
You can replace "git config" with "git config --global" to set a default
 

-            29
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            30
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
or --ff-only on the command line to override the configured default per
 

-            31
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
invocation.
 

-            32
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
 

-            33
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
Already up to date.
 

-            34
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
*** syncing konsolebox
 

-            35
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
*** synced konsolebox
 

-            36
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
 * Sync succeeded
 

-            37
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            37
$ git log --format=%ci -1
 

-            38
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            38
$ git show -q --pretty=format:%G? HEAD
 

-            39
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            39
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 konsolebox
 

-            40
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            41
warning: Pulling without specifying how to reconcile divergent branches is
-

-            42
discouraged. You can squelch this message by running one of the following
-

-            43
commands sometime before your next pull:
-

-            44
-

-            45
  git config pull.rebase false  # merge (the default strategy)
-

-            46
  git config pull.rebase true   # rebase
-

-            47
  git config pull.ff only       # fast-forward only
-

-            48
-

-            49
You can replace "git config" with "git config --global" to set a default
-

-            50
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            51
or --ff-only on the command line to override the configured default per
-

-            52
invocation.
-

-            53
-

-            54
Already up to date.
-

-            55
*** syncing konsolebox
-

-            56
*** synced konsolebox
-

-            57
 * Sync succeeded
-

-            58
$ git log --format=%ci -1
-

-            59
$ git show -q --pretty=format:%G? HEAD
-

-            60
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 konsolebox
-

-            61
 * Cache regenerated successfully
+            40
 * Cache regenerated successfully
 

 
         
diff --git a/konsolebox.txt b/konsolebox.txt
index 7c99b7e2c565..0c4911ec2f7a 100644
--- a/konsolebox.txt
+++ b/konsolebox.txt
@@ -10,34 +10,13 @@
              'uri': 'https://github.com/konsolebox/overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync konsolebox
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/lacimarsik-overlay.html b/lacimarsik-overlay.html
index c8d5e1159f23..3c052e430f3a 100644
--- a/lacimarsik-overlay.html
+++ b/lacimarsik-overlay.html
@@ -36,107 +36,61 @@
 

             13
$ pmaint sync lacimarsik-overlay
 

-            14
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
warning: Pulling without specifying how to reconcile divergent branches is
 

-            21
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
discouraged. You can squelch this message by running one of the following
 

-            22
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
commands sometime before your next pull:
 

-            23
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
 

-            24
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.rebase false  # merge (the default strategy)
 

-            25
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase true   # rebase
 

-            26
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.ff only       # fast-forward only
 

-            27
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
 

-            28
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
You can replace "git config" with "git config --global" to set a default
 

-            29
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            30
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
or --ff-only on the command line to override the configured default per
 

-            31
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
invocation.
 

-            32
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
 

-            33
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
Already up to date.
 

-            34
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
*** syncing lacimarsik-overlay
 

-            35
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
*** synced lacimarsik-overlay
 

-            36
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
 * Sync succeeded
 

-            37
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            37
$ git log --format=%ci -1
 

-            38
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            38
$ git show -q --pretty=format:%G? HEAD
 

-            39
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            39
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 lacimarsik-overlay
 

-            40
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            41
WARNING:pkgcore:klondike repo at '/var/lib/repo-mirror-ci/sync/klondike', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            42
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            43
warning: Pulling without specifying how to reconcile divergent branches is
-

-            44
discouraged. You can squelch this message by running one of the following
-

-            45
commands sometime before your next pull:
-

-            46
-

-            47
  git config pull.rebase false  # merge (the default strategy)
-

-            48
  git config pull.rebase true   # rebase
-

-            49
  git config pull.ff only       # fast-forward only
-

-            50
-

-            51
You can replace "git config" with "git config --global" to set a default
-

-            52
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            53
or --ff-only on the command line to override the configured default per
-

-            54
invocation.
-

-            55
-

-            56
Already up to date.
-

-            57
*** syncing lacimarsik-overlay
-

-            58
*** synced lacimarsik-overlay
-

-            59
 * Sync succeeded
-

-            60
$ git log --format=%ci -1
-

-            61
$ git show -q --pretty=format:%G? HEAD
-

-            62
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 lacimarsik-overlay
-

-            63
 * media-sound/ladish-9999-r1: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            40
 * media-sound/ladish-9999-r1: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            64
 * Cache regen failed with 1
+            41
 * Cache regen failed with 1
 

 
         
diff --git a/lacimarsik-overlay.txt b/lacimarsik-overlay.txt
index 0388fbe4a538..8e4a19ee18ab 100644
--- a/lacimarsik-overlay.txt
+++ b/lacimarsik-overlay.txt
@@ -11,35 +11,12 @@
              'uri': 'https://github.com/lacimarsik/lacimarsik-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync lacimarsik-overlay
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:klondike repo at '/var/lib/repo-mirror-ci/sync/klondike', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/lanodanOverlay.html b/lanodanOverlay.html
index b4d4e68508cf..783902f90a9a 100644
--- a/lanodanOverlay.html
+++ b/lanodanOverlay.html
@@ -44,103 +44,59 @@
 

             17
$ pmaint sync lanodanOverlay
 

-            18
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            23
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            24
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
warning: Pulling without specifying how to reconcile divergent branches is
 

-            25
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
discouraged. You can squelch this message by running one of the following
 

-            26
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
commands sometime before your next pull:
 

-            27
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
 

-            28
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
  git config pull.rebase false  # merge (the default strategy)
 

-            29
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
  git config pull.rebase true   # rebase
 

-            30
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
  git config pull.ff only       # fast-forward only
 

-            31
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
 

-            32
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
You can replace "git config" with "git config --global" to set a default
 

-            33
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            34
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
or --ff-only on the command line to override the configured default per
 

-            35
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
invocation.
 

-            36
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
 

-            37
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            37
Already up to date.
 

-            38
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            38
*** syncing lanodanOverlay
 

-            39
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            39
*** synced lanodanOverlay
 

-            40
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            40
 * Sync succeeded
 

-            41
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            41
$ git log --format=%ci -1
 

-            42
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            42
$ git show -q --pretty=format:%G? HEAD
 

-            43
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            43
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 lanodanOverlay
 

-            44
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            45
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            46
warning: Pulling without specifying how to reconcile divergent branches is
-

-            47
discouraged. You can squelch this message by running one of the following
-

-            48
commands sometime before your next pull:
-

-            49
-

-            50
  git config pull.rebase false  # merge (the default strategy)
-

-            51
  git config pull.rebase true   # rebase
-

-            52
  git config pull.ff only       # fast-forward only
-

-            53
-

-            54
You can replace "git config" with "git config --global" to set a default
-

-            55
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            56
or --ff-only on the command line to override the configured default per
-

-            57
invocation.
-

-            58
-

-            59
Already up to date.
-

-            60
*** syncing lanodanOverlay
-

-            61
*** synced lanodanOverlay
-

-            62
 * Sync succeeded
-

-            63
$ git log --format=%ci -1
-

-            64
$ git show -q --pretty=format:%G? HEAD
-

-            65
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 lanodanOverlay
-

-            66
 * Cache regenerated successfully
+            44
 * Cache regenerated successfully
 

 
         
diff --git a/lanodanOverlay.txt b/lanodanOverlay.txt
index 669d08e87ab8..420a2083df4f 100644
--- a/lanodanOverlay.txt
+++ b/lanodanOverlay.txt
@@ -15,34 +15,12 @@
             {'type': 'git', 'uri': 'git://gitlab.com/lanodan/overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync lanodanOverlay
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/laurentb.html b/laurentb.html
index 5133f186cf03..f4d45d70fdc8 100644
--- a/laurentb.html
+++ b/laurentb.html
@@ -38,103 +38,59 @@
 

             14
$ pmaint sync laurentb
 

-            15
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
warning: Pulling without specifying how to reconcile divergent branches is
 

-            22
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
discouraged. You can squelch this message by running one of the following
 

-            23
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
commands sometime before your next pull:
 

-            24
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 

-            25
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase false  # merge (the default strategy)
 

-            26
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.rebase true   # rebase
 

-            27
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.ff only       # fast-forward only
 

-            28
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
 

-            29
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
You can replace "git config" with "git config --global" to set a default
 

-            30
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            31
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
or --ff-only on the command line to override the configured default per
 

-            32
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
invocation.
 

-            33
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
 

-            34
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
Already up to date.
 

-            35
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
*** syncing laurentb
 

-            36
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
*** synced laurentb
 

-            37
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            37
 * Sync succeeded
 

-            38
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            38
$ git log --format=%ci -1
 

-            39
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            39
$ git show -q --pretty=format:%G? HEAD
 

-            40
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            40
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 laurentb
 

-            41
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            42
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            43
warning: Pulling without specifying how to reconcile divergent branches is
-

-            44
discouraged. You can squelch this message by running one of the following
-

-            45
commands sometime before your next pull:
-

-            46
-

-            47
  git config pull.rebase false  # merge (the default strategy)
-

-            48
  git config pull.rebase true   # rebase
-

-            49
  git config pull.ff only       # fast-forward only
-

-            50
-

-            51
You can replace "git config" with "git config --global" to set a default
-

-            52
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            53
or --ff-only on the command line to override the configured default per
-

-            54
invocation.
-

-            55
-

-            56
Already up to date.
-

-            57
*** syncing laurentb
-

-            58
*** synced laurentb
-

-            59
 * Sync succeeded
-

-            60
$ git log --format=%ci -1
-

-            61
$ git show -q --pretty=format:%G? HEAD
-

-            62
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 laurentb
-

-            63
 * Cache regenerated successfully
+            41
 * Cache regenerated successfully
 

 
         
diff --git a/laurentb.txt b/laurentb.txt
index 8545a87d84f5..8015dce9e038 100644
--- a/laurentb.txt
+++ b/laurentb.txt
@@ -12,34 +12,12 @@
              'uri': 'https://github.com/laurentb/gentoo-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync laurentb
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/leechcraft.html b/leechcraft.html
index 21e13e989859..66b02fd5adb9 100644
--- a/leechcraft.html
+++ b/leechcraft.html
@@ -38,103 +38,61 @@
 

             14
$ pmaint sync leechcraft
 

-            15
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
warning: Pulling without specifying how to reconcile divergent branches is
 

-            23
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
discouraged. You can squelch this message by running one of the following
 

-            24
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
commands sometime before your next pull:
 

-            25
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 

-            26
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.rebase false  # merge (the default strategy)
 

-            27
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.rebase true   # rebase
 

-            28
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
  git config pull.ff only       # fast-forward only
 

-            29
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
 

-            30
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
You can replace "git config" with "git config --global" to set a default
 

-            31
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            32
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
or --ff-only on the command line to override the configured default per
 

-            33
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
invocation.
 

-            34
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
 

-            35
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
Already up to date.
 

-            36
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
*** syncing leechcraft
 

-            37
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            37
*** synced leechcraft
 

-            38
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            38
 * Sync succeeded
 

-            39
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            39
$ git log --format=%ci -1
 

-            40
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            40
$ git show -q --pretty=format:%G? HEAD
 

-            41
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            41
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 leechcraft
 

-            42
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            43
warning: Pulling without specifying how to reconcile divergent branches is
-

-            44
discouraged. You can squelch this message by running one of the following
-

-            45
commands sometime before your next pull:
-

-            46
-

-            47
  git config pull.rebase false  # merge (the default strategy)
-

-            48
  git config pull.rebase true   # rebase
-

-            49
  git config pull.ff only       # fast-forward only
-

-            50
-

-            51
You can replace "git config" with "git config --global" to set a default
-

-            52
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            53
or --ff-only on the command line to override the configured default per
-

-            54
invocation.
-

-            55
-

-            56
Already up to date.
-

-            57
*** syncing leechcraft
-

-            58
*** synced leechcraft
-

-            59
 * Sync succeeded
-

-            60
$ git log --format=%ci -1
-

-            61
$ git show -q --pretty=format:%G? HEAD
-

-            62
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 leechcraft
-

-            63
 * Cache regenerated successfully
+            42
 * Cache regenerated successfully
 

 
         
diff --git a/leechcraft.txt b/leechcraft.txt
index e6a656da3345..5d6c341908fd 100644
--- a/leechcraft.txt
+++ b/leechcraft.txt
@@ -12,34 +12,13 @@
              'uri': 'git://github.com/0xd34df00d/leechcraft-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync leechcraft
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/leio.html b/leio.html
index 6cb8f8e963c5..72403d4c4a01 100644
--- a/leio.html
+++ b/leio.html
@@ -42,126 +42,44 @@
 

             16
$ pmaint sync leio
 

-            17
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            23
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            24
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            25
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            26
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            27
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            28
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
Cloning into '/var/lib/repo-mirror-ci/sync/leio'...
 

-            29
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
*** syncing leio
 

-            30
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
*** synced leio
 

-            31
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
 * Sync succeeded
 

-            32
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
$ git log --format=%ci -1
 

-            33
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
$ git show -q --pretty=format:%G? HEAD
 

-            34
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 leio
 

-            35
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
 * Cache regenerated successfully
 

-            36
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            37
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            38
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            39
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            40
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            41
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            42
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            43
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            44
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            45
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            46
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            47
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            48
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            49
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            50
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            51
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            52
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            53
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            54
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            55
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            56
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            57
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            58
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            59
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            60
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            61
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            62
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            63
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            64
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            65
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            66
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            67
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            68
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            69
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            70
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            71
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            72
Cloning into '/var/lib/repo-mirror-ci/sync/leio'...
-

-            73
fatal: unable to access 'https://anongit.gentoo.org/git/dev/leio.git/': The requested URL returned error: 504
-

-            74
*** syncing leio
-

-            75
!!! failed syncing leio
-

-            76
 * Sync failed with 1
-
[FATAL]
 
         
     
diff --git a/leio.txt b/leio.txt
index f2bf8f1960bc..ee5096adaadc 100644
--- a/leio.txt
+++ b/leio.txt
@@ -14,63 +14,22 @@
  'status': 'official'}
  * Adding new repository
 $ pmaint sync leio
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 Cloning into '/var/lib/repo-mirror-ci/sync/leio'...
-fatal: unable to access 'https://anongit.gentoo.org/git/dev/leio.git/': The requested URL returned error: 504
 *** syncing leio
-!!! failed syncing leio
- * Sync failed with 1
+*** synced leio
+ * Sync succeeded
+$ git log --format=%ci -1
+$ git show -q --pretty=format:%G? HEAD
+$ pmaint regen --use-local-desc --pkg-desc-index -t 1 leio
+ * Cache regenerated successfully
diff --git a/leonardohn.html b/leonardohn.html
index 05e7b16ddc56..db685b58abfe 100644
--- a/leonardohn.html
+++ b/leonardohn.html
@@ -38,105 +38,59 @@
 

             14
$ pmaint sync leonardohn
 

-            15
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
warning: Pulling without specifying how to reconcile divergent branches is
 

-            22
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
discouraged. You can squelch this message by running one of the following
 

-            23
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
commands sometime before your next pull:
 

-            24
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 

-            25
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase false  # merge (the default strategy)
 

-            26
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.rebase true   # rebase
 

-            27
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.ff only       # fast-forward only
 

-            28
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
 

-            29
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
You can replace "git config" with "git config --global" to set a default
 

-            30
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            31
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
or --ff-only on the command line to override the configured default per
 

-            32
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
invocation.
 

-            33
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
 

-            34
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
Already up to date.
 

-            35
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
*** syncing leonardohn
 

-            36
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
*** synced leonardohn
 

-            37
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            37
 * Sync succeeded
 

-            38
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            38
$ git log --format=%ci -1
 

-            39
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            39
$ git show -q --pretty=format:%G? HEAD
 

-            40
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            40
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 leonardohn
 

-            41
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            42
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            43
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            44
warning: Pulling without specifying how to reconcile divergent branches is
-

-            45
discouraged. You can squelch this message by running one of the following
-

-            46
commands sometime before your next pull:
-

-            47
-

-            48
  git config pull.rebase false  # merge (the default strategy)
-

-            49
  git config pull.rebase true   # rebase
-

-            50
  git config pull.ff only       # fast-forward only
-

-            51
-

-            52
You can replace "git config" with "git config --global" to set a default
-

-            53
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            54
or --ff-only on the command line to override the configured default per
-

-            55
invocation.
-

-            56
-

-            57
Already up to date.
-

-            58
*** syncing leonardohn
-

-            59
*** synced leonardohn
-

-            60
 * Sync succeeded
-

-            61
$ git log --format=%ci -1
-

-            62
$ git show -q --pretty=format:%G? HEAD
-

-            63
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 leonardohn
-

-            64
 * Cache regenerated successfully
+            41
 * Cache regenerated successfully
 

 
         
diff --git a/leonardohn.txt b/leonardohn.txt
index 70038df01cc9..800607202f25 100644
--- a/leonardohn.txt
+++ b/leonardohn.txt
@@ -12,35 +12,12 @@
              'uri': 'git+ssh://git@github.com/leonardohn/gentoo-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync leonardohn
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/levenkov.html b/levenkov.html
index b19b0898ce12..84834ef9b5d8 100644
--- a/levenkov.html
+++ b/levenkov.html
@@ -40,105 +40,59 @@
 

             15
$ pmaint sync levenkov
 

-            16
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
warning: Pulling without specifying how to reconcile divergent branches is
 

-            23
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
discouraged. You can squelch this message by running one of the following
 

-            24
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
commands sometime before your next pull:
 

-            25
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 

-            26
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.rebase false  # merge (the default strategy)
 

-            27
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.rebase true   # rebase
 

-            28
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
  git config pull.ff only       # fast-forward only
 

-            29
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
 

-            30
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
You can replace "git config" with "git config --global" to set a default
 

-            31
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            32
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
or --ff-only on the command line to override the configured default per
 

-            33
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
invocation.
 

-            34
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
 

-            35
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
Already up to date.
 

-            36
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
*** syncing levenkov
 

-            37
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            37
*** synced levenkov
 

-            38
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            38
 * Sync succeeded
 

-            39
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            39
$ git log --format=%ci -1
 

-            40
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            40
$ git show -q --pretty=format:%G? HEAD
 

-            41
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            41
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 levenkov
 

-            42
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            43
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            44
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            45
warning: Pulling without specifying how to reconcile divergent branches is
-

-            46
discouraged. You can squelch this message by running one of the following
-

-            47
commands sometime before your next pull:
-

-            48
-

-            49
  git config pull.rebase false  # merge (the default strategy)
-

-            50
  git config pull.rebase true   # rebase
-

-            51
  git config pull.ff only       # fast-forward only
-

-            52
-

-            53
You can replace "git config" with "git config --global" to set a default
-

-            54
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            55
or --ff-only on the command line to override the configured default per
-

-            56
invocation.
-

-            57
-

-            58
Already up to date.
-

-            59
*** syncing levenkov
-

-            60
*** synced levenkov
-

-            61
 * Sync succeeded
-

-            62
$ git log --format=%ci -1
-

-            63
$ git show -q --pretty=format:%G? HEAD
-

-            64
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 levenkov
-

-            65
 * Cache regenerated successfully
+            42
 * Cache regenerated successfully
 

 
         
diff --git a/levenkov.txt b/levenkov.txt
index ea9f9214eb9d..e8f2539ad42f 100644
--- a/levenkov.txt
+++ b/levenkov.txt
@@ -13,35 +13,12 @@
              'uri': 'git+ssh://git@git.gentoo.org/user/levenkov.git'}],
  'status': 'unofficial'}
 $ pmaint sync levenkov
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/librepilot.html b/librepilot.html
index bb05c005b8b9..89625ddd8e1c 100644
--- a/librepilot.html
+++ b/librepilot.html
@@ -38,105 +38,59 @@
 

             14
$ pmaint sync librepilot
 

-            15
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
warning: Pulling without specifying how to reconcile divergent branches is
 

-            22
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
discouraged. You can squelch this message by running one of the following
 

-            23
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
commands sometime before your next pull:
 

-            24
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 

-            25
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase false  # merge (the default strategy)
 

-            26
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.rebase true   # rebase
 

-            27
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.ff only       # fast-forward only
 

-            28
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
 

-            29
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
You can replace "git config" with "git config --global" to set a default
 

-            30
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            31
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
or --ff-only on the command line to override the configured default per
 

-            32
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
invocation.
 

-            33
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
 

-            34
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
Already up to date.
 

-            35
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
*** syncing librepilot
 

-            36
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
*** synced librepilot
 

-            37
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            37
 * Sync succeeded
 

-            38
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            38
$ git log --format=%ci -1
 

-            39
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            39
$ git show -q --pretty=format:%G? HEAD
 

-            40
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            40
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 librepilot
 

-            41
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            42
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            43
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            44
warning: Pulling without specifying how to reconcile divergent branches is
-

-            45
discouraged. You can squelch this message by running one of the following
-

-            46
commands sometime before your next pull:
-

-            47
-

-            48
  git config pull.rebase false  # merge (the default strategy)
-

-            49
  git config pull.rebase true   # rebase
-

-            50
  git config pull.ff only       # fast-forward only
-

-            51
-

-            52
You can replace "git config" with "git config --global" to set a default
-

-            53
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            54
or --ff-only on the command line to override the configured default per
-

-            55
invocation.
-

-            56
-

-            57
Already up to date.
-

-            58
*** syncing librepilot
-

-            59
*** synced librepilot
-

-            60
 * Sync succeeded
-

-            61
$ git log --format=%ci -1
-

-            62
$ git show -q --pretty=format:%G? HEAD
-

-            63
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 librepilot
-

-            64
 * Cache regenerated successfully
+            41
 * Cache regenerated successfully
 

 
         
diff --git a/librepilot.txt b/librepilot.txt
index ac3ce1c2234f..d9e84704fc53 100644
--- a/librepilot.txt
+++ b/librepilot.txt
@@ -12,35 +12,12 @@
              'uri': 'git+ssh://git@github.com/paul-jewell/librepilot-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync librepilot
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/libressl.html b/libressl.html
index 2816afad19cb..0c2938e7bfa9 100644
--- a/libressl.html
+++ b/libressl.html
@@ -32,139 +32,61 @@
 

             11
 'status': 'official'}
 

-            12
 * Adding new repository
+            12
$ pmaint sync libressl
 

-            13
$ pmaint sync libressl
+            13
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
warning: Pulling without specifying how to reconcile divergent branches is
 

-            20
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
discouraged. You can squelch this message by running one of the following
 

-            21
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
commands sometime before your next pull:
 

-            22
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
 

-            23
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase false  # merge (the default strategy)
 

-            24
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.rebase true   # rebase
 

-            25
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.ff only       # fast-forward only
 

-            26
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
 

-            27
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
You can replace "git config" with "git config --global" to set a default
 

-            28
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            29
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
or --ff-only on the command line to override the configured default per
 

-            30
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
invocation.
 

-            31
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
 

-            32
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
Already up to date.
 

-            33
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
*** syncing libressl
 

-            34
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
*** synced libressl
 

-            35
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
 * Sync succeeded
 

-            36
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
$ git log --format=%ci -1
 

-            37
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            37
$ git show -q --pretty=format:%G? HEAD
 

-            38
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            38
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 libressl
 

-            39
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            40
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            41
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            42
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            43
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            44
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            45
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            46
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            47
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            48
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            49
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            50
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            51
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            52
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            53
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            54
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            55
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            56
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            57
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            58
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            59
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            60
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            61
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            62
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            63
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            64
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            65
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            66
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            67
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            68
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            69
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            70
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            71
Cloning into '/var/lib/repo-mirror-ci/sync/libressl'...
-

-            72
*** syncing libressl
-

-            73
*** synced libressl
-

-            74
 * Sync succeeded
-

-            75
$ git log --format=%ci -1
-

-            76
$ git show -q --pretty=format:%G? HEAD
-

-            77
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 libressl
-

-            78
 * Cache regenerated successfully
+            39
 * Cache regenerated successfully
 

 
         
diff --git a/libressl.txt b/libressl.txt
index fb6dd21ed2b4..3a80e207ebfb 100644
--- a/libressl.txt
+++ b/libressl.txt
@@ -9,66 +9,27 @@
             {'type': 'git',
              'uri': 'git+ssh://git@git.gentoo.org/repo/proj/libressl.git'}],
  'status': 'official'}
- * Adding new repository
 $ pmaint sync libressl
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-Cloning into '/var/lib/repo-mirror-ci/sync/libressl'...
+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.
+
+Already up to date.
 *** syncing libressl
 *** synced libressl
  * Sync succeeded
diff --git a/linux-be.html b/linux-be.html
index c322734af44d..2cdb85a06b1a 100644
--- a/linux-be.html
+++ b/linux-be.html
@@ -42,105 +42,59 @@
 

             16
$ pmaint sync linux-be
 

-            17
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            23
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
warning: Pulling without specifying how to reconcile divergent branches is
 

-            24
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
discouraged. You can squelch this message by running one of the following
 

-            25
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
commands sometime before your next pull:
 

-            26
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
 

-            27
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.rebase false  # merge (the default strategy)
 

-            28
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
  git config pull.rebase true   # rebase
 

-            29
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
  git config pull.ff only       # fast-forward only
 

-            30
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
 

-            31
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
You can replace "git config" with "git config --global" to set a default
 

-            32
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            33
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
or --ff-only on the command line to override the configured default per
 

-            34
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
invocation.
 

-            35
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
 

-            36
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
Already up to date.
 

-            37
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            37
*** syncing linux-be
 

-            38
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            38
*** synced linux-be
 

-            39
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            39
 * Sync succeeded
 

-            40
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            40
$ git log --format=%ci -1
 

-            41
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            41
$ git show -q --pretty=format:%G? HEAD
 

-            42
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            42
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 linux-be
 

-            43
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            44
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            45
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            46
warning: Pulling without specifying how to reconcile divergent branches is
-

-            47
discouraged. You can squelch this message by running one of the following
-

-            48
commands sometime before your next pull:
-

-            49
-

-            50
  git config pull.rebase false  # merge (the default strategy)
-

-            51
  git config pull.rebase true   # rebase
-

-            52
  git config pull.ff only       # fast-forward only
-

-            53
-

-            54
You can replace "git config" with "git config --global" to set a default
-

-            55
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            56
or --ff-only on the command line to override the configured default per
-

-            57
invocation.
-

-            58
-

-            59
Already up to date.
-

-            60
*** syncing linux-be
-

-            61
*** synced linux-be
-

-            62
 * Sync succeeded
-

-            63
$ git log --format=%ci -1
-

-            64
$ git show -q --pretty=format:%G? HEAD
-

-            65
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 linux-be
-

-            66
 * Cache regenerated successfully
+            43
 * Cache regenerated successfully
 

 
         
diff --git a/linux-be.txt b/linux-be.txt
index cb50f4924163..567146f204e8 100644
--- a/linux-be.txt
+++ b/linux-be.txt
@@ -14,35 +14,12 @@
              'uri': 'git+ssh://git@gitlab.com/linux-be/overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync linux-be
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/linuxunderground-overlay.html b/linuxunderground-overlay.html
index 9ea85b345598..e569e53d747a 100644
--- a/linuxunderground-overlay.html
+++ b/linuxunderground-overlay.html
@@ -36,105 +36,59 @@
 

             13
$ pmaint sync linuxunderground-overlay
 

-            14
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
warning: Pulling without specifying how to reconcile divergent branches is
 

-            21
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
discouraged. You can squelch this message by running one of the following
 

-            22
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
commands sometime before your next pull:
 

-            23
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
 

-            24
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.rebase false  # merge (the default strategy)
 

-            25
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase true   # rebase
 

-            26
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.ff only       # fast-forward only
 

-            27
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
 

-            28
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
You can replace "git config" with "git config --global" to set a default
 

-            29
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            30
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
or --ff-only on the command line to override the configured default per
 

-            31
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
invocation.
 

-            32
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
 

-            33
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
Already up to date.
 

-            34
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
*** syncing linuxunderground-overlay
 

-            35
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
*** synced linuxunderground-overlay
 

-            36
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
 * Sync succeeded
 

-            37
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            37
$ git log --format=%ci -1
 

-            38
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            38
$ git show -q --pretty=format:%G? HEAD
 

-            39
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            39
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 linuxunderground-overlay
 

-            40
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            41
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            42
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            43
warning: Pulling without specifying how to reconcile divergent branches is
-

-            44
discouraged. You can squelch this message by running one of the following
-

-            45
commands sometime before your next pull:
-

-            46
-

-            47
  git config pull.rebase false  # merge (the default strategy)
-

-            48
  git config pull.rebase true   # rebase
-

-            49
  git config pull.ff only       # fast-forward only
-

-            50
-

-            51
You can replace "git config" with "git config --global" to set a default
-

-            52
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            53
or --ff-only on the command line to override the configured default per
-

-            54
invocation.
-

-            55
-

-            56
Already up to date.
-

-            57
*** syncing linuxunderground-overlay
-

-            58
*** synced linuxunderground-overlay
-

-            59
 * Sync succeeded
-

-            60
$ git log --format=%ci -1
-

-            61
$ git show -q --pretty=format:%G? HEAD
-

-            62
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 linuxunderground-overlay
-

-            63
 * Cache regenerated successfully
+            40
 * Cache regenerated successfully
 

 
         
diff --git a/linuxunderground-overlay.txt b/linuxunderground-overlay.txt
index c37c0bd7aa6e..3ec367f49774 100644
--- a/linuxunderground-overlay.txt
+++ b/linuxunderground-overlay.txt
@@ -11,35 +11,12 @@
              'uri': 'https://github.com/linuxunderground/gentoo.overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync linuxunderground-overlay
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/linxon.html b/linxon.html
index 8dc23239571e..27c9c1d1ab71 100644
--- a/linxon.html
+++ b/linxon.html
@@ -30,105 +30,59 @@
 

             10
$ pmaint sync linxon
 

-            11
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            11
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            12
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
warning: Pulling without specifying how to reconcile divergent branches is
 

-            18
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
discouraged. You can squelch this message by running one of the following
 

-            19
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
commands sometime before your next pull:
 

-            20
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
 

-            21
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
  git config pull.rebase false  # merge (the default strategy)
 

-            22
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase true   # rebase
 

-            23
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.ff only       # fast-forward only
 

-            24
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 

-            25
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
You can replace "git config" with "git config --global" to set a default
 

-            26
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            27
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
or --ff-only on the command line to override the configured default per
 

-            28
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
invocation.
 

-            29
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
 

-            30
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
Already up to date.
 

-            31
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
*** syncing linxon
 

-            32
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
*** synced linxon
 

-            33
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
 * Sync succeeded
 

-            34
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
$ git log --format=%ci -1
 

-            35
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
$ git show -q --pretty=format:%G? HEAD
 

-            36
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 linxon
 

-            37
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            38
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            39
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            40
warning: Pulling without specifying how to reconcile divergent branches is
-

-            41
discouraged. You can squelch this message by running one of the following
-

-            42
commands sometime before your next pull:
-

-            43
-

-            44
  git config pull.rebase false  # merge (the default strategy)
-

-            45
  git config pull.rebase true   # rebase
-

-            46
  git config pull.ff only       # fast-forward only
-

-            47
-

-            48
You can replace "git config" with "git config --global" to set a default
-

-            49
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            50
or --ff-only on the command line to override the configured default per
-

-            51
invocation.
-

-            52
-

-            53
Already up to date.
-

-            54
*** syncing linxon
-

-            55
*** synced linxon
-

-            56
 * Sync succeeded
-

-            57
$ git log --format=%ci -1
-

-            58
$ git show -q --pretty=format:%G? HEAD
-

-            59
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 linxon
-

-            60
 * Cache regenerated successfully
+            37
 * Cache regenerated successfully
 

 
         
diff --git a/linxon.txt b/linxon.txt
index 6d9df2c49c53..ae6907763180 100644
--- a/linxon.txt
+++ b/linxon.txt
@@ -8,35 +8,12 @@
              'uri': 'https://github.com/linxon/gentoo-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync linxon
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/lisp.html b/lisp.html
index 679f3c0ef465..9980d73f6ba4 100644
--- a/lisp.html
+++ b/lisp.html
@@ -44,130 +44,44 @@
 

             17
$ pmaint sync lisp
 

-            18
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            23
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            24
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            25
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            26
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            27
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            28
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            29
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
Cloning into '/var/lib/repo-mirror-ci/sync/lisp'...
 

-            30
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
*** syncing lisp
 

-            31
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
*** synced lisp
 

-            32
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
 * Sync succeeded
 

-            33
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
$ git log --format=%ci -1
 

-            34
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
$ git show -q --pretty=format:%G? HEAD
 

-            35
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 lisp
 

-            36
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
 * Cache regenerated successfully
 

-            37
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            38
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            39
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            40
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            41
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            42
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            43
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            44
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            45
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            46
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            47
WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            48
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            49
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            50
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            51
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            52
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            53
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            54
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            55
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            56
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            57
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            58
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            59
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            60
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            61
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            62
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            63
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            64
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            65
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            66
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            67
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            68
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            69
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            70
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            71
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            72
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            73
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            74
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            75
Cloning into '/var/lib/repo-mirror-ci/sync/lisp'...
-

-            76
fatal: unable to access 'https://anongit.gentoo.org/git/proj/lisp.git/': The requested URL returned error: 504
-

-            77
*** syncing lisp
-

-            78
!!! failed syncing lisp
-

-            79
 * Sync failed with 1
-
[FATAL]
 
         
     
diff --git a/lisp.txt b/lisp.txt
index b832b7a54ebc..d6c026e92ddc 100644
--- a/lisp.txt
+++ b/lisp.txt
@@ -15,65 +15,22 @@
  'status': 'official'}
  * Adding new repository
 $ pmaint sync lisp
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 Cloning into '/var/lib/repo-mirror-ci/sync/lisp'...
-fatal: unable to access 'https://anongit.gentoo.org/git/proj/lisp.git/': The requested URL returned error: 504
 *** syncing lisp
-!!! failed syncing lisp
- * Sync failed with 1
+*** synced lisp
+ * Sync succeeded
+$ git log --format=%ci -1
+$ git show -q --pretty=format:%G? HEAD
+$ pmaint regen --use-local-desc --pkg-desc-index -t 1 lisp
+ * Cache regenerated successfully
diff --git a/lmiphay.html b/lmiphay.html
index 2ebe7e28210e..7c397afff10f 100644
--- a/lmiphay.html
+++ b/lmiphay.html
@@ -32,105 +32,57 @@
 

             11
$ pmaint sync lmiphay
 

-            12
WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
warning: Pulling without specifying how to reconcile divergent branches is
 

-            18
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
discouraged. You can squelch this message by running one of the following
 

-            19
WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
commands sometime before your next pull:
 

-            20
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
 

-            21
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
  git config pull.rebase false  # merge (the default strategy)
 

-            22
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase true   # rebase
 

-            23
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.ff only       # fast-forward only
 

-            24
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 

-            25
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
You can replace "git config" with "git config --global" to set a default
 

-            26
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            27
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
or --ff-only on the command line to override the configured default per
 

-            28
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
invocation.
 

-            29
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
 

-            30
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
Already up to date.
 

-            31
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
*** syncing lmiphay
 

-            32
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
*** synced lmiphay
 

-            33
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
 * Sync succeeded
 

-            34
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
$ git log --format=%ci -1
 

-            35
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
$ git show -q --pretty=format:%G? HEAD
 

-            36
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 lmiphay
 

-            37
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            38
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            39
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            40
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            41
warning: Pulling without specifying how to reconcile divergent branches is
-

-            42
discouraged. You can squelch this message by running one of the following
-

-            43
commands sometime before your next pull:
-

-            44
-

-            45
  git config pull.rebase false  # merge (the default strategy)
-

-            46
  git config pull.rebase true   # rebase
-

-            47
  git config pull.ff only       # fast-forward only
-

-            48
-

-            49
You can replace "git config" with "git config --global" to set a default
-

-            50
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            51
or --ff-only on the command line to override the configured default per
-

-            52
invocation.
-

-            53
-

-            54
Already up to date.
-

-            55
*** syncing lmiphay
-

-            56
*** synced lmiphay
-

-            57
 * Sync succeeded
-

-            58
$ git log --format=%ci -1
-

-            59
$ git show -q --pretty=format:%G? HEAD
-

-            60
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 lmiphay
-

-            61
 * Cache regenerated successfully
+            37
 * Cache regenerated successfully
 

 
         
diff --git a/lmiphay.txt b/lmiphay.txt
index c5c0eb1ed347..1572b4f9962e 100644
--- a/lmiphay.txt
+++ b/lmiphay.txt
@@ -9,35 +9,11 @@
              'uri': 'git://anongit.gentoo.org/user/lmiphay.git'}],
  'status': 'unofficial'}
 $ pmaint sync lmiphay
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:axs repo at '/var/lib/repo-mirror-ci/sync/axs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/lordvan.html b/lordvan.html
index 3a67e539aeef..552953fc2959 100644
--- a/lordvan.html
+++ b/lordvan.html
@@ -40,99 +40,59 @@
 

             15
$ pmaint sync lordvan
 

-            16
WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
warning: Pulling without specifying how to reconcile divergent branches is
 

-            22
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
discouraged. You can squelch this message by running one of the following
 

-            23
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
commands sometime before your next pull:
 

-            24
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 

-            25
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase false  # merge (the default strategy)
 

-            26
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.rebase true   # rebase
 

-            27
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.ff only       # fast-forward only
 

-            28
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
 

-            29
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
You can replace "git config" with "git config --global" to set a default
 

-            30
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            31
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
or --ff-only on the command line to override the configured default per
 

-            32
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
invocation.
 

-            33
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
 

-            34
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
Already up to date.
 

-            35
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
*** syncing lordvan
 

-            36
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
*** synced lordvan
 

-            37
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            37
 * Sync succeeded
 

-            38
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            38
$ git log --format=%ci -1
 

-            39
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            39
$ git show -q --pretty=format:%G? HEAD
 

-            40
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            40
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 lordvan
 

-            41
warning: Pulling without specifying how to reconcile divergent branches is
-

-            42
discouraged. You can squelch this message by running one of the following
-

-            43
commands sometime before your next pull:
-

-            44
-

-            45
  git config pull.rebase false  # merge (the default strategy)
-

-            46
  git config pull.rebase true   # rebase
-

-            47
  git config pull.ff only       # fast-forward only
-

-            48
-

-            49
You can replace "git config" with "git config --global" to set a default
-

-            50
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            51
or --ff-only on the command line to override the configured default per
-

-            52
invocation.
-

-            53
-

-            54
Already up to date.
-

-            55
*** syncing lordvan
-

-            56
*** synced lordvan
-

-            57
 * Sync succeeded
-

-            58
$ git log --format=%ci -1
-

-            59
$ git show -q --pretty=format:%G? HEAD
-

-            60
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 lordvan
-

-            61
 * net-mail/dbmail-3.1.9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            41
 * net-mail/dbmail-3.1.9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            62
 * Cache regen failed with 1
+            42
 * Cache regen failed with 1
 

 
         
diff --git a/lordvan.txt b/lordvan.txt
index 763ebb84d07c..f4a8a6795c91 100644
--- a/lordvan.txt
+++ b/lordvan.txt
@@ -13,31 +13,11 @@
              'uri': 'git+ssh://git@git.gentoo.org/dev/lordvan.git'}],
  'status': 'unofficial'}
 $ pmaint sync lordvan
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/lto-overlay.html b/lto-overlay.html
index cce2a3b15d03..68df9b11b2fd 100644
--- a/lto-overlay.html
+++ b/lto-overlay.html
@@ -40,89 +40,59 @@
 

             15
$ pmaint sync lto-overlay
 

-            16
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
warning: Pulling without specifying how to reconcile divergent branches is
 

-            23
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
discouraged. You can squelch this message by running one of the following
 

-            24
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
commands sometime before your next pull:
 

-            25
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 

-            26
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.rebase false  # merge (the default strategy)
 

-            27
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.rebase true   # rebase
 

-            28
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
  git config pull.ff only       # fast-forward only
 

-            29
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
 

-            30
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
You can replace "git config" with "git config --global" to set a default
 

-            31
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            32
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
or --ff-only on the command line to override the configured default per
 

-            33
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
invocation.
 

-            34
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
 

-            35
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
Already up to date.
 

-            36
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
*** syncing lto-overlay
 

-            37
warning: Pulling without specifying how to reconcile divergent branches is
+            37
*** synced lto-overlay
 

-            38
discouraged. You can squelch this message by running one of the following
+            38
 * Sync succeeded
 

-            39
commands sometime before your next pull:
+            39
$ git log --format=%ci -1
 

-            40
+            40
$ git show -q --pretty=format:%G? HEAD
 

-            41
  git config pull.rebase false  # merge (the default strategy)
+            41
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 lto-overlay
 

-            42
  git config pull.rebase true   # rebase
-

-            43
  git config pull.ff only       # fast-forward only
-

-            44
-

-            45
You can replace "git config" with "git config --global" to set a default
-

-            46
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            47
or --ff-only on the command line to override the configured default per
-

-            48
invocation.
-

-            49
-

-            50
Already up to date.
-

-            51
*** syncing lto-overlay
-

-            52
*** synced lto-overlay
-

-            53
 * Sync succeeded
-

-            54
$ git log --format=%ci -1
-

-            55
$ git show -q --pretty=format:%G? HEAD
-

-            56
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 lto-overlay
-

-            57
 * Cache regenerated successfully
+            42
 * Cache regenerated successfully
 

 
         
diff --git a/lto-overlay.txt b/lto-overlay.txt
index 31b3ad06b033..3c93d89e8e4f 100644
--- a/lto-overlay.txt
+++ b/lto-overlay.txt
@@ -13,27 +13,12 @@
              'uri': 'git+ssh://git@github.com:InBetweenNames/gentooLTO.git'}],
  'status': 'unofficial'}
 $ pmaint sync lto-overlay
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/lua.html b/lua.html
index 73cb3dc04b0d..ce30bd5c8a4c 100644
--- a/lua.html
+++ b/lua.html
@@ -40,89 +40,59 @@
 

             15
$ pmaint sync lua
 

-            16
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
warning: Pulling without specifying how to reconcile divergent branches is
 

-            23
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
discouraged. You can squelch this message by running one of the following
 

-            24
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
commands sometime before your next pull:
 

-            25
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 

-            26
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.rebase false  # merge (the default strategy)
 

-            27
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.rebase true   # rebase
 

-            28
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
  git config pull.ff only       # fast-forward only
 

-            29
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
 

-            30
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
You can replace "git config" with "git config --global" to set a default
 

-            31
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            32
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
or --ff-only on the command line to override the configured default per
 

-            33
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
invocation.
 

-            34
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
 

-            35
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
Already up to date.
 

-            36
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
*** syncing lua
 

-            37
warning: Pulling without specifying how to reconcile divergent branches is
+            37
*** synced lua
 

-            38
discouraged. You can squelch this message by running one of the following
+            38
 * Sync succeeded
 

-            39
commands sometime before your next pull:
+            39
$ git log --format=%ci -1
 

-            40
+            40
$ git show -q --pretty=format:%G? HEAD
 

-            41
  git config pull.rebase false  # merge (the default strategy)
+            41
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 lua
 

-            42
  git config pull.rebase true   # rebase
-

-            43
  git config pull.ff only       # fast-forward only
-

-            44
-

-            45
You can replace "git config" with "git config --global" to set a default
-

-            46
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            47
or --ff-only on the command line to override the configured default per
-

-            48
invocation.
-

-            49
-

-            50
Already up to date.
-

-            51
*** syncing lua
-

-            52
*** synced lua
-

-            53
 * Sync succeeded
-

-            54
$ git log --format=%ci -1
-

-            55
$ git show -q --pretty=format:%G? HEAD
-

-            56
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 lua
-

-            57
 * Cache regenerated successfully
+            42
 * Cache regenerated successfully
 

 
         
diff --git a/lua.txt b/lua.txt
index 9e62cc90edc7..6cf017ab17e3 100644
--- a/lua.txt
+++ b/lua.txt
@@ -13,27 +13,12 @@
              'uri': 'git+ssh://git@git.gentoo.org/proj/lua.git'}],
  'status': 'official'}
 $ pmaint sync lua
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/luke-jr.html b/luke-jr.html
index 72088648bd7c..153c031fa334 100644
--- a/luke-jr.html
+++ b/luke-jr.html
@@ -28,89 +28,59 @@
 

             9
$ pmaint sync luke-jr
 

-            10
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            10
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            11
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            11
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            12
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
warning: Pulling without specifying how to reconcile divergent branches is
 

-            17
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
discouraged. You can squelch this message by running one of the following
 

-            18
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
commands sometime before your next pull:
 

-            19
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
 

-            20
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
  git config pull.rebase false  # merge (the default strategy)
 

-            21
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
  git config pull.rebase true   # rebase
 

-            22
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.ff only       # fast-forward only
 

-            23
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
 

-            24
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
You can replace "git config" with "git config --global" to set a default
 

-            25
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            26
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
or --ff-only on the command line to override the configured default per
 

-            27
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
invocation.
 

-            28
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
 

-            29
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
Already up to date.
 

-            30
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
*** syncing luke-jr
 

-            31
warning: Pulling without specifying how to reconcile divergent branches is
+            31
*** synced luke-jr
 

-            32
discouraged. You can squelch this message by running one of the following
+            32
 * Sync succeeded
 

-            33
commands sometime before your next pull:
+            33
$ git log --format=%ci -1
 

-            34
+            34
$ git show -q --pretty=format:%G? HEAD
 

-            35
  git config pull.rebase false  # merge (the default strategy)
+            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 luke-jr
 

-            36
  git config pull.rebase true   # rebase
-

-            37
  git config pull.ff only       # fast-forward only
-

-            38
-

-            39
You can replace "git config" with "git config --global" to set a default
-

-            40
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            41
or --ff-only on the command line to override the configured default per
-

-            42
invocation.
-

-            43
-

-            44
Already up to date.
-

-            45
*** syncing luke-jr
-

-            46
*** synced luke-jr
-

-            47
 * Sync succeeded
-

-            48
$ git log --format=%ci -1
-

-            49
$ git show -q --pretty=format:%G? HEAD
-

-            50
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 luke-jr
-

-            51
 * Cache regenerated successfully
+            36
 * Cache regenerated successfully
 

 
         
diff --git a/luke-jr.txt b/luke-jr.txt
index d938e82e951c..c630e18d2047 100644
--- a/luke-jr.txt
+++ b/luke-jr.txt
@@ -7,27 +7,12 @@
              'uri': 'https://scm.dashjr.org/scmroot/git/portage-overlays/luke-jr'}],
  'status': 'unofficial'}
 $ pmaint sync luke-jr
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/luxifer.html b/luxifer.html
index 8582e0771bd6..d919b43d7986 100644
--- a/luxifer.html
+++ b/luxifer.html
@@ -32,89 +32,59 @@
 

             11
$ pmaint sync luxifer
 

-            12
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
warning: Pulling without specifying how to reconcile divergent branches is
 

-            19
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
discouraged. You can squelch this message by running one of the following
 

-            20
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
commands sometime before your next pull:
 

-            21
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
 

-            22
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase false  # merge (the default strategy)
 

-            23
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase true   # rebase
 

-            24
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.ff only       # fast-forward only
 

-            25
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 

-            26
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
You can replace "git config" with "git config --global" to set a default
 

-            27
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            28
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
or --ff-only on the command line to override the configured default per
 

-            29
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
invocation.
 

-            30
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
 

-            31
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
Already up to date.
 

-            32
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
*** syncing luxifer
 

-            33
warning: Pulling without specifying how to reconcile divergent branches is
+            33
*** synced luxifer
 

-            34
discouraged. You can squelch this message by running one of the following
+            34
 * Sync succeeded
 

-            35
commands sometime before your next pull:
+            35
$ git log --format=%ci -1
 

-            36
+            36
$ git show -q --pretty=format:%G? HEAD
 

-            37
  git config pull.rebase false  # merge (the default strategy)
+            37
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 luxifer
 

-            38
  git config pull.rebase true   # rebase
-

-            39
  git config pull.ff only       # fast-forward only
-

-            40
-

-            41
You can replace "git config" with "git config --global" to set a default
-

-            42
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            43
or --ff-only on the command line to override the configured default per
-

-            44
invocation.
-

-            45
-

-            46
Already up to date.
-

-            47
*** syncing luxifer
-

-            48
*** synced luxifer
-

-            49
 * Sync succeeded
-

-            50
$ git log --format=%ci -1
-

-            51
$ git show -q --pretty=format:%G? HEAD
-

-            52
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 luxifer
-

-            53
 * Cache regenerated successfully
+            38
 * Cache regenerated successfully
 

 
         
diff --git a/luxifer.txt b/luxifer.txt
index bb8a122ec933..23fef09e16c8 100644
--- a/luxifer.txt
+++ b/luxifer.txt
@@ -9,27 +9,12 @@
  'source': [{'type': 'git', 'uri': 'https://github.com/luxifr/olgentoo.git'}],
  'status': 'unofficial'}
 $ pmaint sync luxifer
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/lxde-gtk3.html b/lxde-gtk3.html
index b775ea3f28c2..6ee55bce8972 100644
--- a/lxde-gtk3.html
+++ b/lxde-gtk3.html
@@ -42,95 +42,65 @@
 

             16
$ pmaint sync lxde-gtk3
 

-            17
WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            23
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
warning: Pulling without specifying how to reconcile divergent branches is
 

-            24
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
discouraged. You can squelch this message by running one of the following
 

-            25
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
commands sometime before your next pull:
 

-            26
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
 

-            27
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.rebase false  # merge (the default strategy)
 

-            28
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
  git config pull.rebase true   # rebase
 

-            29
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
  git config pull.ff only       # fast-forward only
 

-            30
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
 

-            31
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
You can replace "git config" with "git config --global" to set a default
 

-            32
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            33
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
or --ff-only on the command line to override the configured default per
 

-            34
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
invocation.
 

-            35
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
 

-            36
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
Already up to date.
 

-            37
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            37
*** syncing lxde-gtk3
 

-            38
warning: Pulling without specifying how to reconcile divergent branches is
+            38
*** synced lxde-gtk3
 

-            39
discouraged. You can squelch this message by running one of the following
+            39
 * Sync succeeded
 

-            40
commands sometime before your next pull:
+            40
$ git log --format=%ci -1
 

-            41
+            41
$ git show -q --pretty=format:%G? HEAD
 

-            42
  git config pull.rebase false  # merge (the default strategy)
+            42
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 lxde-gtk3
 

-            43
  git config pull.rebase true   # rebase
-

-            44
  git config pull.ff only       # fast-forward only
-

-            45
-

-            46
You can replace "git config" with "git config --global" to set a default
-

-            47
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            48
or --ff-only on the command line to override the configured default per
-

-            49
invocation.
-

-            50
-

-            51
Already up to date.
-

-            52
*** syncing lxde-gtk3
-

-            53
*** synced lxde-gtk3
-

-            54
 * Sync succeeded
-

-            55
$ git log --format=%ci -1
-

-            56
$ git show -q --pretty=format:%G? HEAD
-

-            57
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 lxde-gtk3
-

-            58
 * unity-base/unity-gtk-module-9999: failed sourcing ebuild: inherit requires unknown eclass: bzr.eclass
+            43
 * unity-base/unity-gtk-module-9999: failed sourcing ebuild: inherit requires unknown eclass: bzr.eclass
 
[FATAL]
-            59
 * x11-libs/bamf-9999: failed sourcing ebuild: inherit requires unknown eclass: bzr.eclass
+            44
 * x11-libs/bamf-9999: failed sourcing ebuild: inherit requires unknown eclass: bzr.eclass
 
[FATAL]
-            60
 * x11-misc/obconf-9999: failed sourcing ebuild: Unsupported EAPI=2 (obsolete) for git-r3
+            45
 * x11-misc/obconf-9999: failed sourcing ebuild: Unsupported EAPI=2 (obsolete) for git-r3
 
[FATAL]
-            61
 * Cache regen failed with 1
+            46
 * Cache regen failed with 1
 

 
         
diff --git a/lxde-gtk3.txt b/lxde-gtk3.txt
index da8fbfa42800..7e17d0b9d372 100644
--- a/lxde-gtk3.txt
+++ b/lxde-gtk3.txt
@@ -14,27 +14,12 @@
              'uri': 'git@github.com:rilian-la-te/lxde-gtk3-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync lxde-gtk3
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/maekke.html b/maekke.html
index 81cec4d27447..d33cee0d32a8 100644
--- a/maekke.html
+++ b/maekke.html
@@ -40,101 +40,57 @@
 

             15
$ pmaint sync maekke
 

-            16
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
warning: Pulling without specifying how to reconcile divergent branches is
 

-            22
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
discouraged. You can squelch this message by running one of the following
 

-            23
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
commands sometime before your next pull:
 

-            24
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 

-            25
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase false  # merge (the default strategy)
 

-            26
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.rebase true   # rebase
 

-            27
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.ff only       # fast-forward only
 

-            28
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
 

-            29
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
You can replace "git config" with "git config --global" to set a default
 

-            30
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            31
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
or --ff-only on the command line to override the configured default per
 

-            32
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
invocation.
 

-            33
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
 

-            34
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
Already up to date.
 

-            35
warning: Pulling without specifying how to reconcile divergent branches is
+            35
*** syncing maekke
 

-            36
discouraged. You can squelch this message by running one of the following
+            36
*** synced maekke
 

-            37
commands sometime before your next pull:
+            37
 * Sync succeeded
 

-            38
+            38
$ git log --format=%ci -1
 

-            39
  git config pull.rebase false  # merge (the default strategy)
+            39
$ git show -q --pretty=format:%G? HEAD
 

-            40
  git config pull.rebase true   # rebase
+            40
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 maekke
 

-            41
  git config pull.ff only       # fast-forward only
-

-            42
-

-            43
You can replace "git config" with "git config --global" to set a default
-

-            44
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            45
or --ff-only on the command line to override the configured default per
-

-            46
invocation.
-

-            47
-

-            48
fatal: unable to access 'https://anongit.gentoo.org/git/dev/maekke.git/': The requested URL returned error: 504
-

-            49
*** syncing maekke
-

-            50
!!! failed syncing maekke
-

-            51
 * Sync failed with 1
-
[FATAL]
-            52
 * Will try to re-create
-

-            53
$ pmaint sync maekke
-

-            54
WARNING:pkgcore:mschiff repo at '/var/lib/repo-mirror-ci/sync/mschiff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            55
WARNING:pkgcore:wbrana repo at '/var/lib/repo-mirror-ci/sync/wbrana', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            56
Cloning into '/var/lib/repo-mirror-ci/sync/maekke'...
-

-            57
*** syncing maekke
-

-            58
*** synced maekke
-

-            59
 * Sync succeeded after re-adding
-

-            60
$ git log --format=%ci -1
-

-            61
$ git show -q --pretty=format:%G? HEAD
-

-            62
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 maekke
-

-            63
 * Cache regenerated successfully
+            41
 * Cache regenerated successfully
 

 
         
diff --git a/maekke.txt b/maekke.txt
index 43df27573c68..0e8461e1da2a 100644
--- a/maekke.txt
+++ b/maekke.txt
@@ -13,25 +13,11 @@
              'uri': 'git+ssh://git@git.gentoo.org/dev/maekke.git'}],
  'status': 'official'}
 $ pmaint sync maekke
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
@@ -45,18 +31,10 @@ 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.
 
-fatal: unable to access 'https://anongit.gentoo.org/git/dev/maekke.git/': The requested URL returned error: 504
-*** syncing maekke
-!!! failed syncing maekke
- * Sync failed with 1
- * Will try to re-create
-$ pmaint sync maekke
-WARNING:pkgcore:mschiff repo at '/var/lib/repo-mirror-ci/sync/mschiff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wbrana repo at '/var/lib/repo-mirror-ci/sync/wbrana', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-Cloning into '/var/lib/repo-mirror-ci/sync/maekke'...
+Already up to date.
 *** syncing maekke
 *** synced maekke
- * Sync succeeded after re-adding
+ * Sync succeeded
 $ git log --format=%ci -1
 $ git show -q --pretty=format:%G? HEAD
 $ pmaint regen --use-local-desc --pkg-desc-index -t 1 maekke
diff --git a/maggu2810-overlay.html b/maggu2810-overlay.html
index 20af9097e7c3..b754c372574b 100644
--- a/maggu2810-overlay.html
+++ b/maggu2810-overlay.html
@@ -38,85 +38,57 @@
 

             14
$ pmaint sync maggu2810-overlay
 

-            15
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
warning: Pulling without specifying how to reconcile divergent branches is
 

-            21
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
discouraged. You can squelch this message by running one of the following
 

-            22
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
commands sometime before your next pull:
 

-            23
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
 

-            24
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.rebase false  # merge (the default strategy)
 

-            25
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase true   # rebase
 

-            26
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.ff only       # fast-forward only
 

-            27
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
 

-            28
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
You can replace "git config" with "git config --global" to set a default
 

-            29
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            30
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
or --ff-only on the command line to override the configured default per
 

-            31
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
invocation.
 

-            32
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
 

-            33
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
Already up to date.
 

-            34
warning: Pulling without specifying how to reconcile divergent branches is
+            34
*** syncing maggu2810-overlay
 

-            35
discouraged. You can squelch this message by running one of the following
+            35
*** synced maggu2810-overlay
 

-            36
commands sometime before your next pull:
+            36
 * Sync succeeded
 

-            37
+            37
$ git log --format=%ci -1
 

-            38
  git config pull.rebase false  # merge (the default strategy)
+            38
$ git show -q --pretty=format:%G? HEAD
 

-            39
  git config pull.rebase true   # rebase
+            39
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 maggu2810-overlay
 

-            40
  git config pull.ff only       # fast-forward only
-

-            41
-

-            42
You can replace "git config" with "git config --global" to set a default
-

-            43
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            44
or --ff-only on the command line to override the configured default per
-

-            45
invocation.
-

-            46
-

-            47
Already up to date.
-

-            48
*** syncing maggu2810-overlay
-

-            49
*** synced maggu2810-overlay
-

-            50
 * Sync succeeded
-

-            51
$ git log --format=%ci -1
-

-            52
$ git show -q --pretty=format:%G? HEAD
-

-            53
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 maggu2810-overlay
-

-            54
 * Cache regenerated successfully
+            40
 * Cache regenerated successfully
 

 
         
diff --git a/maggu2810-overlay.txt b/maggu2810-overlay.txt
index 1369099fe8f0..95821dc93937 100644
--- a/maggu2810-overlay.txt
+++ b/maggu2810-overlay.txt
@@ -12,25 +12,11 @@
              'uri': 'https://github.com/maggu2810/maggu2810-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync maggu2810-overlay
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/mate-de-gentoo.html b/mate-de-gentoo.html
index ffab9f9ee180..2f67c05abe38 100644
--- a/mate-de-gentoo.html
+++ b/mate-de-gentoo.html
@@ -32,85 +32,57 @@
 

             11
$ pmaint sync mate-de-gentoo
 

-            12
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
warning: Pulling without specifying how to reconcile divergent branches is
 

-            18
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
discouraged. You can squelch this message by running one of the following
 

-            19
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
commands sometime before your next pull:
 

-            20
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
 

-            21
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
  git config pull.rebase false  # merge (the default strategy)
 

-            22
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase true   # rebase
 

-            23
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.ff only       # fast-forward only
 

-            24
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 

-            25
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
You can replace "git config" with "git config --global" to set a default
 

-            26
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            27
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
or --ff-only on the command line to override the configured default per
 

-            28
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
invocation.
 

-            29
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
 

-            30
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
Already up to date.
 

-            31
warning: Pulling without specifying how to reconcile divergent branches is
+            31
*** syncing mate-de-gentoo
 

-            32
discouraged. You can squelch this message by running one of the following
+            32
*** synced mate-de-gentoo
 

-            33
commands sometime before your next pull:
+            33
 * Sync succeeded
 

-            34
+            34
$ git log --format=%ci -1
 

-            35
  git config pull.rebase false  # merge (the default strategy)
+            35
$ git show -q --pretty=format:%G? HEAD
 

-            36
  git config pull.rebase true   # rebase
+            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 mate-de-gentoo
 

-            37
  git config pull.ff only       # fast-forward only
-

-            38
-

-            39
You can replace "git config" with "git config --global" to set a default
-

-            40
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            41
or --ff-only on the command line to override the configured default per
-

-            42
invocation.
-

-            43
-

-            44
Already up to date.
-

-            45
*** syncing mate-de-gentoo
-

-            46
*** synced mate-de-gentoo
-

-            47
 * Sync succeeded
-

-            48
$ git log --format=%ci -1
-

-            49
$ git show -q --pretty=format:%G? HEAD
-

-            50
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 mate-de-gentoo
-

-            51
 * Cache regenerated successfully
+            37
 * Cache regenerated successfully
 

 
         
diff --git a/mate-de-gentoo.txt b/mate-de-gentoo.txt
index 86ecfad9c14f..eab820291d8d 100644
--- a/mate-de-gentoo.txt
+++ b/mate-de-gentoo.txt
@@ -9,25 +9,11 @@
              'uri': 'https://github.com/oz123/mate-de-gentoo.git'}],
  'status': 'unofficial'}
 $ pmaint sync mate-de-gentoo
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/matrix.html b/matrix.html
index 439d9c1495b3..38daab2111bb 100644
--- a/matrix.html
+++ b/matrix.html
@@ -46,90 +46,42 @@
 

             18
$ pmaint sync matrix
 

-            19
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            23
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

             24
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            25
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            26
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            27
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            28
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            29
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
Cloning into '/var/lib/repo-mirror-ci/sync/matrix'...
 

-            30
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
*** syncing matrix
 

-            31
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
*** synced matrix
 

-            32
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
 * Sync succeeded
 

-            33
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
$ git log --format=%ci -1
 

-            34
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
$ git show -q --pretty=format:%G? HEAD
 

-            35
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 matrix
 

-            36
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
 * Cache regenerated successfully
 

-            37
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            38
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            39
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            40
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            41
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            42
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            43
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            44
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            45
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            46
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            47
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            48
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            49
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            50
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            51
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            52
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            53
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            54
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            55
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            56
Cloning into '/var/lib/repo-mirror-ci/sync/matrix'...
-

-            57
fatal: unable to access 'https://anongit.gentoo.org/git/repo/proj/matrix.git/': The requested URL returned error: 504
-

-            58
*** syncing matrix
-

-            59
!!! failed syncing matrix
-

-            60
 * Sync failed with 1
-
[FATAL]
 
         
     
diff --git a/matrix.txt b/matrix.txt
index 8583c402b059..16c3b880b54b 100644
--- a/matrix.txt
+++ b/matrix.txt
@@ -16,45 +16,21 @@
  'status': 'official'}
  * Adding new repository
 $ pmaint sync matrix
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 Cloning into '/var/lib/repo-mirror-ci/sync/matrix'...
-fatal: unable to access 'https://anongit.gentoo.org/git/repo/proj/matrix.git/': The requested URL returned error: 504
 *** syncing matrix
-!!! failed syncing matrix
- * Sync failed with 1
+*** synced matrix
+ * Sync succeeded
+$ git log --format=%ci -1
+$ git show -q --pretty=format:%G? HEAD
+$ pmaint regen --use-local-desc --pkg-desc-index -t 1 matrix
+ * Cache regenerated successfully
diff --git a/megacoffee.html b/megacoffee.html
index aa704a6216b7..82f1a5b38bcd 100644
--- a/megacoffee.html
+++ b/megacoffee.html
@@ -56,85 +56,57 @@
 

             23
$ pmaint sync megacoffee
 

-            24
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            25
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            26
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            27
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            28
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            29
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
warning: Pulling without specifying how to reconcile divergent branches is
 

-            30
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
discouraged. You can squelch this message by running one of the following
 

-            31
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
commands sometime before your next pull:
 

-            32
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
 

-            33
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
  git config pull.rebase false  # merge (the default strategy)
 

-            34
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
  git config pull.rebase true   # rebase
 

-            35
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
  git config pull.ff only       # fast-forward only
 

-            36
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
 

-            37
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            37
You can replace "git config" with "git config --global" to set a default
 

-            38
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            38
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            39
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            39
or --ff-only on the command line to override the configured default per
 

-            40
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            40
invocation.
 

-            41
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            41
 

-            42
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            42
Already up to date.
 

-            43
warning: Pulling without specifying how to reconcile divergent branches is
+            43
*** syncing megacoffee
 

-            44
discouraged. You can squelch this message by running one of the following
+            44
*** synced megacoffee
 

-            45
commands sometime before your next pull:
+            45
 * Sync succeeded
 

-            46
+            46
$ git log --format=%ci -1
 

-            47
  git config pull.rebase false  # merge (the default strategy)
+            47
$ git show -q --pretty=format:%G? HEAD
 

-            48
  git config pull.rebase true   # rebase
+            48
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 megacoffee
 

-            49
  git config pull.ff only       # fast-forward only
-

-            50
-

-            51
You can replace "git config" with "git config --global" to set a default
-

-            52
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            53
or --ff-only on the command line to override the configured default per
-

-            54
invocation.
-

-            55
-

-            56
Already up to date.
-

-            57
*** syncing megacoffee
-

-            58
*** synced megacoffee
-

-            59
 * Sync succeeded
-

-            60
$ git log --format=%ci -1
-

-            61
$ git show -q --pretty=format:%G? HEAD
-

-            62
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 megacoffee
-

-            63
 * Cache regenerated successfully
+            49
 * Cache regenerated successfully
 

 
         
diff --git a/megacoffee.txt b/megacoffee.txt
index 557a6c0c5ef0..08dd2f122f2a 100644
--- a/megacoffee.txt
+++ b/megacoffee.txt
@@ -21,25 +21,11 @@
              'uri': 'https://gitlab.megacoffee.net/gentoo-overlay/megacoffee-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync megacoffee
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/menelkir.html b/menelkir.html
index deaec0e1189c..0b4c46164955 100644
--- a/menelkir.html
+++ b/menelkir.html
@@ -38,85 +38,57 @@
 

             14
$ pmaint sync menelkir
 

-            15
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
warning: Pulling without specifying how to reconcile divergent branches is
 

-            21
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
discouraged. You can squelch this message by running one of the following
 

-            22
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
commands sometime before your next pull:
 

-            23
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
 

-            24
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.rebase false  # merge (the default strategy)
 

-            25
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase true   # rebase
 

-            26
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.ff only       # fast-forward only
 

-            27
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
 

-            28
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
You can replace "git config" with "git config --global" to set a default
 

-            29
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            30
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
or --ff-only on the command line to override the configured default per
 

-            31
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
invocation.
 

-            32
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
 

-            33
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
Already up to date.
 

-            34
warning: Pulling without specifying how to reconcile divergent branches is
+            34
*** syncing menelkir
 

-            35
discouraged. You can squelch this message by running one of the following
+            35
*** synced menelkir
 

-            36
commands sometime before your next pull:
+            36
 * Sync succeeded
 

-            37
+            37
$ git log --format=%ci -1
 

-            38
  git config pull.rebase false  # merge (the default strategy)
+            38
$ git show -q --pretty=format:%G? HEAD
 

-            39
  git config pull.rebase true   # rebase
+            39
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 menelkir
 

-            40
  git config pull.ff only       # fast-forward only
-

-            41
-

-            42
You can replace "git config" with "git config --global" to set a default
-

-            43
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            44
or --ff-only on the command line to override the configured default per
-

-            45
invocation.
-

-            46
-

-            47
Already up to date.
-

-            48
*** syncing menelkir
-

-            49
*** synced menelkir
-

-            50
 * Sync succeeded
-

-            51
$ git log --format=%ci -1
-

-            52
$ git show -q --pretty=format:%G? HEAD
-

-            53
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 menelkir
-

-            54
 * Cache regenerated successfully
+            40
 * Cache regenerated successfully
 

 
         
diff --git a/menelkir.txt b/menelkir.txt
index 50c42a8daf4c..836e3ec5161c 100644
--- a/menelkir.txt
+++ b/menelkir.txt
@@ -12,25 +12,11 @@
              'uri': 'git+ssh://git@gitlab.com/menelkir/gentoo-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync menelkir
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/metahax.html b/metahax.html
index ad2d9eb52894..b4b9ca44b207 100644
--- a/metahax.html
+++ b/metahax.html
@@ -34,85 +34,57 @@
 

             12
$ pmaint sync metahax
 

-            13
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
warning: Pulling without specifying how to reconcile divergent branches is
 

-            19
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
discouraged. You can squelch this message by running one of the following
 

-            20
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
commands sometime before your next pull:
 

-            21
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
 

-            22
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase false  # merge (the default strategy)
 

-            23
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase true   # rebase
 

-            24
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.ff only       # fast-forward only
 

-            25
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 

-            26
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
You can replace "git config" with "git config --global" to set a default
 

-            27
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            28
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
or --ff-only on the command line to override the configured default per
 

-            29
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
invocation.
 

-            30
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
 

-            31
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
Already up to date.
 

-            32
warning: Pulling without specifying how to reconcile divergent branches is
+            32
*** syncing metahax
 

-            33
discouraged. You can squelch this message by running one of the following
+            33
*** synced metahax
 

-            34
commands sometime before your next pull:
+            34
 * Sync succeeded
 

-            35
+            35
$ git log --format=%ci -1
 

-            36
  git config pull.rebase false  # merge (the default strategy)
+            36
$ git show -q --pretty=format:%G? HEAD
 

-            37
  git config pull.rebase true   # rebase
+            37
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 metahax
 

-            38
  git config pull.ff only       # fast-forward only
-

-            39
-

-            40
You can replace "git config" with "git config --global" to set a default
-

-            41
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            42
or --ff-only on the command line to override the configured default per
-

-            43
invocation.
-

-            44
-

-            45
Already up to date.
-

-            46
*** syncing metahax
-

-            47
*** synced metahax
-

-            48
 * Sync succeeded
-

-            49
$ git log --format=%ci -1
-

-            50
$ git show -q --pretty=format:%G? HEAD
-

-            51
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 metahax
-

-            52
 * Cache regenerated successfully
+            38
 * Cache regenerated successfully
 

 
         
diff --git a/metahax.txt b/metahax.txt
index e451c4bd244f..c1dbcfa985b5 100644
--- a/metahax.txt
+++ b/metahax.txt
@@ -10,25 +10,11 @@
              'uri': 'https://github.com/metafarion/metahax.git'}],
  'status': 'unofficial'}
 $ pmaint sync metahax
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/mgorny.html b/mgorny.html
index dfd7cb685380..ffe3202120e1 100644
--- a/mgorny.html
+++ b/mgorny.html
@@ -42,97 +42,55 @@
 

             16
$ pmaint sync mgorny
 

-            17
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
warning: Pulling without specifying how to reconcile divergent branches is
 

-            22
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
discouraged. You can squelch this message by running one of the following
 

-            23
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
commands sometime before your next pull:
 

-            24
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 

-            25
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase false  # merge (the default strategy)
 

-            26
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.rebase true   # rebase
 

-            27
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.ff only       # fast-forward only
 

-            28
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
 

-            29
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
You can replace "git config" with "git config --global" to set a default
 

-            30
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            31
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
or --ff-only on the command line to override the configured default per
 

-            32
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
invocation.
 

-            33
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
 

-            34
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
Already up to date.
 

-            35
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
*** syncing mgorny
 

-            36
warning: Pulling without specifying how to reconcile divergent branches is
+            36
*** synced mgorny
 

-            37
discouraged. You can squelch this message by running one of the following
+            37
 * Sync succeeded
 

-            38
commands sometime before your next pull:
+            38
$ git log --format=%ci -1
 

-            39
+            39
$ git show -q --pretty=format:%G? HEAD
 

-            40
  git config pull.rebase false  # merge (the default strategy)
+            40
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 mgorny
 

-            41
  git config pull.rebase true   # rebase
-

-            42
  git config pull.ff only       # fast-forward only
-

-            43
-

-            44
You can replace "git config" with "git config --global" to set a default
-

-            45
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            46
or --ff-only on the command line to override the configured default per
-

-            47
invocation.
-

-            48
-

-            49
fatal: unable to access 'https://anongit.gentoo.org/git/repo/dev/mgorny.git/': The requested URL returned error: 504
-

-            50
*** syncing mgorny
-

-            51
!!! failed syncing mgorny
-

-            52
 * Sync failed with 1
-
[FATAL]
-            53
 * Will try to re-create
-

-            54
$ pmaint sync mgorny
-

-            55
Cloning into '/var/lib/repo-mirror-ci/sync/mgorny'...
-

-            56
*** syncing mgorny
-

-            57
*** synced mgorny
-

-            58
 * Sync succeeded after re-adding
-

-            59
$ git log --format=%ci -1
-

-            60
$ git show -q --pretty=format:%G? HEAD
-

-            61
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 mgorny
-

-            62
 * Cache regenerated successfully
+            41
 * Cache regenerated successfully
 

 
         
diff --git a/mgorny.txt b/mgorny.txt
index 0dd5d5801d21..a1dd33da0d08 100644
--- a/mgorny.txt
+++ b/mgorny.txt
@@ -14,25 +14,10 @@
              'uri': 'git+ssh://git@git.gentoo.org/repo/dev/mgorny.git'}],
  'status': 'official'}
 $ pmaint sync mgorny
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
@@ -46,16 +31,10 @@ 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.
 
-fatal: unable to access 'https://anongit.gentoo.org/git/repo/dev/mgorny.git/': The requested URL returned error: 504
-*** syncing mgorny
-!!! failed syncing mgorny
- * Sync failed with 1
- * Will try to re-create
-$ pmaint sync mgorny
-Cloning into '/var/lib/repo-mirror-ci/sync/mgorny'...
+Already up to date.
 *** syncing mgorny
 *** synced mgorny
- * Sync succeeded after re-adding
+ * Sync succeeded
 $ git log --format=%ci -1
 $ git show -q --pretty=format:%G? HEAD
 $ pmaint regen --use-local-desc --pkg-desc-index -t 1 mgorny
diff --git a/milos-rs.html b/milos-rs.html
index f0bb37c90ddf..36d6fcdf548c 100644
--- a/milos-rs.html
+++ b/milos-rs.html
@@ -34,87 +34,57 @@
 

             12
$ pmaint sync milos-rs
 

-            13
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
warning: Pulling without specifying how to reconcile divergent branches is
 

-            19
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
discouraged. You can squelch this message by running one of the following
 

-            20
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
commands sometime before your next pull:
 

-            21
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
 

-            22
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase false  # merge (the default strategy)
 

-            23
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase true   # rebase
 

-            24
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.ff only       # fast-forward only
 

-            25
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 

-            26
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
You can replace "git config" with "git config --global" to set a default
 

-            27
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            28
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
or --ff-only on the command line to override the configured default per
 

-            29
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
invocation.
 

-            30
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
 

-            31
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
Already up to date.
 

-            32
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
*** syncing milos-rs
 

-            33
warning: Pulling without specifying how to reconcile divergent branches is
+            33
*** synced milos-rs
 

-            34
discouraged. You can squelch this message by running one of the following
+            34
 * Sync succeeded
 

-            35
commands sometime before your next pull:
+            35
$ git log --format=%ci -1
 

-            36
+            36
$ git show -q --pretty=format:%G? HEAD
 

-            37
  git config pull.rebase false  # merge (the default strategy)
+            37
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 milos-rs
 

-            38
  git config pull.rebase true   # rebase
-

-            39
  git config pull.ff only       # fast-forward only
-

-            40
-

-            41
You can replace "git config" with "git config --global" to set a default
-

-            42
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            43
or --ff-only on the command line to override the configured default per
-

-            44
invocation.
-

-            45
-

-            46
Already up to date.
-

-            47
*** syncing milos-rs
-

-            48
*** synced milos-rs
-

-            49
 * Sync succeeded
-

-            50
$ git log --format=%ci -1
-

-            51
$ git show -q --pretty=format:%G? HEAD
-

-            52
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 milos-rs
-

-            53
 * Cache regenerated successfully
+            38
 * Cache regenerated successfully
 

 
         
diff --git a/milos-rs.txt b/milos-rs.txt
index ab99aaa9e1d5..1936112f0096 100644
--- a/milos-rs.txt
+++ b/milos-rs.txt
@@ -10,26 +10,11 @@
              'uri': 'https://github.com/milos-rs/gentoo-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync milos-rs
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/miramir.html b/miramir.html
index 3c5ab6364aa5..fce9fb23566d 100644
--- a/miramir.html
+++ b/miramir.html
@@ -30,87 +30,57 @@
 

             10
$ pmaint sync miramir
 

-            11
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            11
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            12
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
warning: Pulling without specifying how to reconcile divergent branches is
 

-            17
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
discouraged. You can squelch this message by running one of the following
 

-            18
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
commands sometime before your next pull:
 

-            19
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
 

-            20
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
  git config pull.rebase false  # merge (the default strategy)
 

-            21
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
  git config pull.rebase true   # rebase
 

-            22
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.ff only       # fast-forward only
 

-            23
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
 

-            24
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
You can replace "git config" with "git config --global" to set a default
 

-            25
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            26
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
or --ff-only on the command line to override the configured default per
 

-            27
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
invocation.
 

-            28
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
 

-            29
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
Already up to date.
 

-            30
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
*** syncing miramir
 

-            31
warning: Pulling without specifying how to reconcile divergent branches is
+            31
*** synced miramir
 

-            32
discouraged. You can squelch this message by running one of the following
+            32
 * Sync succeeded
 

-            33
commands sometime before your next pull:
+            33
$ git log --format=%ci -1
 

-            34
+            34
$ git show -q --pretty=format:%G? HEAD
 

-            35
  git config pull.rebase false  # merge (the default strategy)
+            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 miramir
 

-            36
  git config pull.rebase true   # rebase
-

-            37
  git config pull.ff only       # fast-forward only
-

-            38
-

-            39
You can replace "git config" with "git config --global" to set a default
-

-            40
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            41
or --ff-only on the command line to override the configured default per
-

-            42
invocation.
-

-            43
-

-            44
Already up to date.
-

-            45
*** syncing miramir
-

-            46
*** synced miramir
-

-            47
 * Sync succeeded
-

-            48
$ git log --format=%ci -1
-

-            49
$ git show -q --pretty=format:%G? HEAD
-

-            50
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 miramir
-

-            51
 * Cache regenerated successfully
+            36
 * Cache regenerated successfully
 

 
         
diff --git a/miramir.txt b/miramir.txt
index 2f32886b9341..fbec80ddc29f 100644
--- a/miramir.txt
+++ b/miramir.txt
@@ -8,26 +8,11 @@
              'uri': 'https://github.com/miramir/miramir-layman.git'}],
  'status': 'unofficial'}
 $ pmaint sync miramir
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/mkeyoverlay.html b/mkeyoverlay.html
index 91fa9508f8ba..c7722defed7e 100644
--- a/mkeyoverlay.html
+++ b/mkeyoverlay.html
@@ -42,89 +42,33 @@
 

             16
$ pmaint sync mkeyoverlay
 

-            17
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

             22
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            23
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            24
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            25
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            26
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            27
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
abort: HTTP Error 404: Not Found
 

-            28
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
*** syncing mkeyoverlay
 

-            29
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
!!! failed syncing mkeyoverlay
 

-            30
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            31
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            32
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            33
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            34
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            35
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            36
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            37
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            38
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            39
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            40
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            41
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            42
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            43
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            44
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            45
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            46
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            47
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            48
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            49
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            50
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            51
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            52
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            53
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            54
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            55
abort: HTTP Error 404: Not Found
-

-            56
*** syncing mkeyoverlay
-

-            57
!!! failed syncing mkeyoverlay
-

-            58
 * Sync failed with 1
+            30
 * Sync failed with 1
 
[FATAL]
 
         
diff --git a/mkeyoverlay.txt b/mkeyoverlay.txt
index 1f4b634b1d51..ad8fd1222dce 100644
--- a/mkeyoverlay.txt
+++ b/mkeyoverlay.txt
@@ -14,42 +14,14 @@
  'status': 'unofficial'}
  * Adding new repository
 $ pmaint sync mkeyoverlay
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 abort: HTTP Error 404: Not Found
diff --git a/mklich.html b/mklich.html
index 5d5b43ec4b2d..512a5a6dad2b 100644
--- a/mklich.html
+++ b/mklich.html
@@ -38,101 +38,59 @@
 

             14
 'status': 'unofficial'}
 

-            15
 * Adding new repository
+            15
$ pmaint sync mklich
 

-            16
$ pmaint sync mklich
+            16
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
warning: Pulling without specifying how to reconcile divergent branches is
 

-            22
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
discouraged. You can squelch this message by running one of the following
 

-            23
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
commands sometime before your next pull:
 

-            24
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 

-            25
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase false  # merge (the default strategy)
 

-            26
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.rebase true   # rebase
 

-            27
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.ff only       # fast-forward only
 

-            28
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
 

-            29
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
You can replace "git config" with "git config --global" to set a default
 

-            30
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            31
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
or --ff-only on the command line to override the configured default per
 

-            32
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
invocation.
 

-            33
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
 

-            34
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
Already up to date.
 

-            35
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
*** syncing mklich
 

-            36
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
*** synced mklich
 

-            37
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            37
 * Sync succeeded
 

-            38
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            38
$ git log --format=%ci -1
 

-            39
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            39
$ git show -q --pretty=format:%G? HEAD
 

-            40
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            40
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 mklich
 

-            41
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            42
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            43
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            44
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            45
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            46
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            47
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            48
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            49
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            50
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            51
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            52
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            53
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            54
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            55
Cloning into '/var/lib/repo-mirror-ci/sync/mklich'...
-

-            56
*** syncing mklich
-

-            57
*** synced mklich
-

-            58
 * Sync succeeded
-

-            59
$ git log --format=%ci -1
-

-            60
$ git show -q --pretty=format:%G? HEAD
-

-            61
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 mklich
-

-            62
 * Cache regenerated successfully
+            41
 * Cache regenerated successfully
 

 
         
diff --git a/mklich.txt b/mklich.txt
index a41bc91927da..b01853db3af4 100644
--- a/mklich.txt
+++ b/mklich.txt
@@ -12,47 +12,26 @@
             {'type': 'git',
              'uri': 'git+ssh://git@git.gentoo.org/user/mklich.git'}],
  'status': 'unofficial'}
- * Adding new repository
 $ pmaint sync mklich
-WARNING:pkgcore:chutzpah repo at '/var/lib/repo-mirror-ci/sync/chutzpah', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-Cloning into '/var/lib/repo-mirror-ci/sync/mklich'...
+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.
+
+Already up to date.
 *** syncing mklich
 *** synced mklich
  * Sync succeeded
diff --git a/mkr-overlay.html b/mkr-overlay.html
index 0e917da2aff4..68782f7de2d3 100644
--- a/mkr-overlay.html
+++ b/mkr-overlay.html
@@ -34,85 +34,57 @@
 

             12
$ pmaint sync mkr-overlay
 

-            13
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
warning: Pulling without specifying how to reconcile divergent branches is
 

-            19
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
discouraged. You can squelch this message by running one of the following
 

-            20
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
commands sometime before your next pull:
 

-            21
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
 

-            22
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase false  # merge (the default strategy)
 

-            23
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase true   # rebase
 

-            24
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.ff only       # fast-forward only
 

-            25
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 

-            26
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
You can replace "git config" with "git config --global" to set a default
 

-            27
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            28
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
or --ff-only on the command line to override the configured default per
 

-            29
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
invocation.
 

-            30
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
 

-            31
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
Already up to date.
 

-            32
warning: Pulling without specifying how to reconcile divergent branches is
+            32
*** syncing mkr-overlay
 

-            33
discouraged. You can squelch this message by running one of the following
+            33
*** synced mkr-overlay
 

-            34
commands sometime before your next pull:
+            34
 * Sync succeeded
 

-            35
+            35
$ git log --format=%ci -1
 

-            36
  git config pull.rebase false  # merge (the default strategy)
+            36
$ git show -q --pretty=format:%G? HEAD
 

-            37
  git config pull.rebase true   # rebase
+            37
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 mkr-overlay
 

-            38
  git config pull.ff only       # fast-forward only
-

-            39
-

-            40
You can replace "git config" with "git config --global" to set a default
-

-            41
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            42
or --ff-only on the command line to override the configured default per
-

-            43
invocation.
-

-            44
-

-            45
Already up to date.
-

-            46
*** syncing mkr-overlay
-

-            47
*** synced mkr-overlay
-

-            48
 * Sync succeeded
-

-            49
$ git log --format=%ci -1
-

-            50
$ git show -q --pretty=format:%G? HEAD
-

-            51
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 mkr-overlay
-

-            52
 * Cache regenerated successfully
+            38
 * Cache regenerated successfully
 

 
         
diff --git a/mkr-overlay.txt b/mkr-overlay.txt
index e66e1a28972a..587a6faadc97 100644
--- a/mkr-overlay.txt
+++ b/mkr-overlay.txt
@@ -10,25 +10,11 @@
             {'type': 'git', 'uri': 'git@github.com:MalakymR/mkr-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync mkr-overlay
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/moaxcp.html b/moaxcp.html
index 3e3996fbee8f..fc09c766245d 100644
--- a/moaxcp.html
+++ b/moaxcp.html
@@ -32,85 +32,57 @@
 

             11
$ pmaint sync moaxcp
 

-            12
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
warning: Pulling without specifying how to reconcile divergent branches is
 

-            18
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
discouraged. You can squelch this message by running one of the following
 

-            19
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
commands sometime before your next pull:
 

-            20
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
 

-            21
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
  git config pull.rebase false  # merge (the default strategy)
 

-            22
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase true   # rebase
 

-            23
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.ff only       # fast-forward only
 

-            24
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 

-            25
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
You can replace "git config" with "git config --global" to set a default
 

-            26
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            27
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
or --ff-only on the command line to override the configured default per
 

-            28
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
invocation.
 

-            29
WARNING:pkgcore:mklich repo at '/var/lib/repo-mirror-ci/sync/mklich', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
 

-            30
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
Already up to date.
 

-            31
warning: Pulling without specifying how to reconcile divergent branches is
+            31
*** syncing moaxcp
 

-            32
discouraged. You can squelch this message by running one of the following
+            32
*** synced moaxcp
 

-            33
commands sometime before your next pull:
+            33
 * Sync succeeded
 

-            34
+            34
$ git log --format=%ci -1
 

-            35
  git config pull.rebase false  # merge (the default strategy)
+            35
$ git show -q --pretty=format:%G? HEAD
 

-            36
  git config pull.rebase true   # rebase
+            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 moaxcp
 

-            37
  git config pull.ff only       # fast-forward only
-

-            38
-

-            39
You can replace "git config" with "git config --global" to set a default
-

-            40
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            41
or --ff-only on the command line to override the configured default per
-

-            42
invocation.
-

-            43
-

-            44
Already up to date.
-

-            45
*** syncing moaxcp
-

-            46
*** synced moaxcp
-

-            47
 * Sync succeeded
-

-            48
$ git log --format=%ci -1
-

-            49
$ git show -q --pretty=format:%G? HEAD
-

-            50
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 moaxcp
-

-            51
 * Cache regenerated successfully
+            37
 * Cache regenerated successfully
 

 
         
diff --git a/moaxcp.txt b/moaxcp.txt
index 6e6432c047dd..e90d1fb14aa1 100644
--- a/moaxcp.txt
+++ b/moaxcp.txt
@@ -9,25 +9,11 @@
              'uri': 'https://github.com/moaxcp/moaxcp-gentoo-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync moaxcp
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mklich repo at '/var/lib/repo-mirror-ci/sync/mklich', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/moexiami.html b/moexiami.html
index d7fffeb955fe..8b7b8ff3fbab 100644
--- a/moexiami.html
+++ b/moexiami.html
@@ -40,85 +40,57 @@
 

             15
$ pmaint sync moexiami
 

-            16
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
warning: Pulling without specifying how to reconcile divergent branches is
 

-            22
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
discouraged. You can squelch this message by running one of the following
 

-            23
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
commands sometime before your next pull:
 

-            24
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 

-            25
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase false  # merge (the default strategy)
 

-            26
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.rebase true   # rebase
 

-            27
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.ff only       # fast-forward only
 

-            28
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
 

-            29
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
You can replace "git config" with "git config --global" to set a default
 

-            30
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            31
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
or --ff-only on the command line to override the configured default per
 

-            32
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
invocation.
 

-            33
WARNING:pkgcore:mklich repo at '/var/lib/repo-mirror-ci/sync/mklich', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
 

-            34
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
Already up to date.
 

-            35
warning: Pulling without specifying how to reconcile divergent branches is
+            35
*** syncing moexiami
 

-            36
discouraged. You can squelch this message by running one of the following
+            36
*** synced moexiami
 

-            37
commands sometime before your next pull:
+            37
 * Sync succeeded
 

-            38
+            38
$ git log --format=%ci -1
 

-            39
  git config pull.rebase false  # merge (the default strategy)
+            39
$ git show -q --pretty=format:%G? HEAD
 

-            40
  git config pull.rebase true   # rebase
+            40
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 moexiami
 

-            41
  git config pull.ff only       # fast-forward only
-

-            42
-

-            43
You can replace "git config" with "git config --global" to set a default
-

-            44
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            45
or --ff-only on the command line to override the configured default per
-

-            46
invocation.
-

-            47
-

-            48
Already up to date.
-

-            49
*** syncing moexiami
-

-            50
*** synced moexiami
-

-            51
 * Sync succeeded
-

-            52
$ git log --format=%ci -1
-

-            53
$ git show -q --pretty=format:%G? HEAD
-

-            54
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 moexiami
-

-            55
 * Cache regenerated successfully
+            41
 * Cache regenerated successfully
 

 
         
diff --git a/moexiami.txt b/moexiami.txt
index dfc09d82b6d9..f7f2c2447af7 100644
--- a/moexiami.txt
+++ b/moexiami.txt
@@ -13,25 +13,11 @@
              'uri': 'git+ssh://git@github.com/Xiami2012/moexiami-ovl-sync.git'}],
  'status': 'unofficial'}
 $ pmaint sync moexiami
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mklich repo at '/var/lib/repo-mirror-ci/sync/mklich', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/moltonel.html b/moltonel.html
index b1df56f9ec22..0ce6dacc2f87 100644
--- a/moltonel.html
+++ b/moltonel.html
@@ -32,85 +32,57 @@
 

             11
$ pmaint sync moltonel
 

-            12
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
warning: Pulling without specifying how to reconcile divergent branches is
 

-            18
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
discouraged. You can squelch this message by running one of the following
 

-            19
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
commands sometime before your next pull:
 

-            20
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
 

-            21
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
  git config pull.rebase false  # merge (the default strategy)
 

-            22
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase true   # rebase
 

-            23
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.ff only       # fast-forward only
 

-            24
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 

-            25
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
You can replace "git config" with "git config --global" to set a default
 

-            26
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            27
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
or --ff-only on the command line to override the configured default per
 

-            28
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
invocation.
 

-            29
WARNING:pkgcore:mklich repo at '/var/lib/repo-mirror-ci/sync/mklich', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
 

-            30
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
Already up to date.
 

-            31
warning: Pulling without specifying how to reconcile divergent branches is
+            31
*** syncing moltonel
 

-            32
discouraged. You can squelch this message by running one of the following
+            32
*** synced moltonel
 

-            33
commands sometime before your next pull:
+            33
 * Sync succeeded
 

-            34
+            34
$ git log --format=%ci -1
 

-            35
  git config pull.rebase false  # merge (the default strategy)
+            35
$ git show -q --pretty=format:%G? HEAD
 

-            36
  git config pull.rebase true   # rebase
+            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 moltonel
 

-            37
  git config pull.ff only       # fast-forward only
-

-            38
-

-            39
You can replace "git config" with "git config --global" to set a default
-

-            40
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            41
or --ff-only on the command line to override the configured default per
-

-            42
invocation.
-

-            43
-

-            44
Already up to date.
-

-            45
*** syncing moltonel
-

-            46
*** synced moltonel
-

-            47
 * Sync succeeded
-

-            48
$ git log --format=%ci -1
-

-            49
$ git show -q --pretty=format:%G? HEAD
-

-            50
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 moltonel
-

-            51
 * Cache regenerated successfully
+            37
 * Cache regenerated successfully
 

 
         
diff --git a/moltonel.txt b/moltonel.txt
index 77e75fbd2636..cc3a30f0e7fe 100644
--- a/moltonel.txt
+++ b/moltonel.txt
@@ -9,25 +9,11 @@
              'uri': 'git://github.com/vincentdephily/moltonel-ebuilds.git'}],
  'status': 'unofficial'}
 $ pmaint sync moltonel
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mklich repo at '/var/lib/repo-mirror-ci/sync/mklich', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/monero.html b/monero.html
index bd8600284482..fd0a80689152 100644
--- a/monero.html
+++ b/monero.html
@@ -40,85 +40,59 @@
 

             15
$ pmaint sync monero
 

-            16
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
warning: Pulling without specifying how to reconcile divergent branches is
 

-            23
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
discouraged. You can squelch this message by running one of the following
 

-            24
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
commands sometime before your next pull:
 

-            25
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 

-            26
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.rebase false  # merge (the default strategy)
 

-            27
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.rebase true   # rebase
 

-            28
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
  git config pull.ff only       # fast-forward only
 

-            29
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
 

-            30
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
You can replace "git config" with "git config --global" to set a default
 

-            31
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            32
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
or --ff-only on the command line to override the configured default per
 

-            33
WARNING:pkgcore:mklich repo at '/var/lib/repo-mirror-ci/sync/mklich', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
invocation.
 

-            34
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
 

-            35
warning: Pulling without specifying how to reconcile divergent branches is
+            35
Already up to date.
 

-            36
discouraged. You can squelch this message by running one of the following
+            36
*** syncing monero
 

-            37
commands sometime before your next pull:
+            37
*** synced monero
 

-            38
+            38
 * Sync succeeded
 

-            39
  git config pull.rebase false  # merge (the default strategy)
+            39
$ git log --format=%ci -1
 

-            40
  git config pull.rebase true   # rebase
+            40
$ git show -q --pretty=format:%G? HEAD
 

-            41
  git config pull.ff only       # fast-forward only
+            41
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 monero
 

-            42
-

-            43
You can replace "git config" with "git config --global" to set a default
-

-            44
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            45
or --ff-only on the command line to override the configured default per
-

-            46
invocation.
-

-            47
-

-            48
Already up to date.
-

-            49
*** syncing monero
-

-            50
*** synced monero
-

-            51
 * Sync succeeded
-

-            52
$ git log --format=%ci -1
-

-            53
$ git show -q --pretty=format:%G? HEAD
-

-            54
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 monero
-

-            55
 * Cache regenerated successfully
+            42
 * Cache regenerated successfully
 

 
         
diff --git a/monero.txt b/monero.txt
index 409449f62e76..7dbe94131761 100644
--- a/monero.txt
+++ b/monero.txt
@@ -13,25 +13,12 @@
              'uri': 'git+ssh://git@github.com/gentoo-monero/gentoo-monero.git'}],
  'status': 'unofficial'}
 $ pmaint sync monero
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mklich repo at '/var/lib/repo-mirror-ci/sync/mklich', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/mozilla.html b/mozilla.html
index 189f7142a015..82f938e52d37 100644
--- a/mozilla.html
+++ b/mozilla.html
@@ -36,87 +36,61 @@
 

             13
$ pmaint sync mozilla
 

-            14
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
warning: Pulling without specifying how to reconcile divergent branches is
 

-            21
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
discouraged. You can squelch this message by running one of the following
 

-            22
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
commands sometime before your next pull:
 

-            23
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
 

-            24
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.rebase false  # merge (the default strategy)
 

-            25
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase true   # rebase
 

-            26
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.ff only       # fast-forward only
 

-            27
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
 

-            28
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
You can replace "git config" with "git config --global" to set a default
 

-            29
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            30
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
or --ff-only on the command line to override the configured default per
 

-            31
WARNING:pkgcore:mklich repo at '/var/lib/repo-mirror-ci/sync/mklich', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
invocation.
 

-            32
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
 

-            33
warning: Pulling without specifying how to reconcile divergent branches is
+            33
Already up to date.
 

-            34
discouraged. You can squelch this message by running one of the following
+            34
*** syncing mozilla
 

-            35
commands sometime before your next pull:
+            35
*** synced mozilla
 

-            36
+            36
 * Sync succeeded
 

-            37
  git config pull.rebase false  # merge (the default strategy)
+            37
$ git log --format=%ci -1
 

-            38
  git config pull.rebase true   # rebase
+            38
$ git show -q --pretty=format:%G? HEAD
 

-            39
  git config pull.ff only       # fast-forward only
+            39
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 mozilla
 

-            40
-

-            41
You can replace "git config" with "git config --global" to set a default
-

-            42
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            43
or --ff-only on the command line to override the configured default per
-

-            44
invocation.
-

-            45
-

-            46
Already up to date.
-

-            47
*** syncing mozilla
-

-            48
*** synced mozilla
-

-            49
 * Sync succeeded
-

-            50
$ git log --format=%ci -1
-

-            51
$ git show -q --pretty=format:%G? HEAD
-

-            52
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 mozilla
-

-            53
 * www-client/seamonkey-2.49.9.1_p0: failed sourcing ebuild: inherit requires unknown eclass: mozconfig-v6.52.eclass
+            40
 * www-client/seamonkey-2.49.9.1_p0: failed sourcing ebuild: inherit requires unknown eclass: mozconfig-v6.52.eclass
 
[FATAL]
-            54
 * Cache regen failed with 1
+            41
 * Cache regen failed with 1
 

 
         
diff --git a/mozilla.txt b/mozilla.txt
index da8043284074..627c08e2c927 100644
--- a/mozilla.txt
+++ b/mozilla.txt
@@ -11,25 +11,12 @@
              'uri': 'git+ssh://git@git.gentoo.org/proj/mozilla.git'}],
  'status': 'official'}
 $ pmaint sync mozilla
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mklich repo at '/var/lib/repo-mirror-ci/sync/mklich', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/mschiff.html b/mschiff.html
index 61ae82467bec..ce489776dad8 100644
--- a/mschiff.html
+++ b/mschiff.html
@@ -40,97 +40,59 @@
 

             15
$ pmaint sync mschiff
 

-            16
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
warning: Pulling without specifying how to reconcile divergent branches is
 

-            23
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
discouraged. You can squelch this message by running one of the following
 

-            24
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
commands sometime before your next pull:
 

-            25
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 

-            26
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.rebase false  # merge (the default strategy)
 

-            27
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.rebase true   # rebase
 

-            28
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
  git config pull.ff only       # fast-forward only
 

-            29
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
 

-            30
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
You can replace "git config" with "git config --global" to set a default
 

-            31
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            32
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
or --ff-only on the command line to override the configured default per
 

-            33
WARNING:pkgcore:mklich repo at '/var/lib/repo-mirror-ci/sync/mklich', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
invocation.
 

-            34
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
 

-            35
warning: Pulling without specifying how to reconcile divergent branches is
+            35
Already up to date.
 

-            36
discouraged. You can squelch this message by running one of the following
+            36
*** syncing mschiff
 

-            37
commands sometime before your next pull:
+            37
*** synced mschiff
 

-            38
+            38
 * Sync succeeded
 

-            39
  git config pull.rebase false  # merge (the default strategy)
+            39
$ git log --format=%ci -1
 

-            40
  git config pull.rebase true   # rebase
+            40
$ git show -q --pretty=format:%G? HEAD
 

-            41
  git config pull.ff only       # fast-forward only
+            41
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 mschiff
 

-            42
-

-            43
You can replace "git config" with "git config --global" to set a default
-

-            44
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            45
or --ff-only on the command line to override the configured default per
-

-            46
invocation.
-

-            47
-

-            48
fatal: unable to access 'https://anongit.gentoo.org/git/dev/mschiff.git/': The requested URL returned error: 504
-

-            49
*** syncing mschiff
-

-            50
!!! failed syncing mschiff
-

-            51
 * Sync failed with 1
-
[FATAL]
-            52
 * Will try to re-create
-

-            53
$ pmaint sync mschiff
-

-            54
Cloning into '/var/lib/repo-mirror-ci/sync/mschiff'...
-

-            55
*** syncing mschiff
-

-            56
*** synced mschiff
-

-            57
 * Sync succeeded after re-adding
-

-            58
$ git log --format=%ci -1
-

-            59
$ git show -q --pretty=format:%G? HEAD
-

-            60
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 mschiff
-

-            61
 * Cache regenerated successfully
+            42
 * Cache regenerated successfully
 

 
         
diff --git a/mschiff.txt b/mschiff.txt
index 966068a6412a..72f7d30a6916 100644
--- a/mschiff.txt
+++ b/mschiff.txt
@@ -13,25 +13,12 @@
              'uri': 'git+ssh://git@git.gentoo.org/dev/mschiff.git'}],
  'status': 'official'}
 $ pmaint sync mschiff
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mklich repo at '/var/lib/repo-mirror-ci/sync/mklich', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
@@ -45,16 +32,10 @@ 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.
 
-fatal: unable to access 'https://anongit.gentoo.org/git/dev/mschiff.git/': The requested URL returned error: 504
-*** syncing mschiff
-!!! failed syncing mschiff
- * Sync failed with 1
- * Will try to re-create
-$ pmaint sync mschiff
-Cloning into '/var/lib/repo-mirror-ci/sync/mschiff'...
+Already up to date.
 *** syncing mschiff
 *** synced mschiff
- * Sync succeeded after re-adding
+ * Sync succeeded
 $ git log --format=%ci -1
 $ git show -q --pretty=format:%G? HEAD
 $ pmaint regen --use-local-desc --pkg-desc-index -t 1 mschiff
diff --git a/multilib-portage.html b/multilib-portage.html
index 84043a9e55ca..bc10793adc6d 100644
--- a/multilib-portage.html
+++ b/multilib-portage.html
@@ -32,85 +32,57 @@
 

             11
$ pmaint sync multilib-portage
 

-            12
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
warning: Pulling without specifying how to reconcile divergent branches is
 

-            18
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
discouraged. You can squelch this message by running one of the following
 

-            19
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
commands sometime before your next pull:
 

-            20
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
 

-            21
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
  git config pull.rebase false  # merge (the default strategy)
 

-            22
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase true   # rebase
 

-            23
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.ff only       # fast-forward only
 

-            24
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 

-            25
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
You can replace "git config" with "git config --global" to set a default
 

-            26
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            27
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
or --ff-only on the command line to override the configured default per
 

-            28
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
invocation.
 

-            29
WARNING:pkgcore:mklich repo at '/var/lib/repo-mirror-ci/sync/mklich', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
 

-            30
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
Already up to date.
 

-            31
warning: Pulling without specifying how to reconcile divergent branches is
+            31
*** syncing multilib-portage
 

-            32
discouraged. You can squelch this message by running one of the following
+            32
*** synced multilib-portage
 

-            33
commands sometime before your next pull:
+            33
 * Sync succeeded
 

-            34
+            34
$ git log --format=%ci -1
 

-            35
  git config pull.rebase false  # merge (the default strategy)
+            35
$ git show -q --pretty=format:%G? HEAD
 

-            36
  git config pull.rebase true   # rebase
+            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 multilib-portage
 

-            37
  git config pull.ff only       # fast-forward only
-

-            38
-

-            39
You can replace "git config" with "git config --global" to set a default
-

-            40
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            41
or --ff-only on the command line to override the configured default per
-

-            42
invocation.
-

-            43
-

-            44
Already up to date.
-

-            45
*** syncing multilib-portage
-

-            46
*** synced multilib-portage
-

-            47
 * Sync succeeded
-

-            48
$ git log --format=%ci -1
-

-            49
$ git show -q --pretty=format:%G? HEAD
-

-            50
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 multilib-portage
-

-            51
 * Cache regenerated successfully
+            37
 * Cache regenerated successfully
 

 
         
diff --git a/multilib-portage.txt b/multilib-portage.txt
index 00695e288de3..9d5e1e3f9c80 100644
--- a/multilib-portage.txt
+++ b/multilib-portage.txt
@@ -9,25 +9,11 @@
              'uri': 'git://anongit.gentoo.org/proj/multilib-portage.git'}],
  'status': 'official'}
 $ pmaint sync multilib-portage
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mklich repo at '/var/lib/repo-mirror-ci/sync/mklich', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/musl-clang.html b/musl-clang.html
index bc3e1f229acf..8bd5afc4c0dd 100644
--- a/musl-clang.html
+++ b/musl-clang.html
@@ -34,77 +34,57 @@
 

             12
$ pmaint sync musl-clang
 

-            13
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
warning: Pulling without specifying how to reconcile divergent branches is
 

-            19
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
discouraged. You can squelch this message by running one of the following
 

-            20
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
commands sometime before your next pull:
 

-            21
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
 

-            22
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase false  # merge (the default strategy)
 

-            23
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase true   # rebase
 

-            24
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.ff only       # fast-forward only
 

-            25
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 

-            26
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
You can replace "git config" with "git config --global" to set a default
 

-            27
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            28
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
or --ff-only on the command line to override the configured default per
 

-            29
warning: Pulling without specifying how to reconcile divergent branches is
+            29
invocation.
 

-            30
discouraged. You can squelch this message by running one of the following
+            30
 

-            31
commands sometime before your next pull:
+            31
Already up to date.
 

-            32
+            32
*** syncing musl-clang
 

-            33
  git config pull.rebase false  # merge (the default strategy)
+            33
*** synced musl-clang
 

-            34
  git config pull.rebase true   # rebase
+            34
 * Sync succeeded
 

-            35
  git config pull.ff only       # fast-forward only
+            35
$ git log --format=%ci -1
 

-            36
+            36
$ git show -q --pretty=format:%G? HEAD
 

-            37
You can replace "git config" with "git config --global" to set a default
+            37
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 musl-clang
 

-            38
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            39
or --ff-only on the command line to override the configured default per
-

-            40
invocation.
-

-            41
-

-            42
Already up to date.
-

-            43
*** syncing musl-clang
-

-            44
*** synced musl-clang
-

-            45
 * Sync succeeded
-

-            46
$ git log --format=%ci -1
-

-            47
$ git show -q --pretty=format:%G? HEAD
-

-            48
 * Invalid metadata, removing: Failed instantiating section 'musl-clang'
+            38
 * Cache regenerated successfully
 

 
         
diff --git a/musl-clang.txt b/musl-clang.txt
index 807c31394239..c0884570a994 100644
--- a/musl-clang.txt
+++ b/musl-clang.txt
@@ -10,22 +10,11 @@
             {'type': 'git', 'uri': 'git://github.com/karlguy/musl-clang'}],
  'status': 'unofficial'}
 $ pmaint sync musl-clang
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
@@ -45,4 +34,5 @@ Already up to date.
  * Sync succeeded
 $ git log --format=%ci -1
 $ git show -q --pretty=format:%G? HEAD
- * Invalid metadata, removing: Failed instantiating section 'musl-clang'
+$ pmaint regen --use-local-desc --pkg-desc-index -t 1 musl-clang
+ * Cache regenerated successfully
diff --git a/musl.html b/musl.html
index 3dff918e407c..4e78438da342 100644
--- a/musl.html
+++ b/musl.html
@@ -42,84 +42,42 @@
 

             16
$ pmaint sync musl
 

-            17
WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            23
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            24
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            25
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            26
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            27
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
Cloning into '/var/lib/repo-mirror-ci/sync/musl'...
 

-            28
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
*** syncing musl
 

-            29
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
*** synced musl
 

-            30
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
 * Sync succeeded
 

-            31
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
$ git log --format=%ci -1
 

-            32
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
$ git show -q --pretty=format:%G? HEAD
 

-            33
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 musl
 

-            34
WARNING:pkgcore:mklich repo at '/var/lib/repo-mirror-ci/sync/mklich', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
 * Cache regenerated successfully
 

-            35
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            36
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            37
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            38
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            39
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            40
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            41
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            42
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            43
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            44
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            45
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            46
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            47
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            48
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            49
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            50
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            51
Cloning into '/var/lib/repo-mirror-ci/sync/musl'...
-

-            52
fatal: unable to access 'https://anongit.gentoo.org/git/proj/musl.git/': The requested URL returned error: 504
-

-            53
*** syncing musl
-

-            54
!!! failed syncing musl
-

-            55
 * Sync failed with 1
-
[FATAL]
 
         
     
diff --git a/musl.txt b/musl.txt
index 77c1f8c3625f..75760ef1e8e2 100644
--- a/musl.txt
+++ b/musl.txt
@@ -14,42 +14,21 @@
  'status': 'official'}
  * Adding new repository
 $ pmaint sync musl
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mklich repo at '/var/lib/repo-mirror-ci/sync/mklich', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 Cloning into '/var/lib/repo-mirror-ci/sync/musl'...
-fatal: unable to access 'https://anongit.gentoo.org/git/proj/musl.git/': The requested URL returned error: 504
 *** syncing musl
-!!! failed syncing musl
- * Sync failed with 1
+*** synced musl
+ * Sync succeeded
+$ git log --format=%ci -1
+$ git show -q --pretty=format:%G? HEAD
+$ pmaint regen --use-local-desc --pkg-desc-index -t 1 musl
+ * Cache regenerated successfully
diff --git a/mv.html b/mv.html
index 7eb9fbf8e0fb..1dba6b28d767 100644
--- a/mv.html
+++ b/mv.html
@@ -44,89 +44,59 @@
 

             17
 'status': 'unofficial'}
 

-            18
 * Adding new repository
+            18
$ pmaint sync mv
 

-            19
$ pmaint sync mv
+            19
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            23
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            24
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
warning: Pulling without specifying how to reconcile divergent branches is
 

-            25
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
discouraged. You can squelch this message by running one of the following
 

-            26
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
commands sometime before your next pull:
 

-            27
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
 

-            28
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
  git config pull.rebase false  # merge (the default strategy)
 

-            29
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
  git config pull.rebase true   # rebase
 

-            30
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
  git config pull.ff only       # fast-forward only
 

-            31
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
 

-            32
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
You can replace "git config" with "git config --global" to set a default
 

-            33
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            34
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
or --ff-only on the command line to override the configured default per
 

-            35
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
invocation.
 

-            36
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
 

-            37
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            37
Already up to date.
 

-            38
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            38
*** syncing mv
 

-            39
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            39
*** synced mv
 

-            40
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            40
 * Sync succeeded
 

-            41
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            41
$ git log --format=%ci -1
 

-            42
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            42
$ git show -q --pretty=format:%G? HEAD
 

-            43
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            43
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 mv
 

-            44
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            45
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            46
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            47
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            48
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            49
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            50
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            51
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            52
Cloning into '/var/lib/repo-mirror-ci/sync/mv'...
-

-            53
*** syncing mv
-

-            54
*** synced mv
-

-            55
 * Sync succeeded
-

-            56
$ git log --format=%ci -1
-

-            57
$ git show -q --pretty=format:%G? HEAD
-

-            58
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 mv
-

-            59
 * Cache regenerated successfully
+            44
 * Cache regenerated successfully
 

 
         
diff --git a/mv.txt b/mv.txt
index 8245e8889522..4d6507b16c7e 100644
--- a/mv.txt
+++ b/mv.txt
@@ -15,41 +15,26 @@
             {'type': 'git', 'uri': 'git://anongit.gentoo.org/user/mv.git'},
             {'type': 'git', 'uri': 'git+ssh://git@git.gentoo.org/user/mv.git'}],
  'status': 'unofficial'}
- * Adding new repository
 $ pmaint sync mv
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-Cloning into '/var/lib/repo-mirror-ci/sync/mv'...
+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.
+
+Already up to date.
 *** syncing mv
 *** synced mv
  * Sync succeeded
diff --git a/mva.html b/mva.html
index 7f14de5813ec..6de9fa537525 100644
--- a/mva.html
+++ b/mva.html
@@ -34,81 +34,59 @@
 

             12
$ pmaint sync mva
 

-            13
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
warning: Pulling without specifying how to reconcile divergent branches is
 

-            19
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
discouraged. You can squelch this message by running one of the following
 

-            20
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
commands sometime before your next pull:
 

-            21
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
 

-            22
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase false  # merge (the default strategy)
 

-            23
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase true   # rebase
 

-            24
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.ff only       # fast-forward only
 

-            25
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 

-            26
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
You can replace "git config" with "git config --global" to set a default
 

-            27
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            28
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
or --ff-only on the command line to override the configured default per
 

-            29
warning: Pulling without specifying how to reconcile divergent branches is
+            29
invocation.
 

-            30
discouraged. You can squelch this message by running one of the following
+            30
 

-            31
commands sometime before your next pull:
+            31
Already up to date.
 

-            32
+            32
*** syncing mva
 

-            33
  git config pull.rebase false  # merge (the default strategy)
+            33
*** synced mva
 

-            34
  git config pull.rebase true   # rebase
+            34
 * Sync succeeded
 

-            35
  git config pull.ff only       # fast-forward only
+            35
$ git log --format=%ci -1
 

-            36
+            36
$ git show -q --pretty=format:%G? HEAD
 

-            37
You can replace "git config" with "git config --global" to set a default
+            37
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 mva
 

-            38
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            39
or --ff-only on the command line to override the configured default per
-

-            40
invocation.
-

-            41
-

-            42
Already up to date.
-

-            43
*** syncing mva
-

-            44
*** synced mva
-

-            45
 * Sync succeeded
-

-            46
$ git log --format=%ci -1
-

-            47
$ git show -q --pretty=format:%G? HEAD
-

-            48
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 mva
-

-            49
 * app-backup/lvmsync-9999: failed parsing REQUIRED_USE: '|| ( )' is unparseable
+            38
 * app-backup/lvmsync-9999: failed parsing REQUIRED_USE: '|| ( )' is unparseable
 
[FATAL]
-            50
 * Cache regen failed with 1
+            39
 * Cache regen failed with 1
 

 
         
diff --git a/mva.txt b/mva.txt
index f3afa4755056..9bf02c9822ae 100644
--- a/mva.txt
+++ b/mva.txt
@@ -10,22 +10,11 @@
             {'type': 'git', 'uri': 'git://github.com/msva/mva-overlay'}],
  'status': 'unofficial'}
 $ pmaint sync mva
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/myov.html b/myov.html
index f3af0d6ebc45..aeb3a40df270 100644
--- a/myov.html
+++ b/myov.html
@@ -30,79 +30,57 @@
 

             10
$ pmaint sync myov
 

-            11
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            11
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            12
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
warning: Pulling without specifying how to reconcile divergent branches is
 

-            17
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
discouraged. You can squelch this message by running one of the following
 

-            18
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
commands sometime before your next pull:
 

-            19
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
 

-            20
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
  git config pull.rebase false  # merge (the default strategy)
 

-            21
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
  git config pull.rebase true   # rebase
 

-            22
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.ff only       # fast-forward only
 

-            23
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
 

-            24
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
You can replace "git config" with "git config --global" to set a default
 

-            25
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            26
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
or --ff-only on the command line to override the configured default per
 

-            27
warning: Pulling without specifying how to reconcile divergent branches is
+            27
invocation.
 

-            28
discouraged. You can squelch this message by running one of the following
+            28
 

-            29
commands sometime before your next pull:
+            29
Already up to date.
 

-            30
+            30
*** syncing myov
 

-            31
  git config pull.rebase false  # merge (the default strategy)
+            31
*** synced myov
 

-            32
  git config pull.rebase true   # rebase
+            32
 * Sync succeeded
 

-            33
  git config pull.ff only       # fast-forward only
+            33
$ git log --format=%ci -1
 

-            34
+            34
$ git show -q --pretty=format:%G? HEAD
 

-            35
You can replace "git config" with "git config --global" to set a default
+            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 myov
 

-            36
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            37
or --ff-only on the command line to override the configured default per
-

-            38
invocation.
-

-            39
-

-            40
Already up to date.
-

-            41
*** syncing myov
-

-            42
*** synced myov
-

-            43
 * Sync succeeded
-

-            44
$ git log --format=%ci -1
-

-            45
$ git show -q --pretty=format:%G? HEAD
-

-            46
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 myov
-

-            47
 * Cache regenerated successfully
+            36
 * Cache regenerated successfully
 

 
         
diff --git a/myov.txt b/myov.txt
index db4745888dfd..532a1b63f264 100644
--- a/myov.txt
+++ b/myov.txt
@@ -8,22 +8,11 @@
             {'type': 'git', 'uri': 'git+ssh://git@gitlab.com/xgqt/myov.git'}],
  'status': 'unofficial'}
 $ pmaint sync myov
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/mysql.html b/mysql.html
index a0f4df2135a4..54ef38ac6efc 100644
--- a/mysql.html
+++ b/mysql.html
@@ -38,93 +38,59 @@
 

             14
 'status': 'official'}
 

-            15
 * Adding new repository
+            15
$ pmaint sync mysql
 

-            16
$ pmaint sync mysql
+            16
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
warning: Pulling without specifying how to reconcile divergent branches is
 

-            22
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
discouraged. You can squelch this message by running one of the following
 

-            23
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
commands sometime before your next pull:
 

-            24
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 

-            25
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase false  # merge (the default strategy)
 

-            26
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.rebase true   # rebase
 

-            27
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.ff only       # fast-forward only
 

-            28
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
 

-            29
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
You can replace "git config" with "git config --global" to set a default
 

-            30
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            31
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
or --ff-only on the command line to override the configured default per
 

-            32
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
invocation.
 

-            33
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
 

-            34
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
Already up to date.
 

-            35
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
*** syncing mysql
 

-            36
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
*** synced mysql
 

-            37
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            37
 * Sync succeeded
 

-            38
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            38
$ git log --format=%ci -1
 

-            39
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            39
$ git show -q --pretty=format:%G? HEAD
 

-            40
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            40
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 mysql
 

-            41
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            42
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            43
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            44
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            45
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            46
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            47
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            48
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            49
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            50
WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            51
Cloning into '/var/lib/repo-mirror-ci/sync/mysql'...
-

-            52
*** syncing mysql
-

-            53
*** synced mysql
-

-            54
 * Sync succeeded
-

-            55
$ git log --format=%ci -1
-

-            56
$ git show -q --pretty=format:%G? HEAD
-

-            57
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 mysql
-

-            58
 * Cache regenerated successfully
+            41
 * Cache regenerated successfully
 

 
         
diff --git a/mysql.txt b/mysql.txt
index d65419ba2ec0..4c6430db85c7 100644
--- a/mysql.txt
+++ b/mysql.txt
@@ -12,43 +12,26 @@
             {'type': 'git',
              'uri': 'git+ssh://git@git.gentoo.org/proj/mysql.git'}],
  'status': 'official'}
- * Adding new repository
 $ pmaint sync mysql
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-Cloning into '/var/lib/repo-mirror-ci/sync/mysql'...
+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.
+
+Already up to date.
 *** syncing mysql
 *** synced mysql
  * Sync succeeded
diff --git a/nelson-graca.html b/nelson-graca.html
index add299605062..9f9e8369f1a7 100644
--- a/nelson-graca.html
+++ b/nelson-graca.html
@@ -38,81 +38,57 @@
 

             14
$ pmaint sync nelson-graca
 

-            15
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
warning: Pulling without specifying how to reconcile divergent branches is
 

-            21
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
discouraged. You can squelch this message by running one of the following
 

-            22
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
commands sometime before your next pull:
 

-            23
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
 

-            24
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.rebase false  # merge (the default strategy)
 

-            25
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase true   # rebase
 

-            26
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.ff only       # fast-forward only
 

-            27
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
 

-            28
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
You can replace "git config" with "git config --global" to set a default
 

-            29
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            30
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
or --ff-only on the command line to override the configured default per
 

-            31
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
invocation.
 

-            32
warning: Pulling without specifying how to reconcile divergent branches is
+            32
 

-            33
discouraged. You can squelch this message by running one of the following
+            33
Already up to date.
 

-            34
commands sometime before your next pull:
+            34
*** syncing nelson-graca
 

-            35
+            35
*** synced nelson-graca
 

-            36
  git config pull.rebase false  # merge (the default strategy)
+            36
 * Sync succeeded
 

-            37
  git config pull.rebase true   # rebase
+            37
$ git log --format=%ci -1
 

-            38
  git config pull.ff only       # fast-forward only
+            38
$ git show -q --pretty=format:%G? HEAD
 

-            39
+            39
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 nelson-graca
 

-            40
You can replace "git config" with "git config --global" to set a default
-

-            41
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            42
or --ff-only on the command line to override the configured default per
-

-            43
invocation.
-

-            44
-

-            45
Already up to date.
-

-            46
*** syncing nelson-graca
-

-            47
*** synced nelson-graca
-

-            48
 * Sync succeeded
-

-            49
$ git log --format=%ci -1
-

-            50
$ git show -q --pretty=format:%G? HEAD
-

-            51
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 nelson-graca
-

-            52
 * Cache regenerated successfully
+            40
 * Cache regenerated successfully
 

 
         
diff --git a/nelson-graca.txt b/nelson-graca.txt
index a5d04d5665da..adb09d472640 100644
--- a/nelson-graca.txt
+++ b/nelson-graca.txt
@@ -12,23 +12,11 @@
              'uri': 'git+ssh://git@github.com/nelsongraca/gentoo-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync nelson-graca
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/nest.html b/nest.html
index 74d74d96aee8..d153979dd047 100644
--- a/nest.html
+++ b/nest.html
@@ -38,81 +38,59 @@
 

             14
$ pmaint sync nest
 

-            15
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
warning: Pulling without specifying how to reconcile divergent branches is
 

-            22
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
discouraged. You can squelch this message by running one of the following
 

-            23
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
commands sometime before your next pull:
 

-            24
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 

-            25
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase false  # merge (the default strategy)
 

-            26
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.rebase true   # rebase
 

-            27
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.ff only       # fast-forward only
 

-            28
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
 

-            29
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
You can replace "git config" with "git config --global" to set a default
 

-            30
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            31
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
or --ff-only on the command line to override the configured default per
 

-            32
warning: Pulling without specifying how to reconcile divergent branches is
+            32
invocation.
 

-            33
discouraged. You can squelch this message by running one of the following
+            33
 

-            34
commands sometime before your next pull:
+            34
Already up to date.
 

-            35
+            35
*** syncing nest
 

-            36
  git config pull.rebase false  # merge (the default strategy)
+            36
*** synced nest
 

-            37
  git config pull.rebase true   # rebase
+            37
 * Sync succeeded
 

-            38
  git config pull.ff only       # fast-forward only
+            38
$ git log --format=%ci -1
 

-            39
+            39
$ git show -q --pretty=format:%G? HEAD
 

-            40
You can replace "git config" with "git config --global" to set a default
+            40
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 nest
 

-            41
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            42
or --ff-only on the command line to override the configured default per
-

-            43
invocation.
-

-            44
-

-            45
Already up to date.
-

-            46
*** syncing nest
-

-            47
*** synced nest
-

-            48
 * Sync succeeded
-

-            49
$ git log --format=%ci -1
-

-            50
$ git show -q --pretty=format:%G? HEAD
-

-            51
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 nest
-

-            52
 * Cache regenerated successfully
+            41
 * Cache regenerated successfully
 

 
         
diff --git a/nest.txt b/nest.txt
index 81a9d4424fb0..3a9879d5d10e 100644
--- a/nest.txt
+++ b/nest.txt
@@ -12,23 +12,12 @@
              'uri': 'git+ssh://git@github.com/SpiderX/portage-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync nest
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/nextoo.html b/nextoo.html
index 6e794b34a5e0..bb333e883cda 100644
--- a/nextoo.html
+++ b/nextoo.html
@@ -42,85 +42,61 @@
 

             16
$ pmaint sync nextoo
 

-            17
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
warning: Pulling without specifying how to reconcile divergent branches is
 

-            23
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
discouraged. You can squelch this message by running one of the following
 

-            24
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
commands sometime before your next pull:
 

-            25
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 

-            26
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.rebase false  # merge (the default strategy)
 

-            27
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.rebase true   # rebase
 

-            28
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
  git config pull.ff only       # fast-forward only
 

-            29
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
 

-            30
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
You can replace "git config" with "git config --global" to set a default
 

-            31
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            32
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
or --ff-only on the command line to override the configured default per
 

-            33
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
invocation.
 

-            34
warning: Pulling without specifying how to reconcile divergent branches is
+            34
 

-            35
discouraged. You can squelch this message by running one of the following
+            35
Already up to date.
 

-            36
commands sometime before your next pull:
+            36
*** syncing nextoo
 

-            37
+            37
*** synced nextoo
 

-            38
  git config pull.rebase false  # merge (the default strategy)
+            38
 * Sync succeeded
 

-            39
  git config pull.rebase true   # rebase
+            39
$ git log --format=%ci -1
 

-            40
  git config pull.ff only       # fast-forward only
+            40
$ git show -q --pretty=format:%G? HEAD
 

-            41
+            41
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 nextoo
 

-            42
You can replace "git config" with "git config --global" to set a default
-

-            43
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            44
or --ff-only on the command line to override the configured default per
-

-            45
invocation.
-

-            46
-

-            47
Already up to date.
-

-            48
*** syncing nextoo
-

-            49
*** synced nextoo
-

-            50
 * Sync succeeded
-

-            51
$ git log --format=%ci -1
-

-            52
$ git show -q --pretty=format:%G? HEAD
-

-            53
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 nextoo
-

-            54
 * games-fps/utlauncher-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            42
 * games-fps/utlauncher-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            55
 * net-nntp/headphones-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            43
 * net-nntp/headphones-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            56
 * Cache regen failed with 1
+            44
 * Cache regen failed with 1
 

 
         
diff --git a/nextoo.txt b/nextoo.txt
index 8f597cb03afd..c24c1bafdb80 100644
--- a/nextoo.txt
+++ b/nextoo.txt
@@ -14,23 +14,11 @@
              'uri': 'git@github.com:nextoo/portage-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync nextoo
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/nico.html b/nico.html
index 71eeb28b42a8..3c64a0bb9ded 100644
--- a/nico.html
+++ b/nico.html
@@ -42,86 +42,44 @@
 

             16
$ pmaint sync nico
 

-            17
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            23
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            24
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            25
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            26
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            27
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            28
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
Cloning into '/var/lib/repo-mirror-ci/sync/nico'...
 

-            29
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
*** syncing nico
 

-            30
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
*** synced nico
 

-            31
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
 * Sync succeeded
 

-            32
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
$ git log --format=%ci -1
 

-            33
WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
$ git show -q --pretty=format:%G? HEAD
 

-            34
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 nico
 

-            35
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
 * Cache regenerated successfully
 

-            36
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            37
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            38
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            39
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            40
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            41
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            42
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            43
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            44
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            45
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            46
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            47
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            48
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            49
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            50
WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            51
WARNING:pkgcore:mysql repo at '/var/lib/repo-mirror-ci/sync/mysql', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            52
Cloning into '/var/lib/repo-mirror-ci/sync/nico'...
-

-            53
fatal: unable to access 'https://anongit.gentoo.org/git/user/nico.git/': The requested URL returned error: 504
-

-            54
*** syncing nico
-

-            55
!!! failed syncing nico
-

-            56
 * Sync failed with 1
-
[FATAL]
 
         
     
diff --git a/nico.txt b/nico.txt
index 92b3c7859749..d871ba74cda0 100644
--- a/nico.txt
+++ b/nico.txt
@@ -14,43 +14,22 @@
  'status': 'unofficial'}
  * Adding new repository
 $ pmaint sync nico
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mysql repo at '/var/lib/repo-mirror-ci/sync/mysql', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 Cloning into '/var/lib/repo-mirror-ci/sync/nico'...
-fatal: unable to access 'https://anongit.gentoo.org/git/user/nico.git/': The requested URL returned error: 504
 *** syncing nico
-!!! failed syncing nico
- * Sync failed with 1
+*** synced nico
+ * Sync succeeded
+$ git log --format=%ci -1
+$ git show -q --pretty=format:%G? HEAD
+$ pmaint regen --use-local-desc --pkg-desc-index -t 1 nico
+ * Cache regenerated successfully
diff --git a/nix-guix.html b/nix-guix.html
index 105b6898a5a9..1d9e9c2fe3f6 100644
--- a/nix-guix.html
+++ b/nix-guix.html
@@ -34,85 +34,57 @@
 

             12
$ pmaint sync nix-guix
 

-            13
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
warning: Pulling without specifying how to reconcile divergent branches is
 

-            19
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
discouraged. You can squelch this message by running one of the following
 

-            20
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
commands sometime before your next pull:
 

-            21
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
 

-            22
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase false  # merge (the default strategy)
 

-            23
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase true   # rebase
 

-            24
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.ff only       # fast-forward only
 

-            25
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 

-            26
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
You can replace "git config" with "git config --global" to set a default
 

-            27
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            28
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
or --ff-only on the command line to override the configured default per
 

-            29
WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
invocation.
 

-            30
WARNING:pkgcore:mysql repo at '/var/lib/repo-mirror-ci/sync/mysql', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
 

-            31
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
Already up to date.
 

-            32
warning: Pulling without specifying how to reconcile divergent branches is
+            32
*** syncing nix-guix
 

-            33
discouraged. You can squelch this message by running one of the following
+            33
*** synced nix-guix
 

-            34
commands sometime before your next pull:
+            34
 * Sync succeeded
 

-            35
+            35
$ git log --format=%ci -1
 

-            36
  git config pull.rebase false  # merge (the default strategy)
+            36
$ git show -q --pretty=format:%G? HEAD
 

-            37
  git config pull.rebase true   # rebase
+            37
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 nix-guix
 

-            38
  git config pull.ff only       # fast-forward only
-

-            39
-

-            40
You can replace "git config" with "git config --global" to set a default
-

-            41
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            42
or --ff-only on the command line to override the configured default per
-

-            43
invocation.
-

-            44
-

-            45
Already up to date.
-

-            46
*** syncing nix-guix
-

-            47
*** synced nix-guix
-

-            48
 * Sync succeeded
-

-            49
$ git log --format=%ci -1
-

-            50
$ git show -q --pretty=format:%G? HEAD
-

-            51
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 nix-guix
-

-            52
 * Cache regenerated successfully
+            38
 * Cache regenerated successfully
 

 
         
diff --git a/nix-guix.txt b/nix-guix.txt
index d50cd4f5dd16..177745635f78 100644
--- a/nix-guix.txt
+++ b/nix-guix.txt
@@ -10,25 +10,11 @@
              'uri': 'https://github.com/trofi/nix-guix-gentoo.git'}],
  'status': 'official'}
 $ pmaint sync nix-guix
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mysql repo at '/var/lib/repo-mirror-ci/sync/mysql', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/np-hardass-overlay.html b/np-hardass-overlay.html
index ea87673e4763..93759452e2fa 100644
--- a/np-hardass-overlay.html
+++ b/np-hardass-overlay.html
@@ -32,85 +32,57 @@
 

             11
$ pmaint sync np-hardass-overlay
 

-            12
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
warning: Pulling without specifying how to reconcile divergent branches is
 

-            18
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
discouraged. You can squelch this message by running one of the following
 

-            19
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
commands sometime before your next pull:
 

-            20
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
 

-            21
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
  git config pull.rebase false  # merge (the default strategy)
 

-            22
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase true   # rebase
 

-            23
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.ff only       # fast-forward only
 

-            24
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 

-            25
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
You can replace "git config" with "git config --global" to set a default
 

-            26
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            27
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
or --ff-only on the command line to override the configured default per
 

-            28
WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
invocation.
 

-            29
WARNING:pkgcore:mysql repo at '/var/lib/repo-mirror-ci/sync/mysql', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
 

-            30
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
Already up to date.
 

-            31
warning: Pulling without specifying how to reconcile divergent branches is
+            31
*** syncing np-hardass-overlay
 

-            32
discouraged. You can squelch this message by running one of the following
+            32
*** synced np-hardass-overlay
 

-            33
commands sometime before your next pull:
+            33
 * Sync succeeded
 

-            34
+            34
$ git log --format=%ci -1
 

-            35
  git config pull.rebase false  # merge (the default strategy)
+            35
$ git show -q --pretty=format:%G? HEAD
 

-            36
  git config pull.rebase true   # rebase
+            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 np-hardass-overlay
 

-            37
  git config pull.ff only       # fast-forward only
-

-            38
-

-            39
You can replace "git config" with "git config --global" to set a default
-

-            40
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            41
or --ff-only on the command line to override the configured default per
-

-            42
invocation.
-

-            43
-

-            44
Already up to date.
-

-            45
*** syncing np-hardass-overlay
-

-            46
*** synced np-hardass-overlay
-

-            47
 * Sync succeeded
-

-            48
$ git log --format=%ci -1
-

-            49
$ git show -q --pretty=format:%G? HEAD
-

-            50
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 np-hardass-overlay
-

-            51
 * Cache regenerated successfully
+            37
 * Cache regenerated successfully
 

 
         
diff --git a/np-hardass-overlay.txt b/np-hardass-overlay.txt
index 24887c0e1100..a1709e09419b 100644
--- a/np-hardass-overlay.txt
+++ b/np-hardass-overlay.txt
@@ -9,25 +9,11 @@
              'uri': 'https://github.com/np-hardass/np-hardass-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync np-hardass-overlay
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mysql repo at '/var/lib/repo-mirror-ci/sync/mysql', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/nx.html b/nx.html
index 424d61b64909..e22decb66e4b 100644
--- a/nx.html
+++ b/nx.html
@@ -32,97 +32,61 @@
 

             11
 'status': 'official'}
 

-            12
 * Adding new repository
+            12
$ pmaint sync nx
 

-            13
$ pmaint sync nx
+            13
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
warning: Pulling without specifying how to reconcile divergent branches is
 

-            20
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
discouraged. You can squelch this message by running one of the following
 

-            21
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
commands sometime before your next pull:
 

-            22
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
 

-            23
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase false  # merge (the default strategy)
 

-            24
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.rebase true   # rebase
 

-            25
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.ff only       # fast-forward only
 

-            26
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
 

-            27
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
You can replace "git config" with "git config --global" to set a default
 

-            28
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            29
WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
or --ff-only on the command line to override the configured default per
 

-            30
WARNING:pkgcore:mysql repo at '/var/lib/repo-mirror-ci/sync/mysql', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
invocation.
 

-            31
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
 

-            32
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
Already up to date.
 

-            33
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
*** syncing nx
 

-            34
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
*** synced nx
 

-            35
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
 * Sync succeeded
 

-            36
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
$ git log --format=%ci -1
 

-            37
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            37
$ git show -q --pretty=format:%G? HEAD
 

-            38
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            38
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 nx
 

-            39
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            40
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            41
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            42
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            43
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            44
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            45
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            46
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            47
WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            48
WARNING:pkgcore:mysql repo at '/var/lib/repo-mirror-ci/sync/mysql', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            49
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            50
Cloning into '/var/lib/repo-mirror-ci/sync/nx'...
-

-            51
*** syncing nx
-

-            52
*** synced nx
-

-            53
 * Sync succeeded
-

-            54
$ git log --format=%ci -1
-

-            55
$ git show -q --pretty=format:%G? HEAD
-

-            56
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 nx
-

-            57
 * Cache regenerated successfully
+            39
 * Cache regenerated successfully
 

 
         
diff --git a/nx.txt b/nx.txt
index 79a5ff6e914a..3bb5901a7850 100644
--- a/nx.txt
+++ b/nx.txt
@@ -9,45 +9,27 @@
             {'type': 'git', 'uri': 'git://anongit.gentoo.org/proj/nx.git'},
             {'type': 'git', 'uri': 'git+ssh://git@git.gentoo.org/proj/nx.git'}],
  'status': 'official'}
- * Adding new repository
 $ pmaint sync nx
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mysql repo at '/var/lib/repo-mirror-ci/sync/mysql', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mysql repo at '/var/lib/repo-mirror-ci/sync/mysql', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-Cloning into '/var/lib/repo-mirror-ci/sync/nx'...
+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.
+
+Already up to date.
 *** syncing nx
 *** synced nx
  * Sync succeeded
diff --git a/oboeverlay.html b/oboeverlay.html
index cc1ab89f08b9..939b14a4a498 100644
--- a/oboeverlay.html
+++ b/oboeverlay.html
@@ -40,91 +40,65 @@
 

             15
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
warning: Pulling without specifying how to reconcile divergent branches is
 

-            22
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
discouraged. You can squelch this message by running one of the following
 

-            23
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
commands sometime before your next pull:
 

-            24
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 

-            25
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase false  # merge (the default strategy)
 

-            26
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.rebase true   # rebase
 

-            27
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.ff only       # fast-forward only
 

-            28
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
 

-            29
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
You can replace "git config" with "git config --global" to set a default
 

-            30
WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            31
WARNING:pkgcore:mysql repo at '/var/lib/repo-mirror-ci/sync/mysql', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
or --ff-only on the command line to override the configured default per
 

-            32
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
invocation.
 

-            33
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
 

-            34
warning: Pulling without specifying how to reconcile divergent branches is
+            34
Already up to date.
 

-            35
discouraged. You can squelch this message by running one of the following
+            35
*** syncing oboeverlay
 

-            36
commands sometime before your next pull:
+            36
*** synced oboeverlay
 

-            37
+            37
 * Sync succeeded
 

-            38
  git config pull.rebase false  # merge (the default strategy)
+            38
$ git log --format=%ci -1
 

-            39
  git config pull.rebase true   # rebase
+            39
$ git show -q --pretty=format:%G? HEAD
 

-            40
  git config pull.ff only       # fast-forward only
+            40
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 oboeverlay
 

-            41
-

-            42
You can replace "git config" with "git config --global" to set a default
-

-            43
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            44
or --ff-only on the command line to override the configured default per
-

-            45
invocation.
-

-            46
-

-            47
Already up to date.
-

-            48
*** syncing oboeverlay
-

-            49
*** synced oboeverlay
-

-            50
 * Sync succeeded
-

-            51
$ git log --format=%ci -1
-

-            52
$ git show -q --pretty=format:%G? HEAD
-

-            53
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 oboeverlay
-

-            54
 * app-misc/kak-lsp-5.2.1: failed sourcing ebuild: EAPI=6 is not supported
+            41
 * app-misc/kak-lsp-5.2.1: failed sourcing ebuild: EAPI=6 is not supported
 
[FATAL]
-            55
 * app-misc/kak-lsp-6.0.0: failed sourcing ebuild: EAPI=6 is not supported
+            42
 * app-misc/kak-lsp-6.0.0: failed sourcing ebuild: EAPI=6 is not supported
 
[FATAL]
-            56
 * app-misc/kak-lsp-6.2.1: failed sourcing ebuild: EAPI=6 is not supported
+            43
 * app-misc/kak-lsp-6.2.1: failed sourcing ebuild: EAPI=6 is not supported
 
[FATAL]
-            57
 * sys-auth/libpam-pwdfile-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            44
 * sys-auth/libpam-pwdfile-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            58
 * Cache regen failed with 1
+            45
 * Cache regen failed with 1
 

 
         
diff --git a/oboeverlay.txt b/oboeverlay.txt
index 72ec5eb84b30..87791870da92 100644
--- a/oboeverlay.txt
+++ b/oboeverlay.txt
@@ -13,24 +13,11 @@
  'status': 'unofficial'}
 $ pmaint sync oboeverlay
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mysql repo at '/var/lib/repo-mirror-ci/sync/mysql', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/observer.html b/observer.html
index 2bcad8b0b6f3..7129f3055da7 100644
--- a/observer.html
+++ b/observer.html
@@ -34,83 +34,57 @@
 

             12
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
warning: Pulling without specifying how to reconcile divergent branches is
 

-            19
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
discouraged. You can squelch this message by running one of the following
 

-            20
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
commands sometime before your next pull:
 

-            21
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
 

-            22
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase false  # merge (the default strategy)
 

-            23
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase true   # rebase
 

-            24
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.ff only       # fast-forward only
 

-            25
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 

-            26
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
You can replace "git config" with "git config --global" to set a default
 

-            27
WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            28
WARNING:pkgcore:mysql repo at '/var/lib/repo-mirror-ci/sync/mysql', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
or --ff-only on the command line to override the configured default per
 

-            29
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
invocation.
 

-            30
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
 

-            31
warning: Pulling without specifying how to reconcile divergent branches is
+            31
Already up to date.
 

-            32
discouraged. You can squelch this message by running one of the following
+            32
*** syncing observer
 

-            33
commands sometime before your next pull:
+            33
*** synced observer
 

-            34
+            34
 * Sync succeeded
 

-            35
  git config pull.rebase false  # merge (the default strategy)
+            35
$ git log --format=%ci -1
 

-            36
  git config pull.rebase true   # rebase
+            36
$ git show -q --pretty=format:%G? HEAD
 

-            37
  git config pull.ff only       # fast-forward only
+            37
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 observer
 

-            38
-

-            39
You can replace "git config" with "git config --global" to set a default
-

-            40
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            41
or --ff-only on the command line to override the configured default per
-

-            42
invocation.
-

-            43
-

-            44
Already up to date.
-

-            45
*** syncing observer
-

-            46
*** synced observer
-

-            47
 * Sync succeeded
-

-            48
$ git log --format=%ci -1
-

-            49
$ git show -q --pretty=format:%G? HEAD
-

-            50
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 observer
-

-            51
 * Cache regenerated successfully
+            38
 * Cache regenerated successfully
 

 
         
diff --git a/observer.txt b/observer.txt
index f6ba08aae15f..265f585d8c0d 100644
--- a/observer.txt
+++ b/observer.txt
@@ -10,24 +10,11 @@
  'status': 'unofficial'}
 $ pmaint sync observer
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mysql repo at '/var/lib/repo-mirror-ci/sync/mysql', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/octave.html b/octave.html
index 4c65174d3c8b..57f2ed7bb17d 100644
--- a/octave.html
+++ b/octave.html
@@ -40,83 +40,57 @@
 

             15
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
warning: Pulling without specifying how to reconcile divergent branches is
 

-            22
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
discouraged. You can squelch this message by running one of the following
 

-            23
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
commands sometime before your next pull:
 

-            24
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 

-            25
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase false  # merge (the default strategy)
 

-            26
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.rebase true   # rebase
 

-            27
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.ff only       # fast-forward only
 

-            28
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
 

-            29
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
You can replace "git config" with "git config --global" to set a default
 

-            30
WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            31
WARNING:pkgcore:mysql repo at '/var/lib/repo-mirror-ci/sync/mysql', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
or --ff-only on the command line to override the configured default per
 

-            32
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
invocation.
 

-            33
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
 

-            34
warning: Pulling without specifying how to reconcile divergent branches is
+            34
Already up to date.
 

-            35
discouraged. You can squelch this message by running one of the following
+            35
*** syncing octave
 

-            36
commands sometime before your next pull:
+            36
*** synced octave
 

-            37
+            37
 * Sync succeeded
 

-            38
  git config pull.rebase false  # merge (the default strategy)
+            38
$ git log --format=%ci -1
 

-            39
  git config pull.rebase true   # rebase
+            39
$ git show -q --pretty=format:%G? HEAD
 

-            40
  git config pull.ff only       # fast-forward only
+            40
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 octave
 

-            41
-

-            42
You can replace "git config" with "git config --global" to set a default
-

-            43
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            44
or --ff-only on the command line to override the configured default per
-

-            45
invocation.
-

-            46
-

-            47
Already up to date.
-

-            48
*** syncing octave
-

-            49
*** synced octave
-

-            50
 * Sync succeeded
-

-            51
$ git log --format=%ci -1
-

-            52
$ git show -q --pretty=format:%G? HEAD
-

-            53
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 octave
-

-            54
 * Cache regenerated successfully
+            41
 * Cache regenerated successfully
 

 
         
diff --git a/octave.txt b/octave.txt
index 43fd36d0d6a6..7cca1f2666fd 100644
--- a/octave.txt
+++ b/octave.txt
@@ -13,24 +13,11 @@
  'status': 'unofficial'}
 $ pmaint sync octave
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mysql repo at '/var/lib/repo-mirror-ci/sync/mysql', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/octopus.html b/octopus.html
index 1a92cc680848..5ae3529609c4 100644
--- a/octopus.html
+++ b/octopus.html
@@ -30,83 +30,57 @@
 

             10
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            11
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            11
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            12
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
warning: Pulling without specifying how to reconcile divergent branches is
 

-            17
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
discouraged. You can squelch this message by running one of the following
 

-            18
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
commands sometime before your next pull:
 

-            19
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
 

-            20
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
  git config pull.rebase false  # merge (the default strategy)
 

-            21
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
  git config pull.rebase true   # rebase
 

-            22
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.ff only       # fast-forward only
 

-            23
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
 

-            24
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
You can replace "git config" with "git config --global" to set a default
 

-            25
WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            26
WARNING:pkgcore:mysql repo at '/var/lib/repo-mirror-ci/sync/mysql', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
or --ff-only on the command line to override the configured default per
 

-            27
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
invocation.
 

-            28
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
 

-            29
warning: Pulling without specifying how to reconcile divergent branches is
+            29
Already up to date.
 

-            30
discouraged. You can squelch this message by running one of the following
+            30
*** syncing octopus
 

-            31
commands sometime before your next pull:
+            31
*** synced octopus
 

-            32
+            32
 * Sync succeeded
 

-            33
  git config pull.rebase false  # merge (the default strategy)
+            33
$ git log --format=%ci -1
 

-            34
  git config pull.rebase true   # rebase
+            34
$ git show -q --pretty=format:%G? HEAD
 

-            35
  git config pull.ff only       # fast-forward only
+            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 octopus
 

-            36
-

-            37
You can replace "git config" with "git config --global" to set a default
-

-            38
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            39
or --ff-only on the command line to override the configured default per
-

-            40
invocation.
-

-            41
-

-            42
Already up to date.
-

-            43
*** syncing octopus
-

-            44
*** synced octopus
-

-            45
 * Sync succeeded
-

-            46
$ git log --format=%ci -1
-

-            47
$ git show -q --pretty=format:%G? HEAD
-

-            48
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 octopus
-

-            49
 * Cache regenerated successfully
+            36
 * Cache regenerated successfully
 

 
         
diff --git a/octopus.txt b/octopus.txt
index d24b9cb6a327..77112e648bd9 100644
--- a/octopus.txt
+++ b/octopus.txt
@@ -8,24 +8,11 @@
  'status': 'unofficial'}
 $ pmaint sync octopus
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mysql repo at '/var/lib/repo-mirror-ci/sync/mysql', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/oddlama.html b/oddlama.html
index 5e0c6ad4b0fc..66374f0dc3b9 100644
--- a/oddlama.html
+++ b/oddlama.html
@@ -38,105 +38,57 @@
 

             14
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
warning: Pulling without specifying how to reconcile divergent branches is
 

-            21
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
discouraged. You can squelch this message by running one of the following
 

-            22
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
commands sometime before your next pull:
 

-            23
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
 

-            24
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.rebase false  # merge (the default strategy)
 

-            25
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase true   # rebase
 

-            26
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.ff only       # fast-forward only
 

-            27
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
 

-            28
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
You can replace "git config" with "git config --global" to set a default
 

-            29
WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            30
WARNING:pkgcore:mysql repo at '/var/lib/repo-mirror-ci/sync/mysql', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
or --ff-only on the command line to override the configured default per
 

-            31
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
invocation.
 

-            32
WARNING:pkgcore:nx repo at '/var/lib/repo-mirror-ci/sync/nx', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
 

-            33
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
Already up to date.
 

-            34
warning: Pulling without specifying how to reconcile divergent branches is
+            34
*** syncing oddlama
 

-            35
discouraged. You can squelch this message by running one of the following
+            35
*** synced oddlama
 

-            36
commands sometime before your next pull:
+            36
 * Sync succeeded
 

-            37
+            37
$ git log --format=%ci -1
 

-            38
  git config pull.rebase false  # merge (the default strategy)
+            38
$ git show -q --pretty=format:%G? HEAD
 

-            39
  git config pull.rebase true   # rebase
+            39
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 oddlama
 

-            40
  git config pull.ff only       # fast-forward only
-

-            41
-

-            42
You can replace "git config" with "git config --global" to set a default
-

-            43
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            44
or --ff-only on the command line to override the configured default per
-

-            45
invocation.
-

-            46
-

-            47
From https://github.com/oddlama/overlay
-

-            48
   063378e..4e224fd  master     -> origin/master
-

-            49
Updating 063378e..4e224fd
-

-            50
Fast-forward
-

-            51
 app-admin/bitwarden_rs-web-vault/Manifest                             | 4 ++--
-

-            52
 ...s-web-vault-2.14.0.ebuild => bitwarden_rs-web-vault-2.16.1.ebuild} | 0
-

-            53
 app-admin/bitwarden_rs/Manifest                                       | 2 +-
-

-            54
 .../{bitwarden_rs-1.15.1.ebuild => bitwarden_rs-1.17.0.ebuild}        | 0
-

-            55
 4 files changed, 3 insertions(+), 3 deletions(-)
-

-            56
 rename app-admin/bitwarden_rs-web-vault/{bitwarden_rs-web-vault-2.14.0.ebuild => bitwarden_rs-web-vault-2.16.1.ebuild} (100%)
-

-            57
 rename app-admin/bitwarden_rs/{bitwarden_rs-1.15.1.ebuild => bitwarden_rs-1.17.0.ebuild} (100%)
-

-            58
*** syncing oddlama
-

-            59
*** synced oddlama
-

-            60
 * Sync succeeded
-

-            61
$ git log --format=%ci -1
-

-            62
$ git show -q --pretty=format:%G? HEAD
-

-            63
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 oddlama
-

-            64
 * Cache regenerated successfully
+            40
 * Cache regenerated successfully
 

 
         
diff --git a/oddlama.txt b/oddlama.txt
index 7676dc699a00..f33e973774b4 100644
--- a/oddlama.txt
+++ b/oddlama.txt
@@ -12,25 +12,11 @@
  'status': 'unofficial'}
 $ pmaint sync oddlama
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mysql repo at '/var/lib/repo-mirror-ci/sync/mysql', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nx repo at '/var/lib/repo-mirror-ci/sync/nx', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
@@ -44,17 +30,7 @@ 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/oddlama/overlay
-   063378e..4e224fd  master     -> origin/master
-Updating 063378e..4e224fd
-Fast-forward
- app-admin/bitwarden_rs-web-vault/Manifest                             | 4 ++--
- ...s-web-vault-2.14.0.ebuild => bitwarden_rs-web-vault-2.16.1.ebuild} | 0
- app-admin/bitwarden_rs/Manifest                                       | 2 +-
- .../{bitwarden_rs-1.15.1.ebuild => bitwarden_rs-1.17.0.ebuild}        | 0
- 4 files changed, 3 insertions(+), 3 deletions(-)
- rename app-admin/bitwarden_rs-web-vault/{bitwarden_rs-web-vault-2.14.0.ebuild => bitwarden_rs-web-vault-2.16.1.ebuild} (100%)
- rename app-admin/bitwarden_rs/{bitwarden_rs-1.15.1.ebuild => bitwarden_rs-1.17.0.ebuild} (100%)
+Already up to date.
 *** syncing oddlama
 *** synced oddlama
  * Sync succeeded
diff --git a/olifre.html b/olifre.html
index 54a49680868f..c83fb81ab028 100644
--- a/olifre.html
+++ b/olifre.html
@@ -42,85 +42,55 @@
 

             16
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
warning: Pulling without specifying how to reconcile divergent branches is
 

-            22
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
discouraged. You can squelch this message by running one of the following
 

-            23
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
commands sometime before your next pull:
 

-            24
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 

-            25
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase false  # merge (the default strategy)
 

-            26
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.rebase true   # rebase
 

-            27
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.ff only       # fast-forward only
 

-            28
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
 

-            29
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
You can replace "git config" with "git config --global" to set a default
 

-            30
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            31
WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
or --ff-only on the command line to override the configured default per
 

-            32
WARNING:pkgcore:mysql repo at '/var/lib/repo-mirror-ci/sync/mysql', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
invocation.
 

-            33
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
 

-            34
WARNING:pkgcore:nx repo at '/var/lib/repo-mirror-ci/sync/nx', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
Already up to date.
 

-            35
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
*** syncing olifre
 

-            36
warning: Pulling without specifying how to reconcile divergent branches is
+            36
*** synced olifre
 

-            37
discouraged. You can squelch this message by running one of the following
+            37
 * Sync succeeded
 

-            38
commands sometime before your next pull:
+            38
$ git log --format=%ci -1
 

-            39
+            39
$ git show -q --pretty=format:%G? HEAD
 

-            40
  git config pull.rebase false  # merge (the default strategy)
+            40
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 olifre
 

-            41
  git config pull.rebase true   # rebase
-

-            42
  git config pull.ff only       # fast-forward only
-

-            43
-

-            44
You can replace "git config" with "git config --global" to set a default
-

-            45
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            46
or --ff-only on the command line to override the configured default per
-

-            47
invocation.
-

-            48
-

-            49
Already up to date.
-

-            50
*** syncing olifre
-

-            51
*** synced olifre
-

-            52
 * Sync succeeded
-

-            53
$ git log --format=%ci -1
-

-            54
$ git show -q --pretty=format:%G? HEAD
-

-            55
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 olifre
-

-            56
 * Cache regenerated successfully
+            41
 * Cache regenerated successfully
 

 
         
diff --git a/olifre.txt b/olifre.txt
index ea40924ef058..2a8e4a2bf916 100644
--- a/olifre.txt
+++ b/olifre.txt
@@ -14,25 +14,10 @@
  'status': 'unofficial'}
 $ pmaint sync olifre
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mysql repo at '/var/lib/repo-mirror-ci/sync/mysql', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nx repo at '/var/lib/repo-mirror-ci/sync/nx', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/openclonk.html b/openclonk.html
index ab349192aa97..4d745ce99249 100644
--- a/openclonk.html
+++ b/openclonk.html
@@ -40,85 +40,57 @@
 

             15
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
warning: Pulling without specifying how to reconcile divergent branches is
 

-            22
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
discouraged. You can squelch this message by running one of the following
 

-            23
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
commands sometime before your next pull:
 

-            24
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 

-            25
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase false  # merge (the default strategy)
 

-            26
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.rebase true   # rebase
 

-            27
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.ff only       # fast-forward only
 

-            28
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
 

-            29
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
You can replace "git config" with "git config --global" to set a default
 

-            30
WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            31
WARNING:pkgcore:mysql repo at '/var/lib/repo-mirror-ci/sync/mysql', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
or --ff-only on the command line to override the configured default per
 

-            32
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
invocation.
 

-            33
WARNING:pkgcore:nx repo at '/var/lib/repo-mirror-ci/sync/nx', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
 

-            34
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
Already up to date.
 

-            35
warning: Pulling without specifying how to reconcile divergent branches is
+            35
*** syncing openclonk
 

-            36
discouraged. You can squelch this message by running one of the following
+            36
*** synced openclonk
 

-            37
commands sometime before your next pull:
+            37
 * Sync succeeded
 

-            38
+            38
$ git log --format=%ci -1
 

-            39
  git config pull.rebase false  # merge (the default strategy)
+            39
$ git show -q --pretty=format:%G? HEAD
 

-            40
  git config pull.rebase true   # rebase
+            40
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 openclonk
 

-            41
  git config pull.ff only       # fast-forward only
-

-            42
-

-            43
You can replace "git config" with "git config --global" to set a default
-

-            44
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            45
or --ff-only on the command line to override the configured default per
-

-            46
invocation.
-

-            47
-

-            48
Already up to date.
-

-            49
*** syncing openclonk
-

-            50
*** synced openclonk
-

-            51
 * Sync succeeded
-

-            52
$ git log --format=%ci -1
-

-            53
$ git show -q --pretty=format:%G? HEAD
-

-            54
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 openclonk
-

-            55
 * Cache regenerated successfully
+            41
 * Cache regenerated successfully
 

 
         
diff --git a/openclonk.txt b/openclonk.txt
index d505b67dda17..cfda266fd909 100644
--- a/openclonk.txt
+++ b/openclonk.txt
@@ -13,25 +13,11 @@
  'status': 'unofficial'}
 $ pmaint sync openclonk
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mysql repo at '/var/lib/repo-mirror-ci/sync/mysql', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nx repo at '/var/lib/repo-mirror-ci/sync/nx', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/openwrt.html b/openwrt.html
index 4ccdd62efa4b..d58c1d2b7278 100644
--- a/openwrt.html
+++ b/openwrt.html
@@ -34,85 +34,57 @@
 

             12
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
warning: Pulling without specifying how to reconcile divergent branches is
 

-            19
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
discouraged. You can squelch this message by running one of the following
 

-            20
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
commands sometime before your next pull:
 

-            21
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
 

-            22
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase false  # merge (the default strategy)
 

-            23
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase true   # rebase
 

-            24
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.ff only       # fast-forward only
 

-            25
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 

-            26
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
You can replace "git config" with "git config --global" to set a default
 

-            27
WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            28
WARNING:pkgcore:mysql repo at '/var/lib/repo-mirror-ci/sync/mysql', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
or --ff-only on the command line to override the configured default per
 

-            29
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
invocation.
 

-            30
WARNING:pkgcore:nx repo at '/var/lib/repo-mirror-ci/sync/nx', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
 

-            31
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
Already up to date.
 

-            32
warning: Pulling without specifying how to reconcile divergent branches is
+            32
*** syncing openwrt
 

-            33
discouraged. You can squelch this message by running one of the following
+            33
*** synced openwrt
 

-            34
commands sometime before your next pull:
+            34
 * Sync succeeded
 

-            35
+            35
$ git log --format=%ci -1
 

-            36
  git config pull.rebase false  # merge (the default strategy)
+            36
$ git show -q --pretty=format:%G? HEAD
 

-            37
  git config pull.rebase true   # rebase
+            37
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 openwrt
 

-            38
  git config pull.ff only       # fast-forward only
-

-            39
-

-            40
You can replace "git config" with "git config --global" to set a default
-

-            41
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            42
or --ff-only on the command line to override the configured default per
-

-            43
invocation.
-

-            44
-

-            45
Already up to date.
-

-            46
*** syncing openwrt
-

-            47
*** synced openwrt
-

-            48
 * Sync succeeded
-

-            49
$ git log --format=%ci -1
-

-            50
$ git show -q --pretty=format:%G? HEAD
-

-            51
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 openwrt
-

-            52
 * Cache regenerated successfully
+            38
 * Cache regenerated successfully
 

 
         
diff --git a/openwrt.txt b/openwrt.txt
index 219e37a5596c..5f6ccc9265d4 100644
--- a/openwrt.txt
+++ b/openwrt.txt
@@ -10,25 +10,11 @@
  'status': 'unofficial'}
 $ pmaint sync openwrt
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mysql repo at '/var/lib/repo-mirror-ci/sync/mysql', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nx repo at '/var/lib/repo-mirror-ci/sync/nx', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/optmzr.html b/optmzr.html
index 949699fb4596..ec558a14d990 100644
--- a/optmzr.html
+++ b/optmzr.html
@@ -40,85 +40,55 @@
 

             15
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
warning: Pulling without specifying how to reconcile divergent branches is
 

-            21
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
discouraged. You can squelch this message by running one of the following
 

-            22
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
commands sometime before your next pull:
 

-            23
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
 

-            24
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.rebase false  # merge (the default strategy)
 

-            25
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase true   # rebase
 

-            26
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.ff only       # fast-forward only
 

-            27
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
 

-            28
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
You can replace "git config" with "git config --global" to set a default
 

-            29
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            30
WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
or --ff-only on the command line to override the configured default per
 

-            31
WARNING:pkgcore:mysql repo at '/var/lib/repo-mirror-ci/sync/mysql', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
invocation.
 

-            32
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
 

-            33
WARNING:pkgcore:nx repo at '/var/lib/repo-mirror-ci/sync/nx', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
Already up to date.
 

-            34
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
*** syncing optmzr
 

-            35
warning: Pulling without specifying how to reconcile divergent branches is
+            35
*** synced optmzr
 

-            36
discouraged. You can squelch this message by running one of the following
+            36
 * Sync succeeded
 

-            37
commands sometime before your next pull:
+            37
$ git log --format=%ci -1
 

-            38
+            38
$ git show -q --pretty=format:%G? HEAD
 

-            39
  git config pull.rebase false  # merge (the default strategy)
+            39
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 optmzr
 

-            40
  git config pull.rebase true   # rebase
-

-            41
  git config pull.ff only       # fast-forward only
-

-            42
-

-            43
You can replace "git config" with "git config --global" to set a default
-

-            44
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            45
or --ff-only on the command line to override the configured default per
-

-            46
invocation.
-

-            47
-

-            48
Already up to date.
-

-            49
*** syncing optmzr
-

-            50
*** synced optmzr
-

-            51
 * Sync succeeded
-

-            52
$ git log --format=%ci -1
-

-            53
$ git show -q --pretty=format:%G? HEAD
-

-            54
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 optmzr
-

-            55
 * Cache regenerated successfully
+            40
 * Cache regenerated successfully
 

 
         
diff --git a/optmzr.txt b/optmzr.txt
index bc36a918c326..22a45ee8a2bc 100644
--- a/optmzr.txt
+++ b/optmzr.txt
@@ -13,25 +13,10 @@
  'status': 'unofficial'}
 $ pmaint sync optmzr
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mysql repo at '/var/lib/repo-mirror-ci/sync/mysql', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nx repo at '/var/lib/repo-mirror-ci/sync/nx', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/oubliette.html b/oubliette.html
index 17eff9c91e94..2a4e2663a1b3 100644
--- a/oubliette.html
+++ b/oubliette.html
@@ -36,85 +36,55 @@
 

             13
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
warning: Pulling without specifying how to reconcile divergent branches is
 

-            19
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
discouraged. You can squelch this message by running one of the following
 

-            20
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
commands sometime before your next pull:
 

-            21
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
 

-            22
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase false  # merge (the default strategy)
 

-            23
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase true   # rebase
 

-            24
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.ff only       # fast-forward only
 

-            25
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 

-            26
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
You can replace "git config" with "git config --global" to set a default
 

-            27
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            28
WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
or --ff-only on the command line to override the configured default per
 

-            29
WARNING:pkgcore:mysql repo at '/var/lib/repo-mirror-ci/sync/mysql', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
invocation.
 

-            30
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
 

-            31
WARNING:pkgcore:nx repo at '/var/lib/repo-mirror-ci/sync/nx', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
Already up to date.
 

-            32
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
*** syncing oubliette
 

-            33
warning: Pulling without specifying how to reconcile divergent branches is
+            33
*** synced oubliette
 

-            34
discouraged. You can squelch this message by running one of the following
+            34
 * Sync succeeded
 

-            35
commands sometime before your next pull:
+            35
$ git log --format=%ci -1
 

-            36
+            36
$ git show -q --pretty=format:%G? HEAD
 

-            37
  git config pull.rebase false  # merge (the default strategy)
+            37
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 oubliette
 

-            38
  git config pull.rebase true   # rebase
-

-            39
  git config pull.ff only       # fast-forward only
-

-            40
-

-            41
You can replace "git config" with "git config --global" to set a default
-

-            42
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            43
or --ff-only on the command line to override the configured default per
-

-            44
invocation.
-

-            45
-

-            46
Already up to date.
-

-            47
*** syncing oubliette
-

-            48
*** synced oubliette
-

-            49
 * Sync succeeded
-

-            50
$ git log --format=%ci -1
-

-            51
$ git show -q --pretty=format:%G? HEAD
-

-            52
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 oubliette
-

-            53
 * Cache regenerated successfully
+            38
 * Cache regenerated successfully
 

 
         
diff --git a/oubliette.txt b/oubliette.txt
index dc5ba4327a09..ed354a93edb9 100644
--- a/oubliette.txt
+++ b/oubliette.txt
@@ -11,25 +11,10 @@
  'status': 'unofficial'}
 $ pmaint sync oubliette
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mysql repo at '/var/lib/repo-mirror-ci/sync/mysql', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nx repo at '/var/lib/repo-mirror-ci/sync/nx', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/palemoon.html b/palemoon.html
index 1322c686d9ed..8228b7390827 100644
--- a/palemoon.html
+++ b/palemoon.html
@@ -38,83 +38,57 @@
 

             14
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
warning: Pulling without specifying how to reconcile divergent branches is
 

-            21
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
discouraged. You can squelch this message by running one of the following
 

-            22
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
commands sometime before your next pull:
 

-            23
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
 

-            24
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.rebase false  # merge (the default strategy)
 

-            25
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase true   # rebase
 

-            26
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.ff only       # fast-forward only
 

-            27
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
 

-            28
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
You can replace "git config" with "git config --global" to set a default
 

-            29
WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            30
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
or --ff-only on the command line to override the configured default per
 

-            31
WARNING:pkgcore:nx repo at '/var/lib/repo-mirror-ci/sync/nx', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
invocation.
 

-            32
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
 

-            33
warning: Pulling without specifying how to reconcile divergent branches is
+            33
Already up to date.
 

-            34
discouraged. You can squelch this message by running one of the following
+            34
*** syncing palemoon
 

-            35
commands sometime before your next pull:
+            35
*** synced palemoon
 

-            36
+            36
 * Sync succeeded
 

-            37
  git config pull.rebase false  # merge (the default strategy)
+            37
$ git log --format=%ci -1
 

-            38
  git config pull.rebase true   # rebase
+            38
$ git show -q --pretty=format:%G? HEAD
 

-            39
  git config pull.ff only       # fast-forward only
+            39
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 palemoon
 

-            40
-

-            41
You can replace "git config" with "git config --global" to set a default
-

-            42
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            43
or --ff-only on the command line to override the configured default per
-

-            44
invocation.
-

-            45
-

-            46
Already up to date.
-

-            47
*** syncing palemoon
-

-            48
*** synced palemoon
-

-            49
 * Sync succeeded
-

-            50
$ git log --format=%ci -1
-

-            51
$ git show -q --pretty=format:%G? HEAD
-

-            52
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 palemoon
-

-            53
 * Cache regenerated successfully
+            40
 * Cache regenerated successfully
 

 
         
diff --git a/palemoon.txt b/palemoon.txt
index 3477d13e00d1..93acff464c00 100644
--- a/palemoon.txt
+++ b/palemoon.txt
@@ -12,24 +12,11 @@
  'status': 'unofficial'}
 $ pmaint sync palemoon
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nx repo at '/var/lib/repo-mirror-ci/sync/nx', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/palmer.html b/palmer.html
index dbc58acee0f1..46d54575d079 100644
--- a/palmer.html
+++ b/palmer.html
@@ -38,101 +38,63 @@
 

             14
 'status': 'unofficial'}
 

-            15
 * Adding new repository
+            15
$ pmaint sync palmer
 

-            16
$ pmaint sync palmer
+            16
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
warning: Pulling without specifying how to reconcile divergent branches is
 

-            23
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
discouraged. You can squelch this message by running one of the following
 

-            24
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
commands sometime before your next pull:
 

-            25
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 

-            26
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.rebase false  # merge (the default strategy)
 

-            27
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.rebase true   # rebase
 

-            28
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
  git config pull.ff only       # fast-forward only
 

-            29
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
 

-            30
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
You can replace "git config" with "git config --global" to set a default
 

-            31
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            32
WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
or --ff-only on the command line to override the configured default per
 

-            33
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
invocation.
 

-            34
WARNING:pkgcore:nx repo at '/var/lib/repo-mirror-ci/sync/nx', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
 

-            35
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
Already up to date.
 

-            36
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
*** syncing palmer
 

-            37
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            37
*** synced palmer
 

-            38
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            38
 * Sync succeeded
 

-            39
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            39
$ git log --format=%ci -1
 

-            40
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            40
$ git show -q --pretty=format:%G? HEAD
 

-            41
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            41
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 palmer
 

-            42
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            43
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            44
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            45
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            46
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            47
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            48
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            49
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            50
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            51
WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            52
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            53
WARNING:pkgcore:nx repo at '/var/lib/repo-mirror-ci/sync/nx', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            54
Cloning into '/var/lib/repo-mirror-ci/sync/palmer'...
-

-            55
*** syncing palmer
-

-            56
*** synced palmer
-

-            57
 * Sync succeeded
-

-            58
$ git log --format=%ci -1
-

-            59
$ git show -q --pretty=format:%G? HEAD
-

-            60
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 palmer
-

-            61
 * net-misc/rtv-1.13.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
+            42
 * net-misc/rtv-1.13.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
 
[FATAL]
-            62
 * Cache regen failed with 1
+            43
 * Cache regen failed with 1
 

 
         
diff --git a/palmer.txt b/palmer.txt
index e15959504705..be6700a43114 100644
--- a/palmer.txt
+++ b/palmer.txt
@@ -12,46 +12,27 @@
             {'type': 'git',
              'uri': 'git+ssh://git@git.gentoo.org/user/palmer.git'}],
  'status': 'unofficial'}
- * Adding new repository
 $ pmaint sync palmer
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nx repo at '/var/lib/repo-mirror-ci/sync/nx', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nx repo at '/var/lib/repo-mirror-ci/sync/nx', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-Cloning into '/var/lib/repo-mirror-ci/sync/palmer'...
+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.
+
+Already up to date.
 *** syncing palmer
 *** synced palmer
  * Sync succeeded
diff --git a/panther.html b/panther.html
index 040a826df864..f3e3e614e863 100644
--- a/panther.html
+++ b/panther.html
@@ -40,83 +40,57 @@
 

             15
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
warning: Pulling without specifying how to reconcile divergent branches is
 

-            22
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
discouraged. You can squelch this message by running one of the following
 

-            23
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
commands sometime before your next pull:
 

-            24
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 

-            25
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase false  # merge (the default strategy)
 

-            26
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.rebase true   # rebase
 

-            27
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.ff only       # fast-forward only
 

-            28
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
 

-            29
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
You can replace "git config" with "git config --global" to set a default
 

-            30
WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            31
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
or --ff-only on the command line to override the configured default per
 

-            32
WARNING:pkgcore:nx repo at '/var/lib/repo-mirror-ci/sync/nx', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
invocation.
 

-            33
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
 

-            34
warning: Pulling without specifying how to reconcile divergent branches is
+            34
Already up to date.
 

-            35
discouraged. You can squelch this message by running one of the following
+            35
*** syncing panther
 

-            36
commands sometime before your next pull:
+            36
*** synced panther
 

-            37
+            37
 * Sync succeeded
 

-            38
  git config pull.rebase false  # merge (the default strategy)
+            38
$ git log --format=%ci -1
 

-            39
  git config pull.rebase true   # rebase
+            39
$ git show -q --pretty=format:%G? HEAD
 

-            40
  git config pull.ff only       # fast-forward only
+            40
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 panther
 

-            41
-

-            42
You can replace "git config" with "git config --global" to set a default
-

-            43
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            44
or --ff-only on the command line to override the configured default per
-

-            45
invocation.
-

-            46
-

-            47
Already up to date.
-

-            48
*** syncing panther
-

-            49
*** synced panther
-

-            50
 * Sync succeeded
-

-            51
$ git log --format=%ci -1
-

-            52
$ git show -q --pretty=format:%G? HEAD
-

-            53
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 panther
-

-            54
 * Cache regenerated successfully
+            41
 * Cache regenerated successfully
 

 
         
diff --git a/panther.txt b/panther.txt
index 913b1a44d46c..db869dfaaff8 100644
--- a/panther.txt
+++ b/panther.txt
@@ -13,24 +13,11 @@
  'status': 'unofficial'}
 $ pmaint sync panther
 WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nx repo at '/var/lib/repo-mirror-ci/sync/nx', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/pdilung.html b/pdilung.html
index ff1dab7badfe..84797bdb4d74 100644
--- a/pdilung.html
+++ b/pdilung.html
@@ -42,83 +42,59 @@
 

             16
$ pmaint sync pdilung
 

-            17
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            23
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
warning: Pulling without specifying how to reconcile divergent branches is
 

-            24
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
discouraged. You can squelch this message by running one of the following
 

-            25
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
commands sometime before your next pull:
 

-            26
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
 

-            27
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.rebase false  # merge (the default strategy)
 

-            28
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
  git config pull.rebase true   # rebase
 

-            29
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
  git config pull.ff only       # fast-forward only
 

-            30
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
 

-            31
WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
You can replace "git config" with "git config --global" to set a default
 

-            32
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            33
WARNING:pkgcore:palmer repo at '/var/lib/repo-mirror-ci/sync/palmer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
or --ff-only on the command line to override the configured default per
 

-            34
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
invocation.
 

-            35
warning: Pulling without specifying how to reconcile divergent branches is
+            35
 

-            36
discouraged. You can squelch this message by running one of the following
+            36
Already up to date.
 

-            37
commands sometime before your next pull:
+            37
*** syncing pdilung
 

-            38
+            38
*** synced pdilung
 

-            39
  git config pull.rebase false  # merge (the default strategy)
+            39
 * Sync succeeded
 

-            40
  git config pull.rebase true   # rebase
+            40
$ git log --format=%ci -1
 

-            41
  git config pull.ff only       # fast-forward only
+            41
$ git show -q --pretty=format:%G? HEAD
 

-            42
+            42
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 pdilung
 

-            43
You can replace "git config" with "git config --global" to set a default
-

-            44
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            45
or --ff-only on the command line to override the configured default per
-

-            46
invocation.
-

-            47
-

-            48
Already up to date.
-

-            49
*** syncing pdilung
-

-            50
*** synced pdilung
-

-            51
 * Sync succeeded
-

-            52
$ git log --format=%ci -1
-

-            53
$ git show -q --pretty=format:%G? HEAD
-

-            54
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 pdilung
-

-            55
 * Cache regenerated successfully
+            43
 * Cache regenerated successfully
 

 
         
diff --git a/pdilung.txt b/pdilung.txt
index 48deba7ff6da..7a8a53ddd600 100644
--- a/pdilung.txt
+++ b/pdilung.txt
@@ -14,24 +14,12 @@
              'uri': 'git@github.com:pdilung/gentoo-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync pdilung
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:palmer repo at '/var/lib/repo-mirror-ci/sync/palmer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/pentoo.html b/pentoo.html
index 0a52ffbce969..9ce8079f5cab 100644
--- a/pentoo.html
+++ b/pentoo.html
@@ -34,83 +34,77 @@
 

             12
$ pmaint sync pentoo
 

-            13
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
warning: Pulling without specifying how to reconcile divergent branches is
 

-            20
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
discouraged. You can squelch this message by running one of the following
 

-            21
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
commands sometime before your next pull:
 

-            22
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
 

-            23
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase false  # merge (the default strategy)
 

-            24
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.rebase true   # rebase
 

-            25
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.ff only       # fast-forward only
 

-            26
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
 

-            27
WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
You can replace "git config" with "git config --global" to set a default
 

-            28
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            29
WARNING:pkgcore:palmer repo at '/var/lib/repo-mirror-ci/sync/palmer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
or --ff-only on the command line to override the configured default per
 

-            30
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
invocation.
 

-            31
warning: Pulling without specifying how to reconcile divergent branches is
+            31
 

-            32
discouraged. You can squelch this message by running one of the following
+            32
From https://github.com/pentoo/pentoo-overlay
 

-            33
commands sometime before your next pull:
+            33
   4d681becb..05c1bd224  master     -> origin/master
 

-            34
+            34
Updating 4d681becb..05c1bd224
 

-            35
  git config pull.rebase false  # merge (the default strategy)
+            35
Fast-forward
 

-            36
  git config pull.rebase true   # rebase
+            36
 profiles/pentoo/base/package.accept_keywords/dev-java | 7 -------
 

-            37
  git config pull.ff only       # fast-forward only
+            37
 profiles/pentoo/base/package.keywords/dev-java        | 6 ++++++
 

-            38
+            38
 profiles/pentoo/overlay/package.keywords/dev-java     | 1 +
 

-            39
You can replace "git config" with "git config --global" to set a default
+            39
 3 files changed, 7 insertions(+), 7 deletions(-)
 

-            40
preference for all repositories. You can also pass --rebase, --no-rebase,
+            40
 create mode 100644 profiles/pentoo/base/package.keywords/dev-java
 

-            41
or --ff-only on the command line to override the configured default per
+            41
 create mode 120000 profiles/pentoo/overlay/package.keywords/dev-java
 

-            42
invocation.
+            42
*** syncing pentoo
 

-            43
+            43
*** synced pentoo
 

-            44
Already up to date.
+            44
 * Sync succeeded
 

-            45
*** syncing pentoo
+            45
$ git log --format=%ci -1
 

-            46
*** synced pentoo
+            46
$ git show -q --pretty=format:%G? HEAD
 

-            47
 * Sync succeeded
+            47
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 pentoo
 

-            48
$ git log --format=%ci -1
-

-            49
$ git show -q --pretty=format:%G? HEAD
-

-            50
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 pentoo
-

-            51
 * Cache regenerated successfully
+            48
 * Cache regenerated successfully
 

 
         
diff --git a/pentoo.txt b/pentoo.txt
index 78c0cce6b95b..6f9795b8332b 100644
--- a/pentoo.txt
+++ b/pentoo.txt
@@ -10,24 +10,12 @@
             {'type': 'git', 'uri': 'git@github.com:pentoo/pentoo-overlay.git'}],
  'status': 'official'}
 $ pmaint sync pentoo
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:palmer repo at '/var/lib/repo-mirror-ci/sync/palmer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
@@ -41,7 +29,16 @@ 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.
 
-Already up to date.
+From https://github.com/pentoo/pentoo-overlay
+   4d681becb..05c1bd224  master     -> origin/master
+Updating 4d681becb..05c1bd224
+Fast-forward
+ profiles/pentoo/base/package.accept_keywords/dev-java | 7 -------
+ profiles/pentoo/base/package.keywords/dev-java        | 6 ++++++
+ profiles/pentoo/overlay/package.keywords/dev-java     | 1 +
+ 3 files changed, 7 insertions(+), 7 deletions(-)
+ create mode 100644 profiles/pentoo/base/package.keywords/dev-java
+ create mode 120000 profiles/pentoo/overlay/package.keywords/dev-java
 *** syncing pentoo
 *** synced pentoo
  * Sync succeeded
diff --git a/perl-experimental-snapshots.html b/perl-experimental-snapshots.html
index d79de04317d7..16f0eedd58bc 100644
--- a/perl-experimental-snapshots.html
+++ b/perl-experimental-snapshots.html
@@ -40,83 +40,59 @@
 

             15
$ pmaint sync perl-experimental-snapshots
 

-            16
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
warning: Pulling without specifying how to reconcile divergent branches is
 

-            23
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
discouraged. You can squelch this message by running one of the following
 

-            24
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
commands sometime before your next pull:
 

-            25
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 

-            26
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.rebase false  # merge (the default strategy)
 

-            27
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.rebase true   # rebase
 

-            28
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
  git config pull.ff only       # fast-forward only
 

-            29
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
 

-            30
WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
You can replace "git config" with "git config --global" to set a default
 

-            31
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            32
WARNING:pkgcore:palmer repo at '/var/lib/repo-mirror-ci/sync/palmer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
or --ff-only on the command line to override the configured default per
 

-            33
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
invocation.
 

-            34
warning: Pulling without specifying how to reconcile divergent branches is
+            34
 

-            35
discouraged. You can squelch this message by running one of the following
+            35
Already up to date.
 

-            36
commands sometime before your next pull:
+            36
*** syncing perl-experimental-snapshots
 

-            37
+            37
*** synced perl-experimental-snapshots
 

-            38
  git config pull.rebase false  # merge (the default strategy)
+            38
 * Sync succeeded
 

-            39
  git config pull.rebase true   # rebase
+            39
$ git log --format=%ci -1
 

-            40
  git config pull.ff only       # fast-forward only
+            40
$ git show -q --pretty=format:%G? HEAD
 

-            41
+            41
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 perl-experimental-snapshots
 

-            42
You can replace "git config" with "git config --global" to set a default
-

-            43
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            44
or --ff-only on the command line to override the configured default per
-

-            45
invocation.
-

-            46
-

-            47
Already up to date.
-

-            48
*** syncing perl-experimental-snapshots
-

-            49
*** synced perl-experimental-snapshots
-

-            50
 * Sync succeeded
-

-            51
$ git log --format=%ci -1
-

-            52
$ git show -q --pretty=format:%G? HEAD
-

-            53
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 perl-experimental-snapshots
-

-            54
 * Cache regenerated successfully
+            42
 * Cache regenerated successfully
 

 
         
diff --git a/perl-experimental-snapshots.txt b/perl-experimental-snapshots.txt
index d46d1ede5e47..2e9a6b68bd3b 100644
--- a/perl-experimental-snapshots.txt
+++ b/perl-experimental-snapshots.txt
@@ -13,24 +13,12 @@
              'uri': 'git://github.com/gentoo-perl/perl-experimental-snapshots.git'}],
  'status': 'unofficial'}
 $ pmaint sync perl-experimental-snapshots
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:palmer repo at '/var/lib/repo-mirror-ci/sync/palmer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/perl-experimental.html b/perl-experimental.html
index 240e6182df0f..d16bdc8e5dc2 100644
--- a/perl-experimental.html
+++ b/perl-experimental.html
@@ -46,83 +46,59 @@
 

             18
$ pmaint sync perl-experimental
 

-            19
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            23
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            24
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            25
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
warning: Pulling without specifying how to reconcile divergent branches is
 

-            26
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
discouraged. You can squelch this message by running one of the following
 

-            27
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
commands sometime before your next pull:
 

-            28
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
 

-            29
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
  git config pull.rebase false  # merge (the default strategy)
 

-            30
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
  git config pull.rebase true   # rebase
 

-            31
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
  git config pull.ff only       # fast-forward only
 

-            32
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
 

-            33
WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
You can replace "git config" with "git config --global" to set a default
 

-            34
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            35
WARNING:pkgcore:palmer repo at '/var/lib/repo-mirror-ci/sync/palmer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
or --ff-only on the command line to override the configured default per
 

-            36
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
invocation.
 

-            37
warning: Pulling without specifying how to reconcile divergent branches is
+            37
 

-            38
discouraged. You can squelch this message by running one of the following
+            38
Already up to date.
 

-            39
commands sometime before your next pull:
+            39
*** syncing perl-experimental
 

-            40
+            40
*** synced perl-experimental
 

-            41
  git config pull.rebase false  # merge (the default strategy)
+            41
 * Sync succeeded
 

-            42
  git config pull.rebase true   # rebase
+            42
$ git log --format=%ci -1
 

-            43
  git config pull.ff only       # fast-forward only
+            43
$ git show -q --pretty=format:%G? HEAD
 

-            44
+            44
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 perl-experimental
 

-            45
You can replace "git config" with "git config --global" to set a default
-

-            46
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            47
or --ff-only on the command line to override the configured default per
-

-            48
invocation.
-

-            49
-

-            50
Already up to date.
-

-            51
*** syncing perl-experimental
-

-            52
*** synced perl-experimental
-

-            53
 * Sync succeeded
-

-            54
$ git log --format=%ci -1
-

-            55
$ git show -q --pretty=format:%G? HEAD
-

-            56
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 perl-experimental
-

-            57
 * Cache regenerated successfully
+            45
 * Cache regenerated successfully
 

 
         
diff --git a/perl-experimental.txt b/perl-experimental.txt
index 4a463be43b61..3c6faa91eed0 100644
--- a/perl-experimental.txt
+++ b/perl-experimental.txt
@@ -16,24 +16,12 @@
              'uri': 'git+ssh://git@git.gentoo.org/proj/perl-overlay.git'}],
  'status': 'official'}
 $ pmaint sync perl-experimental
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:palmer repo at '/var/lib/repo-mirror-ci/sync/palmer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/petkovich.html b/petkovich.html
index 8e7e358c07cc..95419d8e616a 100644
--- a/petkovich.html
+++ b/petkovich.html
@@ -42,81 +42,59 @@
 

             16
$ pmaint sync petkovich
 

-            17
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            23
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
warning: Pulling without specifying how to reconcile divergent branches is
 

-            24
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
discouraged. You can squelch this message by running one of the following
 

-            25
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
commands sometime before your next pull:
 

-            26
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
 

-            27
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.rebase false  # merge (the default strategy)
 

-            28
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
  git config pull.rebase true   # rebase
 

-            29
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
  git config pull.ff only       # fast-forward only
 

-            30
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
 

-            31
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
You can replace "git config" with "git config --global" to set a default
 

-            32
WARNING:pkgcore:palmer repo at '/var/lib/repo-mirror-ci/sync/palmer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            33
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
or --ff-only on the command line to override the configured default per
 

-            34
warning: Pulling without specifying how to reconcile divergent branches is
+            34
invocation.
 

-            35
discouraged. You can squelch this message by running one of the following
+            35
 

-            36
commands sometime before your next pull:
+            36
Already up to date.
 

-            37
+            37
*** syncing petkovich
 

-            38
  git config pull.rebase false  # merge (the default strategy)
+            38
*** synced petkovich
 

-            39
  git config pull.rebase true   # rebase
+            39
 * Sync succeeded
 

-            40
  git config pull.ff only       # fast-forward only
+            40
$ git log --format=%ci -1
 

-            41
+            41
$ git show -q --pretty=format:%G? HEAD
 

-            42
You can replace "git config" with "git config --global" to set a default
+            42
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 petkovich
 

-            43
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            44
or --ff-only on the command line to override the configured default per
-

-            45
invocation.
-

-            46
-

-            47
Already up to date.
-

-            48
*** syncing petkovich
-

-            49
*** synced petkovich
-

-            50
 * Sync succeeded
-

-            51
$ git log --format=%ci -1
-

-            52
$ git show -q --pretty=format:%G? HEAD
-

-            53
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 petkovich
-

-            54
 * Cache regenerated successfully
+            43
 * Cache regenerated successfully
 

 
         
diff --git a/petkovich.txt b/petkovich.txt
index 72bc8eec877b..f689162f30c3 100644
--- a/petkovich.txt
+++ b/petkovich.txt
@@ -14,23 +14,12 @@
              'uri': 'git@github.com:jcpetkovich/overlay-petkovich.git'}],
  'status': 'unofficial'}
 $ pmaint sync petkovich
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:palmer repo at '/var/lib/repo-mirror-ci/sync/palmer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/pf4public.html b/pf4public.html
index 85b0f3eeb4c2..05002d390a9b 100644
--- a/pf4public.html
+++ b/pf4public.html
@@ -38,81 +38,59 @@
 

             14
$ pmaint sync pf4public
 

-            15
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
warning: Pulling without specifying how to reconcile divergent branches is
 

-            22
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
discouraged. You can squelch this message by running one of the following
 

-            23
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
commands sometime before your next pull:
 

-            24
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 

-            25
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase false  # merge (the default strategy)
 

-            26
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.rebase true   # rebase
 

-            27
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.ff only       # fast-forward only
 

-            28
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
 

-            29
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
You can replace "git config" with "git config --global" to set a default
 

-            30
WARNING:pkgcore:palmer repo at '/var/lib/repo-mirror-ci/sync/palmer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            31
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
or --ff-only on the command line to override the configured default per
 

-            32
warning: Pulling without specifying how to reconcile divergent branches is
+            32
invocation.
 

-            33
discouraged. You can squelch this message by running one of the following
+            33
 

-            34
commands sometime before your next pull:
+            34
Already up to date.
 

-            35
+            35
*** syncing pf4public
 

-            36
  git config pull.rebase false  # merge (the default strategy)
+            36
*** synced pf4public
 

-            37
  git config pull.rebase true   # rebase
+            37
 * Sync succeeded
 

-            38
  git config pull.ff only       # fast-forward only
+            38
$ git log --format=%ci -1
 

-            39
+            39
$ git show -q --pretty=format:%G? HEAD
 

-            40
You can replace "git config" with "git config --global" to set a default
+            40
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 pf4public
 

-            41
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            42
or --ff-only on the command line to override the configured default per
-

-            43
invocation.
-

-            44
-

-            45
Already up to date.
-

-            46
*** syncing pf4public
-

-            47
*** synced pf4public
-

-            48
 * Sync succeeded
-

-            49
$ git log --format=%ci -1
-

-            50
$ git show -q --pretty=format:%G? HEAD
-

-            51
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 pf4public
-

-            52
 * Cache regenerated successfully
+            41
 * Cache regenerated successfully
 

 
         
diff --git a/pf4public.txt b/pf4public.txt
index de8b64cd8e36..7a2e2bee2225 100644
--- a/pf4public.txt
+++ b/pf4public.txt
@@ -12,23 +12,12 @@
              'uri': 'git+ssh://git@github.com/PF4Public/gentoo-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync pf4public
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:palmer repo at '/var/lib/repo-mirror-ci/sync/palmer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/pg_overlay.html b/pg_overlay.html
index 87cd104609d9..6161dbf9ef67 100644
--- a/pg_overlay.html
+++ b/pg_overlay.html
@@ -34,81 +34,59 @@
 

             12
$ pmaint sync pg_overlay
 

-            13
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
warning: Pulling without specifying how to reconcile divergent branches is
 

-            20
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
discouraged. You can squelch this message by running one of the following
 

-            21
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
commands sometime before your next pull:
 

-            22
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
 

-            23
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase false  # merge (the default strategy)
 

-            24
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.rebase true   # rebase
 

-            25
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.ff only       # fast-forward only
 

-            26
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
 

-            27
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
You can replace "git config" with "git config --global" to set a default
 

-            28
WARNING:pkgcore:palmer repo at '/var/lib/repo-mirror-ci/sync/palmer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            29
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
or --ff-only on the command line to override the configured default per
 

-            30
warning: Pulling without specifying how to reconcile divergent branches is
+            30
invocation.
 

-            31
discouraged. You can squelch this message by running one of the following
+            31
 

-            32
commands sometime before your next pull:
+            32
Already up to date.
 

-            33
+            33
*** syncing pg_overlay
 

-            34
  git config pull.rebase false  # merge (the default strategy)
+            34
*** synced pg_overlay
 

-            35
  git config pull.rebase true   # rebase
+            35
 * Sync succeeded
 

-            36
  git config pull.ff only       # fast-forward only
+            36
$ git log --format=%ci -1
 

-            37
+            37
$ git show -q --pretty=format:%G? HEAD
 

-            38
You can replace "git config" with "git config --global" to set a default
+            38
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 pg_overlay
 

-            39
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            40
or --ff-only on the command line to override the configured default per
-

-            41
invocation.
-

-            42
-

-            43
Already up to date.
-

-            44
*** syncing pg_overlay
-

-            45
*** synced pg_overlay
-

-            46
 * Sync succeeded
-

-            47
$ git log --format=%ci -1
-

-            48
$ git show -q --pretty=format:%G? HEAD
-

-            49
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 pg_overlay
-

-            50
 * Cache regenerated successfully
+            39
 * Cache regenerated successfully
 

 
         
diff --git a/pg_overlay.txt b/pg_overlay.txt
index 4dc9f24aff55..74f9204fee25 100644
--- a/pg_overlay.txt
+++ b/pg_overlay.txt
@@ -10,23 +10,12 @@
              'uri': 'https://gitlab.com/Perfect_Gentleman/PG_Overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync pg_overlay
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:palmer repo at '/var/lib/repo-mirror-ci/sync/palmer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/phackerlay.html b/phackerlay.html
index 0b15a9bd7359..f4afca8f08cc 100644
--- a/phackerlay.html
+++ b/phackerlay.html
@@ -34,81 +34,59 @@
 

             12
$ pmaint sync phackerlay
 

-            13
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
warning: Pulling without specifying how to reconcile divergent branches is
 

-            20
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
discouraged. You can squelch this message by running one of the following
 

-            21
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
commands sometime before your next pull:
 

-            22
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
 

-            23
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase false  # merge (the default strategy)
 

-            24
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.rebase true   # rebase
 

-            25
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.ff only       # fast-forward only
 

-            26
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
 

-            27
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
You can replace "git config" with "git config --global" to set a default
 

-            28
WARNING:pkgcore:palmer repo at '/var/lib/repo-mirror-ci/sync/palmer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            29
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
or --ff-only on the command line to override the configured default per
 

-            30
warning: Pulling without specifying how to reconcile divergent branches is
+            30
invocation.
 

-            31
discouraged. You can squelch this message by running one of the following
+            31
 

-            32
commands sometime before your next pull:
+            32
Already up to date.
 

-            33
+            33
*** syncing phackerlay
 

-            34
  git config pull.rebase false  # merge (the default strategy)
+            34
*** synced phackerlay
 

-            35
  git config pull.rebase true   # rebase
+            35
 * Sync succeeded
 

-            36
  git config pull.ff only       # fast-forward only
+            36
$ git log --format=%ci -1
 

-            37
+            37
$ git show -q --pretty=format:%G? HEAD
 

-            38
You can replace "git config" with "git config --global" to set a default
+            38
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 phackerlay
 

-            39
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            40
or --ff-only on the command line to override the configured default per
-

-            41
invocation.
-

-            42
-

-            43
Already up to date.
-

-            44
*** syncing phackerlay
-

-            45
*** synced phackerlay
-

-            46
 * Sync succeeded
-

-            47
$ git log --format=%ci -1
-

-            48
$ git show -q --pretty=format:%G? HEAD
-

-            49
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 phackerlay
-

-            50
 * Cache regenerated successfully
+            39
 * Cache regenerated successfully
 

 
         
diff --git a/phackerlay.txt b/phackerlay.txt
index c8d9879fe29e..b1eb368795f0 100644
--- a/phackerlay.txt
+++ b/phackerlay.txt
@@ -10,23 +10,12 @@
              'uri': 'https://gitlab.phys-el.ru/ustinov/phackerlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync phackerlay
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:palmer repo at '/var/lib/repo-mirror-ci/sync/palmer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/pholthaus-overlay.html b/pholthaus-overlay.html
index 7ca5a288f28a..3470a710cc4f 100644
--- a/pholthaus-overlay.html
+++ b/pholthaus-overlay.html
@@ -38,81 +38,57 @@
 

             14
$ pmaint sync pholthaus-overlay
 

-            15
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
warning: Pulling without specifying how to reconcile divergent branches is
 

-            21
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
discouraged. You can squelch this message by running one of the following
 

-            22
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
commands sometime before your next pull:
 

-            23
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
 

-            24
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.rebase false  # merge (the default strategy)
 

-            25
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase true   # rebase
 

-            26
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.ff only       # fast-forward only
 

-            27
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
 

-            28
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
You can replace "git config" with "git config --global" to set a default
 

-            29
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            30
WARNING:pkgcore:palmer repo at '/var/lib/repo-mirror-ci/sync/palmer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
or --ff-only on the command line to override the configured default per
 

-            31
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
invocation.
 

-            32
warning: Pulling without specifying how to reconcile divergent branches is
+            32
 

-            33
discouraged. You can squelch this message by running one of the following
+            33
Already up to date.
 

-            34
commands sometime before your next pull:
+            34
*** syncing pholthaus-overlay
 

-            35
+            35
*** synced pholthaus-overlay
 

-            36
  git config pull.rebase false  # merge (the default strategy)
+            36
 * Sync succeeded
 

-            37
  git config pull.rebase true   # rebase
+            37
$ git log --format=%ci -1
 

-            38
  git config pull.ff only       # fast-forward only
+            38
$ git show -q --pretty=format:%G? HEAD
 

-            39
+            39
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 pholthaus-overlay
 

-            40
You can replace "git config" with "git config --global" to set a default
-

-            41
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            42
or --ff-only on the command line to override the configured default per
-

-            43
invocation.
-

-            44
-

-            45
Already up to date.
-

-            46
*** syncing pholthaus-overlay
-

-            47
*** synced pholthaus-overlay
-

-            48
 * Sync succeeded
-

-            49
$ git log --format=%ci -1
-

-            50
$ git show -q --pretty=format:%G? HEAD
-

-            51
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 pholthaus-overlay
-

-            52
 * Cache regenerated successfully
+            40
 * Cache regenerated successfully
 

 
         
diff --git a/pholthaus-overlay.txt b/pholthaus-overlay.txt
index 4232be428110..453b7b9db7a0 100644
--- a/pholthaus-overlay.txt
+++ b/pholthaus-overlay.txt
@@ -12,23 +12,11 @@
              'uri': 'git+ssh://git@github.com/pholthau/pholthaus-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync pholthaus-overlay
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:palmer repo at '/var/lib/repo-mirror-ci/sync/palmer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/pica-pica.html b/pica-pica.html
index a5f1fd0e4a3f..70b0160f468a 100644
--- a/pica-pica.html
+++ b/pica-pica.html
@@ -32,81 +32,57 @@
 

             11
$ pmaint sync pica-pica
 

-            12
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
warning: Pulling without specifying how to reconcile divergent branches is
 

-            18
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
discouraged. You can squelch this message by running one of the following
 

-            19
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
commands sometime before your next pull:
 

-            20
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
 

-            21
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
  git config pull.rebase false  # merge (the default strategy)
 

-            22
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase true   # rebase
 

-            23
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.ff only       # fast-forward only
 

-            24
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 

-            25
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
You can replace "git config" with "git config --global" to set a default
 

-            26
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            27
WARNING:pkgcore:palmer repo at '/var/lib/repo-mirror-ci/sync/palmer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
or --ff-only on the command line to override the configured default per
 

-            28
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
invocation.
 

-            29
warning: Pulling without specifying how to reconcile divergent branches is
+            29
 

-            30
discouraged. You can squelch this message by running one of the following
+            30
Already up to date.
 

-            31
commands sometime before your next pull:
+            31
*** syncing pica-pica
 

-            32
+            32
*** synced pica-pica
 

-            33
  git config pull.rebase false  # merge (the default strategy)
+            33
 * Sync succeeded
 

-            34
  git config pull.rebase true   # rebase
+            34
$ git log --format=%ci -1
 

-            35
  git config pull.ff only       # fast-forward only
+            35
$ git show -q --pretty=format:%G? HEAD
 

-            36
+            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 pica-pica
 

-            37
You can replace "git config" with "git config --global" to set a default
-

-            38
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            39
or --ff-only on the command line to override the configured default per
-

-            40
invocation.
-

-            41
-

-            42
Already up to date.
-

-            43
*** syncing pica-pica
-

-            44
*** synced pica-pica
-

-            45
 * Sync succeeded
-

-            46
$ git log --format=%ci -1
-

-            47
$ git show -q --pretty=format:%G? HEAD
-

-            48
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 pica-pica
-

-            49
 * Cache regenerated successfully
+            37
 * Cache regenerated successfully
 

 
         
diff --git a/pica-pica.txt b/pica-pica.txt
index add4dca1262d..1e3d6f30183f 100644
--- a/pica-pica.txt
+++ b/pica-pica.txt
@@ -9,23 +9,11 @@
              'uri': 'https://github.com/antonsviridenko/pica-pica-gentoo-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync pica-pica
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:palmer repo at '/var/lib/repo-mirror-ci/sync/palmer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/picarica-overlay.html b/picarica-overlay.html
index ea9e66decc3b..ba2264a3b73a 100644
--- a/picarica-overlay.html
+++ b/picarica-overlay.html
@@ -38,81 +38,57 @@
 

             14
$ pmaint sync picarica-overlay
 

-            15
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
warning: Pulling without specifying how to reconcile divergent branches is
 

-            21
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
discouraged. You can squelch this message by running one of the following
 

-            22
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
commands sometime before your next pull:
 

-            23
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
 

-            24
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.rebase false  # merge (the default strategy)
 

-            25
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase true   # rebase
 

-            26
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.ff only       # fast-forward only
 

-            27
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
 

-            28
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
You can replace "git config" with "git config --global" to set a default
 

-            29
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            30
WARNING:pkgcore:palmer repo at '/var/lib/repo-mirror-ci/sync/palmer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
or --ff-only on the command line to override the configured default per
 

-            31
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
invocation.
 

-            32
warning: Pulling without specifying how to reconcile divergent branches is
+            32
 

-            33
discouraged. You can squelch this message by running one of the following
+            33
Already up to date.
 

-            34
commands sometime before your next pull:
+            34
*** syncing picarica-overlay
 

-            35
+            35
*** synced picarica-overlay
 

-            36
  git config pull.rebase false  # merge (the default strategy)
+            36
 * Sync succeeded
 

-            37
  git config pull.rebase true   # rebase
+            37
$ git log --format=%ci -1
 

-            38
  git config pull.ff only       # fast-forward only
+            38
$ git show -q --pretty=format:%G? HEAD
 

-            39
+            39
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 picarica-overlay
 

-            40
You can replace "git config" with "git config --global" to set a default
-

-            41
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            42
or --ff-only on the command line to override the configured default per
-

-            43
invocation.
-

-            44
-

-            45
Already up to date.
-

-            46
*** syncing picarica-overlay
-

-            47
*** synced picarica-overlay
-

-            48
 * Sync succeeded
-

-            49
$ git log --format=%ci -1
-

-            50
$ git show -q --pretty=format:%G? HEAD
-

-            51
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 picarica-overlay
-

-            52
 * Cache regenerated successfully
+            40
 * Cache regenerated successfully
 

 
         
diff --git a/picarica-overlay.txt b/picarica-overlay.txt
index 9784303ff49f..a3181d45ae09 100644
--- a/picarica-overlay.txt
+++ b/picarica-overlay.txt
@@ -12,23 +12,11 @@
              'uri': 'git+ssh://git@gitlab.com/picarica/picarica-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync picarica-overlay
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:palmer repo at '/var/lib/repo-mirror-ci/sync/palmer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/pigfoot.html b/pigfoot.html
index 34d09b38ea39..233630966e69 100644
--- a/pigfoot.html
+++ b/pigfoot.html
@@ -38,82 +38,48 @@
 

             14
$ pmaint sync pigfoot
 

-            15
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            23
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            24
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
Cloning into '/var/lib/repo-mirror-ci/sync/pigfoot'...
 

-            25
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
*** syncing pigfoot
 

-            26
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
*** synced pigfoot
 

-            27
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
 * Sync succeeded
 

-            28
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
$ git log --format=%ci -1
 

-            29
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
$ git show -q --pretty=format:%G? HEAD
 

-            30
WARNING:pkgcore:palmer repo at '/var/lib/repo-mirror-ci/sync/palmer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 pigfoot
 

-            31
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            32
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            33
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            34
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            35
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            36
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            37
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            38
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            39
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            40
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            41
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            42
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            43
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            44
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            45
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            46
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            47
WARNING:pkgcore:palmer repo at '/var/lib/repo-mirror-ci/sync/palmer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            48
Cloning into '/var/lib/repo-mirror-ci/sync/pigfoot'...
-

-            49
fatal: unable to access 'https://anongit.gentoo.org/git/user/pigfoot.git/': The requested URL returned error: 504
-

-            50
*** syncing pigfoot
-

-            51
!!! failed syncing pigfoot
-

-            52
 * Sync failed with 1
+            31
 * dev-db/leveldb-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+
[FATAL]
+            32
 * dev-db/rocksdb-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
+            33
 * dev-util/cargo-0.30.0-r1: failed sourcing ebuild: EAPI=6 is not supported
+
[FATAL]
+            34
 * net-misc/spdylay-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+
[FATAL]
+            35
 * Cache regen failed with 1
+

 
         
     
diff --git a/pigfoot.txt b/pigfoot.txt
index e4a41aee0a2d..ea32a2a778dd 100644
--- a/pigfoot.txt
+++ b/pigfoot.txt
@@ -12,41 +12,24 @@
  'status': 'unofficial'}
  * Adding new repository
 $ pmaint sync pigfoot
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:palmer repo at '/var/lib/repo-mirror-ci/sync/palmer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:palmer repo at '/var/lib/repo-mirror-ci/sync/palmer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 Cloning into '/var/lib/repo-mirror-ci/sync/pigfoot'...
-fatal: unable to access 'https://anongit.gentoo.org/git/user/pigfoot.git/': The requested URL returned error: 504
 *** syncing pigfoot
-!!! failed syncing pigfoot
- * Sync failed with 1
+*** synced pigfoot
+ * Sync succeeded
+$ git log --format=%ci -1
+$ git show -q --pretty=format:%G? HEAD
+$ pmaint regen --use-local-desc --pkg-desc-index -t 1 pigfoot
+ * dev-db/leveldb-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+ * dev-db/rocksdb-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+ * dev-util/cargo-0.30.0-r1: failed sourcing ebuild: EAPI=6 is not supported
+ * net-misc/spdylay-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+ * Cache regen failed with 1
diff --git a/piniverlay.html b/piniverlay.html
index 444084049b79..e611ef5aeb10 100644
--- a/piniverlay.html
+++ b/piniverlay.html
@@ -42,81 +42,57 @@
 

             16
$ pmaint sync piniverlay
 

-            17
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
warning: Pulling without specifying how to reconcile divergent branches is
 

-            23
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
discouraged. You can squelch this message by running one of the following
 

-            24
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
commands sometime before your next pull:
 

-            25
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 

-            26
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.rebase false  # merge (the default strategy)
 

-            27
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.rebase true   # rebase
 

-            28
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
  git config pull.ff only       # fast-forward only
 

-            29
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
 

-            30
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
You can replace "git config" with "git config --global" to set a default
 

-            31
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            32
WARNING:pkgcore:palmer repo at '/var/lib/repo-mirror-ci/sync/palmer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
or --ff-only on the command line to override the configured default per
 

-            33
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
invocation.
 

-            34
warning: Pulling without specifying how to reconcile divergent branches is
+            34
 

-            35
discouraged. You can squelch this message by running one of the following
+            35
Already up to date.
 

-            36
commands sometime before your next pull:
+            36
*** syncing piniverlay
 

-            37
+            37
*** synced piniverlay
 

-            38
  git config pull.rebase false  # merge (the default strategy)
+            38
 * Sync succeeded
 

-            39
  git config pull.rebase true   # rebase
+            39
$ git log --format=%ci -1
 

-            40
  git config pull.ff only       # fast-forward only
+            40
$ git show -q --pretty=format:%G? HEAD
 

-            41
+            41
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 piniverlay
 

-            42
You can replace "git config" with "git config --global" to set a default
-

-            43
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            44
or --ff-only on the command line to override the configured default per
-

-            45
invocation.
-

-            46
-

-            47
Already up to date.
-

-            48
*** syncing piniverlay
-

-            49
*** synced piniverlay
-

-            50
 * Sync succeeded
-

-            51
$ git log --format=%ci -1
-

-            52
$ git show -q --pretty=format:%G? HEAD
-

-            53
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 piniverlay
-

-            54
 * Cache regenerated successfully
+            42
 * Cache regenerated successfully
 

 
         
diff --git a/piniverlay.txt b/piniverlay.txt
index b28c1b639f62..ca639fae9a37 100644
--- a/piniverlay.txt
+++ b/piniverlay.txt
@@ -14,23 +14,11 @@
              'uri': 'git@github.com:pinicarus/gentoo-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync piniverlay
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:palmer repo at '/var/lib/repo-mirror-ci/sync/palmer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/pinkbyte.html b/pinkbyte.html
index 5158664c0631..e00480efa4a1 100644
--- a/pinkbyte.html
+++ b/pinkbyte.html
@@ -38,81 +38,57 @@
 

             14
$ pmaint sync pinkbyte
 

-            15
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
warning: Pulling without specifying how to reconcile divergent branches is
 

-            21
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
discouraged. You can squelch this message by running one of the following
 

-            22
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
commands sometime before your next pull:
 

-            23
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
 

-            24
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.rebase false  # merge (the default strategy)
 

-            25
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase true   # rebase
 

-            26
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.ff only       # fast-forward only
 

-            27
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
 

-            28
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
You can replace "git config" with "git config --global" to set a default
 

-            29
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            30
WARNING:pkgcore:palmer repo at '/var/lib/repo-mirror-ci/sync/palmer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
or --ff-only on the command line to override the configured default per
 

-            31
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
invocation.
 

-            32
warning: Pulling without specifying how to reconcile divergent branches is
+            32
 

-            33
discouraged. You can squelch this message by running one of the following
+            33
Already up to date.
 

-            34
commands sometime before your next pull:
+            34
*** syncing pinkbyte
 

-            35
+            35
*** synced pinkbyte
 

-            36
  git config pull.rebase false  # merge (the default strategy)
+            36
 * Sync succeeded
 

-            37
  git config pull.rebase true   # rebase
+            37
$ git log --format=%ci -1
 

-            38
  git config pull.ff only       # fast-forward only
+            38
$ git show -q --pretty=format:%G? HEAD
 

-            39
+            39
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 pinkbyte
 

-            40
You can replace "git config" with "git config --global" to set a default
-

-            41
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            42
or --ff-only on the command line to override the configured default per
-

-            43
invocation.
-

-            44
-

-            45
Already up to date.
-

-            46
*** syncing pinkbyte
-

-            47
*** synced pinkbyte
-

-            48
 * Sync succeeded
-

-            49
$ git log --format=%ci -1
-

-            50
$ git show -q --pretty=format:%G? HEAD
-

-            51
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 pinkbyte
-

-            52
 * Cache regenerated successfully
+            40
 * Cache regenerated successfully
 

 
         
diff --git a/pinkbyte.txt b/pinkbyte.txt
index f6ed4d35d6a0..6adb5b644d36 100644
--- a/pinkbyte.txt
+++ b/pinkbyte.txt
@@ -12,23 +12,11 @@
              'uri': 'git://github.com/Pinkbyte/pinkbyte-overlay.git'}],
  'status': 'official'}
 $ pmaint sync pinkbyte
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:palmer repo at '/var/lib/repo-mirror-ci/sync/palmer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/pixlra.html b/pixlra.html
index cc962d1fc07b..215825275300 100644
--- a/pixlra.html
+++ b/pixlra.html
@@ -46,99 +46,57 @@
 

             18
$ pmaint sync pixlra
 

-            19
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            23
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            24
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
warning: Pulling without specifying how to reconcile divergent branches is
 

-            25
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
discouraged. You can squelch this message by running one of the following
 

-            26
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
commands sometime before your next pull:
 

-            27
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
 

-            28
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
  git config pull.rebase false  # merge (the default strategy)
 

-            29
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
  git config pull.rebase true   # rebase
 

-            30
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
  git config pull.ff only       # fast-forward only
 

-            31
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
 

-            32
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
You can replace "git config" with "git config --global" to set a default
 

-            33
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            34
WARNING:pkgcore:palmer repo at '/var/lib/repo-mirror-ci/sync/palmer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
or --ff-only on the command line to override the configured default per
 

-            35
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
invocation.
 

-            36
warning: Pulling without specifying how to reconcile divergent branches is
+            36
 

-            37
discouraged. You can squelch this message by running one of the following
+            37
Already up to date.
 

-            38
commands sometime before your next pull:
+            38
*** syncing pixlra
 

-            39
+            39
*** synced pixlra
 

-            40
  git config pull.rebase false  # merge (the default strategy)
+            40
 * Sync succeeded
 

-            41
  git config pull.rebase true   # rebase
+            41
$ git log --format=%ci -1
 

-            42
  git config pull.ff only       # fast-forward only
+            42
$ git show -q --pretty=format:%G? HEAD
 

-            43
+            43
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 pixlra
 

-            44
You can replace "git config" with "git config --global" to set a default
-

-            45
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            46
or --ff-only on the command line to override the configured default per
-

-            47
invocation.
-

-            48
-

-            49
fatal: unable to access 'https://anongit.gentoo.org/git/user/carreira.git/': The requested URL returned error: 504
-

-            50
*** syncing pixlra
-

-            51
!!! failed syncing pixlra
-

-            52
 * Sync failed with 1
-
[FATAL]
-            53
 * Will try to re-create
-

-            54
$ pmaint sync pixlra
-

-            55
WARNING:pkgcore:mgorny repo at '/var/lib/repo-mirror-ci/sync/mgorny', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            56
WARNING:pkgcore:ennui repo at '/var/lib/repo-mirror-ci/sync/ennui', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            57
WARNING:pkgcore:mschiff repo at '/var/lib/repo-mirror-ci/sync/mschiff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            58
Cloning into '/var/lib/repo-mirror-ci/sync/pixlra'...
-

-            59
*** syncing pixlra
-

-            60
*** synced pixlra
-

-            61
 * Sync succeeded after re-adding
-

-            62
$ git log --format=%ci -1
-

-            63
$ git show -q --pretty=format:%G? HEAD
-

-            64
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 pixlra
-

-            65
 * Cache regenerated successfully
+            44
 * Cache regenerated successfully
 

 
         
diff --git a/pixlra.txt b/pixlra.txt
index d3cc48c8f436..7d43182963aa 100644
--- a/pixlra.txt
+++ b/pixlra.txt
@@ -16,23 +16,11 @@
              'uri': 'https://github.com/pixlra/pixlra-gentoo-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync pixlra
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:palmer repo at '/var/lib/repo-mirror-ci/sync/palmer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
@@ -46,19 +34,10 @@ 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.
 
-fatal: unable to access 'https://anongit.gentoo.org/git/user/carreira.git/': The requested URL returned error: 504
-*** syncing pixlra
-!!! failed syncing pixlra
- * Sync failed with 1
- * Will try to re-create
-$ pmaint sync pixlra
-WARNING:pkgcore:mgorny repo at '/var/lib/repo-mirror-ci/sync/mgorny', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ennui repo at '/var/lib/repo-mirror-ci/sync/ennui', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mschiff repo at '/var/lib/repo-mirror-ci/sync/mschiff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-Cloning into '/var/lib/repo-mirror-ci/sync/pixlra'...
+Already up to date.
 *** syncing pixlra
 *** synced pixlra
- * Sync succeeded after re-adding
+ * Sync succeeded
 $ git log --format=%ci -1
 $ git show -q --pretty=format:%G? HEAD
 $ pmaint regen --use-local-desc --pkg-desc-index -t 1 pixlra
diff --git a/pkalin.html b/pkalin.html
index 7df56922c97c..fa103ebd398b 100644
--- a/pkalin.html
+++ b/pkalin.html
@@ -36,81 +36,57 @@
 

             13
$ pmaint sync pkalin
 

-            14
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
warning: Pulling without specifying how to reconcile divergent branches is
 

-            20
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
discouraged. You can squelch this message by running one of the following
 

-            21
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
commands sometime before your next pull:
 

-            22
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
 

-            23
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase false  # merge (the default strategy)
 

-            24
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.rebase true   # rebase
 

-            25
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.ff only       # fast-forward only
 

-            26
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
 

-            27
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
You can replace "git config" with "git config --global" to set a default
 

-            28
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            29
WARNING:pkgcore:palmer repo at '/var/lib/repo-mirror-ci/sync/palmer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
or --ff-only on the command line to override the configured default per
 

-            30
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
invocation.
 

-            31
warning: Pulling without specifying how to reconcile divergent branches is
+            31
 

-            32
discouraged. You can squelch this message by running one of the following
+            32
Already up to date.
 

-            33
commands sometime before your next pull:
+            33
*** syncing pkalin
 

-            34
+            34
*** synced pkalin
 

-            35
  git config pull.rebase false  # merge (the default strategy)
+            35
 * Sync succeeded
 

-            36
  git config pull.rebase true   # rebase
+            36
$ git log --format=%ci -1
 

-            37
  git config pull.ff only       # fast-forward only
+            37
$ git show -q --pretty=format:%G? HEAD
 

-            38
+            38
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 pkalin
 

-            39
You can replace "git config" with "git config --global" to set a default
-

-            40
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            41
or --ff-only on the command line to override the configured default per
-

-            42
invocation.
-

-            43
-

-            44
Already up to date.
-

-            45
*** syncing pkalin
-

-            46
*** synced pkalin
-

-            47
 * Sync succeeded
-

-            48
$ git log --format=%ci -1
-

-            49
$ git show -q --pretty=format:%G? HEAD
-

-            50
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 pkalin
-

-            51
 * Cache regenerated successfully
+            39
 * Cache regenerated successfully
 

 
         
diff --git a/pkalin.txt b/pkalin.txt
index 98669873287c..66dc057b6095 100644
--- a/pkalin.txt
+++ b/pkalin.txt
@@ -11,23 +11,11 @@
              'uri': 'git+ssh://git@github.com/thinrope/pkalin.git'}],
  'status': 'unofficial'}
 $ pmaint sync pkalin
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:palmer repo at '/var/lib/repo-mirror-ci/sync/palmer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/plex-overlay.html b/plex-overlay.html
index bdc964680daf..13296aea003d 100644
--- a/plex-overlay.html
+++ b/plex-overlay.html
@@ -36,81 +36,69 @@
 

             13
$ pmaint sync plex-overlay
 

-            14
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
warning: Pulling without specifying how to reconcile divergent branches is
 

-            19
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
discouraged. You can squelch this message by running one of the following
 

-            20
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
commands sometime before your next pull:
 

-            21
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
 

-            22
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase false  # merge (the default strategy)
 

-            23
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase true   # rebase
 

-            24
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.ff only       # fast-forward only
 

-            25
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 

-            26
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
You can replace "git config" with "git config --global" to set a default
 

-            27
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            28
WARNING:pkgcore:palmer repo at '/var/lib/repo-mirror-ci/sync/palmer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
or --ff-only on the command line to override the configured default per
 

-            29
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
invocation.
 

-            30
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
 

-            31
warning: Pulling without specifying how to reconcile divergent branches is
+            31
From https://github.com/comio/plex-overlay
 

-            32
discouraged. You can squelch this message by running one of the following
+            32
   cb445e2..31dbb5b  master     -> origin/master
 

-            33
commands sometime before your next pull:
+            33
Updating cb445e2..31dbb5b
 

-            34
+            34
Fast-forward
 

-            35
  git config pull.rebase false  # merge (the default strategy)
+            35
 media-tv/plex-media-server/Manifest                |   3 +
 

-            36
  git config pull.rebase true   # rebase
+            36
 .../plex-media-server-1.20.3-r3.ebuild             | 120 +++++++++++++++++++++
 

-            37
  git config pull.ff only       # fast-forward only
+            37
 2 files changed, 123 insertions(+)
 

-            38
+            38
 create mode 100644 media-tv/plex-media-server/plex-media-server-1.20.3-r3.ebuild
 

-            39
You can replace "git config" with "git config --global" to set a default
+            39
*** syncing plex-overlay
 

-            40
preference for all repositories. You can also pass --rebase, --no-rebase,
+            40
*** synced plex-overlay
 

-            41
or --ff-only on the command line to override the configured default per
+            41
 * Sync succeeded
 

-            42
invocation.
+            42
$ git log --format=%ci -1
 

-            43
+            43
$ git show -q --pretty=format:%G? HEAD
 

-            44
Already up to date.
+            44
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 plex-overlay
 

-            45
*** syncing plex-overlay
-

-            46
*** synced plex-overlay
-

-            47
 * Sync succeeded
-

-            48
$ git log --format=%ci -1
-

-            49
$ git show -q --pretty=format:%G? HEAD
-

-            50
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 plex-overlay
-

-            51
 * Cache regenerated successfully
+            45
 * Cache regenerated successfully
 

 
         
diff --git a/plex-overlay.txt b/plex-overlay.txt
index 0b9f68ecbbd9..1c5e3fa8bbbb 100644
--- a/plex-overlay.txt
+++ b/plex-overlay.txt
@@ -11,23 +11,10 @@
              'uri': 'https://github.com/comio/plex-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync plex-overlay
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:palmer repo at '/var/lib/repo-mirror-ci/sync/palmer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
@@ -41,7 +28,14 @@ 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.
 
-Already up to date.
+From https://github.com/comio/plex-overlay
+   cb445e2..31dbb5b  master     -> origin/master
+Updating cb445e2..31dbb5b
+Fast-forward
+ media-tv/plex-media-server/Manifest                |   3 +
+ .../plex-media-server-1.20.3-r3.ebuild             | 120 +++++++++++++++++++++
+ 2 files changed, 123 insertions(+)
+ create mode 100644 media-tv/plex-media-server/plex-media-server-1.20.3-r3.ebuild
 *** syncing plex-overlay
 *** synced plex-overlay
  * Sync succeeded
diff --git a/poly-c.html b/poly-c.html
index 5627a07cb7f0..206684d313d9 100644
--- a/poly-c.html
+++ b/poly-c.html
@@ -30,137 +30,113 @@
 

             10
$ pmaint sync poly-c
 

-            11
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            11
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            12
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
-------------------------------------------------------------------------------
 

-            17
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
Welcome to rsync.gentoofan.org:873
 

-            18
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
This is the gentoo portage-overlay of Polynomial-C
 

-            19
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
 

-            20
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
-------------------------------------------------------------------------------
 

-            21
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
 

-            22
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  ,-~~-.___.
 

-            23
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
 / |  '     \
 

-            24
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
(  )        0
 

-            25
WARNING:pkgcore:palmer repo at '/var/lib/repo-mirror-ci/sync/palmer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 \_/-, ,----'
 

-            26
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
    ====           //
 

-            27
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
   /  \-'~;    /~~~(O)
 

-            28
-------------------------------------------------------------------------------
+            28
  /  __/~|   /       |
 

-            29
Welcome to rsync.gentoofan.org:873
+            29
=(  _____| (_________|
 

-            30
This is the gentoo portage-overlay of Polynomial-C
+            30
 

-            31
+            31
-server specs:
 

-            32
-------------------------------------------------------------------------------
+            32
    -CPU		Intel Core i7 
 

-            33
+            33
    -RAM		8 GB
 

-            34
  ,-~~-.___.
+            34
    -OS			Gentoo GNU/Linux (Kernel 4.x)
 

-            35
 / |  '     \
+            35
    -BANDWIDTH		100 MBit
 

-            36
(  )        0
+            36
    -LIMIT		10 users (concurrently)
 

-            37
 \_/-, ,----'
+            37
    -LOCATION		Nuernberg/Germany
 

-            38
    ====           //
+            38
    -CONTACT		polynomial-c@gentoo.org
 

-            39
   /  \-'~;    /~~~(O)
+            39
 

-            40
  /  __/~|   /       |
+            40
-------------------------------------------------------------------------------
 

-            41
=(  _____| (_________|
+            41
 

             42
 

-            43
-server specs:
+            43
Number of files: 1 (reg: 1)
 

-            44
    -CPU		Intel Core i7 
+            44
Number of created files: 0
 

-            45
    -RAM		8 GB
+            45
Number of deleted files: 0
 

-            46
    -OS			Gentoo GNU/Linux (Kernel 4.x)
+            46
Number of regular files transferred: 1
 

-            47
    -BANDWIDTH		100 MBit
+            47
Total file size: 32 bytes
 

-            48
    -LIMIT		10 users (concurrently)
+            48
Total transferred file size: 32 bytes
 

-            49
    -LOCATION		Nuernberg/Germany
+            49
Literal data: 32 bytes
 

-            50
    -CONTACT		polynomial-c@gentoo.org
+            50
Matched data: 0 bytes
 

-            51
+            51
File list size: 48
 

-            52
-------------------------------------------------------------------------------
+            52
File list generation time: 0.001 seconds
 

-            53
+            53
File list transfer time: 0.000 seconds
 

-            54
+            54
Total bytes sent: 85
 

-            55
Number of files: 1 (reg: 1)
+            55
Total bytes received: 134
 

-            56
Number of created files: 0
+            56
 

-            57
Number of deleted files: 0
+            57
sent 85 bytes  received 134 bytes  62.57 bytes/sec
 

-            58
Number of regular files transferred: 1
+            58
total size is 32  speedup is 0.15
 

-            59
Total file size: 32 bytes
+            59
*** syncing poly-c
 

-            60
Total transferred file size: 32 bytes
+            60
*** synced poly-c
 

-            61
Literal data: 32 bytes
+            61
 * Sync succeeded
 

-            62
Matched data: 0 bytes
+            62
$ stat --format=%y .
 

-            63
File list size: 48
+            63
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 poly-c
 

-            64
File list generation time: 0.001 seconds
-

-            65
File list transfer time: 0.000 seconds
-

-            66
Total bytes sent: 85
-

-            67
Total bytes received: 134
-

-            68
-

-            69
sent 85 bytes  received 134 bytes  87.60 bytes/sec
-

-            70
total size is 32  speedup is 0.15
-

-            71
*** syncing poly-c
-

-            72
*** synced poly-c
-

-            73
 * Sync succeeded
-

-            74
$ stat --format=%y .
-

-            75
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 poly-c
-

-            76
 * Cache regenerated successfully
+            64
 * Cache regenerated successfully
 

 
         
diff --git a/poly-c.txt b/poly-c.txt
index 30d97f00edc4..5df656d088c7 100644
--- a/poly-c.txt
+++ b/poly-c.txt
@@ -8,23 +8,11 @@
  'source': [{'type': 'rsync', 'uri': 'rsync://rsync.gentoofan.org/poly-c'}],
  'status': 'official'}
 $ pmaint sync poly-c
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:palmer repo at '/var/lib/repo-mirror-ci/sync/palmer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 -------------------------------------------------------------------------------
 Welcome to rsync.gentoofan.org:873
 This is the gentoo portage-overlay of Polynomial-C
@@ -66,7 +54,7 @@ File list transfer time: 0.000 seconds
 Total bytes sent: 85
 Total bytes received: 134
 
-sent 85 bytes  received 134 bytes  87.60 bytes/sec
+sent 85 bytes  received 134 bytes  62.57 bytes/sec
 total size is 32  speedup is 0.15
 *** syncing poly-c
 *** synced poly-c
diff --git a/posativ.html b/posativ.html
index 7c197f6012a0..a3e0dc98635b 100644
--- a/posativ.html
+++ b/posativ.html
@@ -36,83 +36,57 @@
 

             13
$ pmaint sync posativ
 

-            14
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
warning: Pulling without specifying how to reconcile divergent branches is
 

-            19
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
discouraged. You can squelch this message by running one of the following
 

-            20
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
commands sometime before your next pull:
 

-            21
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
 

-            22
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase false  # merge (the default strategy)
 

-            23
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase true   # rebase
 

-            24
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.ff only       # fast-forward only
 

-            25
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 

-            26
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
You can replace "git config" with "git config --global" to set a default
 

-            27
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            28
WARNING:pkgcore:palmer repo at '/var/lib/repo-mirror-ci/sync/palmer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
or --ff-only on the command line to override the configured default per
 

-            29
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
invocation.
 

-            30
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
 

-            31
warning: Pulling without specifying how to reconcile divergent branches is
+            31
Already up to date.
 

-            32
discouraged. You can squelch this message by running one of the following
+            32
*** syncing posativ
 

-            33
commands sometime before your next pull:
+            33
*** synced posativ
 

-            34
+            34
 * Sync succeeded
 

-            35
  git config pull.rebase false  # merge (the default strategy)
+            35
$ git log --format=%ci -1
 

-            36
  git config pull.rebase true   # rebase
+            36
$ git show -q --pretty=format:%G? HEAD
 

-            37
  git config pull.ff only       # fast-forward only
+            37
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 posativ
 

-            38
-

-            39
You can replace "git config" with "git config --global" to set a default
-

-            40
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            41
or --ff-only on the command line to override the configured default per
-

-            42
invocation.
-

-            43
-

-            44
Already up to date.
-

-            45
*** syncing posativ
-

-            46
*** synced posativ
-

-            47
 * Sync succeeded
-

-            48
$ git log --format=%ci -1
-

-            49
$ git show -q --pretty=format:%G? HEAD
-

-            50
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 posativ
-

-            51
 * dev-vcs/git-extras-4.2.0: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            38
 * dev-vcs/git-extras-4.2.0: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            52
 * Cache regen failed with 1
+            39
 * Cache regen failed with 1
 

 
         
diff --git a/posativ.txt b/posativ.txt
index 5cd22060c2a1..0ea83277c5cf 100644
--- a/posativ.txt
+++ b/posativ.txt
@@ -11,23 +11,10 @@
             {'type': 'git', 'uri': 'git@github.com:posativ/overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync posativ
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:palmer repo at '/var/lib/repo-mirror-ci/sync/palmer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/powerman.html b/powerman.html
index 5c7ae1261bbc..61cb78a54bc3 100644
--- a/powerman.html
+++ b/powerman.html
@@ -32,79 +32,55 @@
 

             11
$ pmaint sync powerman
 

-            12
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
warning: Pulling without specifying how to reconcile divergent branches is
 

-            17
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
discouraged. You can squelch this message by running one of the following
 

-            18
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
commands sometime before your next pull:
 

-            19
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
 

-            20
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
  git config pull.rebase false  # merge (the default strategy)
 

-            21
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
  git config pull.rebase true   # rebase
 

-            22
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.ff only       # fast-forward only
 

-            23
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
 

-            24
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
You can replace "git config" with "git config --global" to set a default
 

-            25
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            26
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
or --ff-only on the command line to override the configured default per
 

-            27
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
invocation.
 

-            28
warning: Pulling without specifying how to reconcile divergent branches is
+            28
 

-            29
discouraged. You can squelch this message by running one of the following
+            29
Already up to date.
 

-            30
commands sometime before your next pull:
+            30
*** syncing powerman
 

-            31
+            31
*** synced powerman
 

-            32
  git config pull.rebase false  # merge (the default strategy)
+            32
 * Sync succeeded
 

-            33
  git config pull.rebase true   # rebase
+            33
$ git log --format=%ci -1
 

-            34
  git config pull.ff only       # fast-forward only
+            34
$ git show -q --pretty=format:%G? HEAD
 

-            35
+            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 powerman
 

-            36
You can replace "git config" with "git config --global" to set a default
-

-            37
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            38
or --ff-only on the command line to override the configured default per
-

-            39
invocation.
-

-            40
-

-            41
Already up to date.
-

-            42
*** syncing powerman
-

-            43
*** synced powerman
-

-            44
 * Sync succeeded
-

-            45
$ git log --format=%ci -1
-

-            46
$ git show -q --pretty=format:%G? HEAD
-

-            47
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 powerman
-

-            48
 * Cache regenerated successfully
+            36
 * Cache regenerated successfully
 

 
         
diff --git a/powerman.txt b/powerman.txt
index ec91383a9d3b..c63cf1c7d165 100644
--- a/powerman.txt
+++ b/powerman.txt
@@ -9,22 +9,10 @@
              'uri': 'https://github.com/powerman/powerman-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync powerman
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/ppfeufer-gentoo-overlay.html b/ppfeufer-gentoo-overlay.html
index bcfda2907d36..d02a52c71e25 100644
--- a/ppfeufer-gentoo-overlay.html
+++ b/ppfeufer-gentoo-overlay.html
@@ -38,79 +38,55 @@
 

             14
$ pmaint sync ppfeufer-gentoo-overlay
 

-            15
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
warning: Pulling without specifying how to reconcile divergent branches is
 

-            20
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
discouraged. You can squelch this message by running one of the following
 

-            21
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
commands sometime before your next pull:
 

-            22
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
 

-            23
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase false  # merge (the default strategy)
 

-            24
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.rebase true   # rebase
 

-            25
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.ff only       # fast-forward only
 

-            26
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
 

-            27
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
You can replace "git config" with "git config --global" to set a default
 

-            28
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            29
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
or --ff-only on the command line to override the configured default per
 

-            30
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
invocation.
 

-            31
warning: Pulling without specifying how to reconcile divergent branches is
+            31
 

-            32
discouraged. You can squelch this message by running one of the following
+            32
Already up to date.
 

-            33
commands sometime before your next pull:
+            33
*** syncing ppfeufer-gentoo-overlay
 

-            34
+            34
*** synced ppfeufer-gentoo-overlay
 

-            35
  git config pull.rebase false  # merge (the default strategy)
+            35
 * Sync succeeded
 

-            36
  git config pull.rebase true   # rebase
+            36
$ git log --format=%ci -1
 

-            37
  git config pull.ff only       # fast-forward only
+            37
$ git show -q --pretty=format:%G? HEAD
 

-            38
+            38
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 ppfeufer-gentoo-overlay
 

-            39
You can replace "git config" with "git config --global" to set a default
-

-            40
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            41
or --ff-only on the command line to override the configured default per
-

-            42
invocation.
-

-            43
-

-            44
Already up to date.
-

-            45
*** syncing ppfeufer-gentoo-overlay
-

-            46
*** synced ppfeufer-gentoo-overlay
-

-            47
 * Sync succeeded
-

-            48
$ git log --format=%ci -1
-

-            49
$ git show -q --pretty=format:%G? HEAD
-

-            50
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 ppfeufer-gentoo-overlay
-

-            51
 * Cache regenerated successfully
+            39
 * Cache regenerated successfully
 

 
         
diff --git a/ppfeufer-gentoo-overlay.txt b/ppfeufer-gentoo-overlay.txt
index 0bba9a841f4c..2153036f393a 100644
--- a/ppfeufer-gentoo-overlay.txt
+++ b/ppfeufer-gentoo-overlay.txt
@@ -12,22 +12,10 @@
              'uri': 'git+ssh://git@github.com/ppfeufer/gentoo-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync ppfeufer-gentoo-overlay
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/pross.html b/pross.html
index 70313565d878..a7c7d9325175 100644
--- a/pross.html
+++ b/pross.html
@@ -34,81 +34,59 @@
 

             12
$ pmaint sync pross
 

-            13
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
warning: Pulling without specifying how to reconcile divergent branches is
 

-            19
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
discouraged. You can squelch this message by running one of the following
 

-            20
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
commands sometime before your next pull:
 

-            21
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
 

-            22
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase false  # merge (the default strategy)
 

-            23
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase true   # rebase
 

-            24
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.ff only       # fast-forward only
 

-            25
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 

-            26
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
You can replace "git config" with "git config --global" to set a default
 

-            27
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            28
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
or --ff-only on the command line to override the configured default per
 

-            29
warning: Pulling without specifying how to reconcile divergent branches is
+            29
invocation.
 

-            30
discouraged. You can squelch this message by running one of the following
+            30
 

-            31
commands sometime before your next pull:
+            31
Already up to date.
 

-            32
+            32
*** syncing pross
 

-            33
  git config pull.rebase false  # merge (the default strategy)
+            33
*** synced pross
 

-            34
  git config pull.rebase true   # rebase
+            34
 * Sync succeeded
 

-            35
  git config pull.ff only       # fast-forward only
+            35
$ git log --format=%ci -1
 

-            36
+            36
$ git show -q --pretty=format:%G? HEAD
 

-            37
You can replace "git config" with "git config --global" to set a default
+            37
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 pross
 

-            38
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            39
or --ff-only on the command line to override the configured default per
-

-            40
invocation.
-

-            41
-

-            42
Already up to date.
-

-            43
*** syncing pross
-

-            44
*** synced pross
-

-            45
 * Sync succeeded
-

-            46
$ git log --format=%ci -1
-

-            47
$ git show -q --pretty=format:%G? HEAD
-

-            48
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 pross
-

-            49
 * gnome-base/gnome-control-center-3.36.4-r1: failed sourcing ebuild: inherit requires unknown eclass: gnome3.eclass
+            38
 * gnome-base/gnome-control-center-3.36.4-r1: failed sourcing ebuild: inherit requires unknown eclass: gnome3.eclass
 
[FATAL]
-            50
 * Cache regen failed with 1
+            39
 * Cache regen failed with 1
 

 
         
diff --git a/pross.txt b/pross.txt
index c0f3ba7361fe..a46babffa9e5 100644
--- a/pross.txt
+++ b/pross.txt
@@ -10,22 +10,11 @@
              'uri': 'https://github.com/Pross/pross-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync pross
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/pyfa.html b/pyfa.html
index 9f7c6c3dcedf..1b964e745503 100644
--- a/pyfa.html
+++ b/pyfa.html
@@ -40,79 +40,57 @@
 

             15
$ pmaint sync pyfa
 

-            16
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
warning: Pulling without specifying how to reconcile divergent branches is
 

-            22
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
discouraged. You can squelch this message by running one of the following
 

-            23
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
commands sometime before your next pull:
 

-            24
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 

-            25
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase false  # merge (the default strategy)
 

-            26
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.rebase true   # rebase
 

-            27
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.ff only       # fast-forward only
 

-            28
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
 

-            29
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
You can replace "git config" with "git config --global" to set a default
 

-            30
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            31
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
or --ff-only on the command line to override the configured default per
 

-            32
warning: Pulling without specifying how to reconcile divergent branches is
+            32
invocation.
 

-            33
discouraged. You can squelch this message by running one of the following
+            33
 

-            34
commands sometime before your next pull:
+            34
Already up to date.
 

-            35
+            35
*** syncing pyfa
 

-            36
  git config pull.rebase false  # merge (the default strategy)
+            36
*** synced pyfa
 

-            37
  git config pull.rebase true   # rebase
+            37
 * Sync succeeded
 

-            38
  git config pull.ff only       # fast-forward only
+            38
$ git log --format=%ci -1
 

-            39
+            39
$ git show -q --pretty=format:%G? HEAD
 

-            40
You can replace "git config" with "git config --global" to set a default
+            40
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 pyfa
 

-            41
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            42
or --ff-only on the command line to override the configured default per
-

-            43
invocation.
-

-            44
-

-            45
Already up to date.
-

-            46
*** syncing pyfa
-

-            47
*** synced pyfa
-

-            48
 * Sync succeeded
-

-            49
$ git log --format=%ci -1
-

-            50
$ git show -q --pretty=format:%G? HEAD
-

-            51
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 pyfa
-

-            52
 * Cache regenerated successfully
+            41
 * Cache regenerated successfully
 

 
         
diff --git a/pyfa.txt b/pyfa.txt
index 8712126f9393..806aa4aa76d3 100644
--- a/pyfa.txt
+++ b/pyfa.txt
@@ -13,22 +13,11 @@
              'uri': 'git+ssh://git@github.com/ZeroPointEnergy/gentoo-pyfa-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync pyfa
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/python.html b/python.html
index d99a5f2853b7..599e243991c6 100644
--- a/python.html
+++ b/python.html
@@ -42,76 +42,42 @@
 

             16
$ pmaint sync python
 

-            17
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            23
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            24
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            25
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            26
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            27
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
Cloning into '/var/lib/repo-mirror-ci/sync/python'...
 

-            28
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
*** syncing python
 

-            29
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
*** synced python
 

-            30
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
 * Sync succeeded
 

-            31
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
$ git log --format=%ci -1
 

-            32
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
$ git show -q --pretty=format:%G? HEAD
 

-            33
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 python
 

-            34
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
 * Cache regenerated successfully
 

-            35
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            36
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            37
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            38
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            39
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            40
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            41
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            42
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            43
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            44
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            45
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            46
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            47
Cloning into '/var/lib/repo-mirror-ci/sync/python'...
-

-            48
fatal: unable to access 'https://anongit.gentoo.org/git/proj/python.git/': The requested URL returned error: 504
-

-            49
*** syncing python
-

-            50
!!! failed syncing python
-

-            51
 * Sync failed with 1
-
[FATAL]
 
         
     
diff --git a/python.txt b/python.txt
index 87e6c3b2adb1..abc532361747 100644
--- a/python.txt
+++ b/python.txt
@@ -14,38 +14,21 @@
  'status': 'official'}
  * Adding new repository
 $ pmaint sync python
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 Cloning into '/var/lib/repo-mirror-ci/sync/python'...
-fatal: unable to access 'https://anongit.gentoo.org/git/proj/python.git/': The requested URL returned error: 504
 *** syncing python
-!!! failed syncing python
- * Sync failed with 1
+*** synced python
+ * Sync succeeded
+$ git log --format=%ci -1
+$ git show -q --pretty=format:%G? HEAD
+$ pmaint regen --use-local-desc --pkg-desc-index -t 1 python
+ * Cache regenerated successfully
diff --git a/qemu-init.html b/qemu-init.html
index 7f2384f183a1..c48ebfe4ed0b 100644
--- a/qemu-init.html
+++ b/qemu-init.html
@@ -42,79 +42,57 @@
 

             16
$ pmaint sync qemu-init
 

-            17
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
warning: Pulling without specifying how to reconcile divergent branches is
 

-            23
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
discouraged. You can squelch this message by running one of the following
 

-            24
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
commands sometime before your next pull:
 

-            25
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 

-            26
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.rebase false  # merge (the default strategy)
 

-            27
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.rebase true   # rebase
 

-            28
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
  git config pull.ff only       # fast-forward only
 

-            29
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
 

-            30
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
You can replace "git config" with "git config --global" to set a default
 

-            31
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            32
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
or --ff-only on the command line to override the configured default per
 

-            33
warning: Pulling without specifying how to reconcile divergent branches is
+            33
invocation.
 

-            34
discouraged. You can squelch this message by running one of the following
+            34
 

-            35
commands sometime before your next pull:
+            35
Already up to date.
 

-            36
+            36
*** syncing qemu-init
 

-            37
  git config pull.rebase false  # merge (the default strategy)
+            37
*** synced qemu-init
 

-            38
  git config pull.rebase true   # rebase
+            38
 * Sync succeeded
 

-            39
  git config pull.ff only       # fast-forward only
+            39
$ git log --format=%ci -1
 

-            40
+            40
$ git show -q --pretty=format:%G? HEAD
 

-            41
You can replace "git config" with "git config --global" to set a default
+            41
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 qemu-init
 

-            42
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            43
or --ff-only on the command line to override the configured default per
-

-            44
invocation.
-

-            45
-

-            46
Already up to date.
-

-            47
*** syncing qemu-init
-

-            48
*** synced qemu-init
-

-            49
 * Sync succeeded
-

-            50
$ git log --format=%ci -1
-

-            51
$ git show -q --pretty=format:%G? HEAD
-

-            52
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 qemu-init
-

-            53
 * Cache regenerated successfully
+            42
 * Cache regenerated successfully
 

 
         
diff --git a/qemu-init.txt b/qemu-init.txt
index ce600cc8ec4e..085bd8f12870 100644
--- a/qemu-init.txt
+++ b/qemu-init.txt
@@ -14,22 +14,11 @@
              'uri': 'git+ssh://git@git.gentoo.org/proj/kvm-tools.git'}],
  'status': 'official'}
 $ pmaint sync qemu-init
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/qgp.html b/qgp.html
index 2214655de9e0..6143750676e8 100644
--- a/qgp.html
+++ b/qgp.html
@@ -38,79 +38,57 @@
 

             14
$ pmaint sync qgp
 

-            15
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
warning: Pulling without specifying how to reconcile divergent branches is
 

-            21
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
discouraged. You can squelch this message by running one of the following
 

-            22
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
commands sometime before your next pull:
 

-            23
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
 

-            24
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.rebase false  # merge (the default strategy)
 

-            25
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase true   # rebase
 

-            26
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.ff only       # fast-forward only
 

-            27
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
 

-            28
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
You can replace "git config" with "git config --global" to set a default
 

-            29
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            30
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
or --ff-only on the command line to override the configured default per
 

-            31
warning: Pulling without specifying how to reconcile divergent branches is
+            31
invocation.
 

-            32
discouraged. You can squelch this message by running one of the following
+            32
 

-            33
commands sometime before your next pull:
+            33
Already up to date.
 

-            34
+            34
*** syncing qgp
 

-            35
  git config pull.rebase false  # merge (the default strategy)
+            35
*** synced qgp
 

-            36
  git config pull.rebase true   # rebase
+            36
 * Sync succeeded
 

-            37
  git config pull.ff only       # fast-forward only
+            37
$ git log --format=%ci -1
 

-            38
+            38
$ git show -q --pretty=format:%G? HEAD
 

-            39
You can replace "git config" with "git config --global" to set a default
+            39
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 qgp
 

-            40
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            41
or --ff-only on the command line to override the configured default per
-

-            42
invocation.
-

-            43
-

-            44
Already up to date.
-

-            45
*** syncing qgp
-

-            46
*** synced qgp
-

-            47
 * Sync succeeded
-

-            48
$ git log --format=%ci -1
-

-            49
$ git show -q --pretty=format:%G? HEAD
-

-            50
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 qgp
-

-            51
 * Cache regenerated successfully
+            40
 * Cache regenerated successfully
 

 
         
diff --git a/qgp.txt b/qgp.txt
index e4ac903d8102..21420df5fb6d 100644
--- a/qgp.txt
+++ b/qgp.txt
@@ -12,22 +12,11 @@
              'uri': 'git+ssh://git@github.com:qgp/gentoo-qgp.git'}],
  'status': 'unofficial'}
 $ pmaint sync qgp
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/qownnotes-overlay.html b/qownnotes-overlay.html
index 80dadb599d5b..c1d9e0613802 100644
--- a/qownnotes-overlay.html
+++ b/qownnotes-overlay.html
@@ -38,79 +38,57 @@
 

             14
$ pmaint sync qownnotes-overlay
 

-            15
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
warning: Pulling without specifying how to reconcile divergent branches is
 

-            21
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
discouraged. You can squelch this message by running one of the following
 

-            22
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
commands sometime before your next pull:
 

-            23
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
 

-            24
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.rebase false  # merge (the default strategy)
 

-            25
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase true   # rebase
 

-            26
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.ff only       # fast-forward only
 

-            27
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
 

-            28
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
You can replace "git config" with "git config --global" to set a default
 

-            29
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            30
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
or --ff-only on the command line to override the configured default per
 

-            31
warning: Pulling without specifying how to reconcile divergent branches is
+            31
invocation.
 

-            32
discouraged. You can squelch this message by running one of the following
+            32
 

-            33
commands sometime before your next pull:
+            33
Already up to date.
 

-            34
+            34
*** syncing qownnotes-overlay
 

-            35
  git config pull.rebase false  # merge (the default strategy)
+            35
*** synced qownnotes-overlay
 

-            36
  git config pull.rebase true   # rebase
+            36
 * Sync succeeded
 

-            37
  git config pull.ff only       # fast-forward only
+            37
$ git log --format=%ci -1
 

-            38
+            38
$ git show -q --pretty=format:%G? HEAD
 

-            39
You can replace "git config" with "git config --global" to set a default
+            39
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 qownnotes-overlay
 

-            40
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            41
or --ff-only on the command line to override the configured default per
-

-            42
invocation.
-

-            43
-

-            44
Already up to date.
-

-            45
*** syncing qownnotes-overlay
-

-            46
*** synced qownnotes-overlay
-

-            47
 * Sync succeeded
-

-            48
$ git log --format=%ci -1
-

-            49
$ git show -q --pretty=format:%G? HEAD
-

-            50
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 qownnotes-overlay
-

-            51
 * Cache regenerated successfully
+            40
 * Cache regenerated successfully
 

 
         
diff --git a/qownnotes-overlay.txt b/qownnotes-overlay.txt
index 4fcbbde9a34a..33bebdb265dc 100644
--- a/qownnotes-overlay.txt
+++ b/qownnotes-overlay.txt
@@ -12,22 +12,11 @@
              'uri': 'git+ssh://git@github.com/qownnotes/gentoo-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync qownnotes-overlay
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/qsx.html b/qsx.html
index 6f3773b0c769..5ae1c1b363fc 100644
--- a/qsx.html
+++ b/qsx.html
@@ -38,79 +38,57 @@
 

             14
$ pmaint sync qsx
 

-            15
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
warning: Pulling without specifying how to reconcile divergent branches is
 

-            21
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
discouraged. You can squelch this message by running one of the following
 

-            22
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
commands sometime before your next pull:
 

-            23
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
 

-            24
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.rebase false  # merge (the default strategy)
 

-            25
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase true   # rebase
 

-            26
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.ff only       # fast-forward only
 

-            27
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
 

-            28
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
You can replace "git config" with "git config --global" to set a default
 

-            29
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            30
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
or --ff-only on the command line to override the configured default per
 

-            31
warning: Pulling without specifying how to reconcile divergent branches is
+            31
invocation.
 

-            32
discouraged. You can squelch this message by running one of the following
+            32
 

-            33
commands sometime before your next pull:
+            33
Already up to date.
 

-            34
+            34
*** syncing qsx
 

-            35
  git config pull.rebase false  # merge (the default strategy)
+            35
*** synced qsx
 

-            36
  git config pull.rebase true   # rebase
+            36
 * Sync succeeded
 

-            37
  git config pull.ff only       # fast-forward only
+            37
$ git log --format=%ci -1
 

-            38
+            38
$ git show -q --pretty=format:%G? HEAD
 

-            39
You can replace "git config" with "git config --global" to set a default
+            39
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 qsx
 

-            40
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            41
or --ff-only on the command line to override the configured default per
-

-            42
invocation.
-

-            43
-

-            44
Already up to date.
-

-            45
*** syncing qsx
-

-            46
*** synced qsx
-

-            47
 * Sync succeeded
-

-            48
$ git log --format=%ci -1
-

-            49
$ git show -q --pretty=format:%G? HEAD
-

-            50
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 qsx
-

-            51
 * Cache regenerated successfully
+            40
 * Cache regenerated successfully
 

 
         
diff --git a/qsx.txt b/qsx.txt
index ea4b435ca5aa..d3ae194537b8 100644
--- a/qsx.txt
+++ b/qsx.txt
@@ -12,22 +12,11 @@
              'uri': 'git+ssh://git@github.com/qsuscs/gentoo-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync qsx
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/qt.html b/qt.html
index 82b883b2d406..4e58aa545158 100644
--- a/qt.html
+++ b/qt.html
@@ -44,89 +44,57 @@
 

             17
$ pmaint sync qt
 

-            18
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            23
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
warning: Pulling without specifying how to reconcile divergent branches is
 

-            24
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
discouraged. You can squelch this message by running one of the following
 

-            25
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
commands sometime before your next pull:
 

-            26
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
 

-            27
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.rebase false  # merge (the default strategy)
 

-            28
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
  git config pull.rebase true   # rebase
 

-            29
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
  git config pull.ff only       # fast-forward only
 

-            30
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
 

-            31
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
You can replace "git config" with "git config --global" to set a default
 

-            32
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            33
warning: Pulling without specifying how to reconcile divergent branches is
+            33
or --ff-only on the command line to override the configured default per
 

-            34
discouraged. You can squelch this message by running one of the following
+            34
invocation.
 

-            35
commands sometime before your next pull:
+            35
 

-            36
+            36
Already up to date.
 

-            37
  git config pull.rebase false  # merge (the default strategy)
+            37
*** syncing qt
 

-            38
  git config pull.rebase true   # rebase
+            38
*** synced qt
 

-            39
  git config pull.ff only       # fast-forward only
+            39
 * Sync succeeded
 

-            40
+            40
$ git log --format=%ci -1
 

-            41
You can replace "git config" with "git config --global" to set a default
+            41
$ git show -q --pretty=format:%G? HEAD
 

-            42
preference for all repositories. You can also pass --rebase, --no-rebase,
+            42
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 qt
 

-            43
or --ff-only on the command line to override the configured default per
-

-            44
invocation.
-

-            45
-

-            46
fatal: unable to access 'https://anongit.gentoo.org/git/proj/qt.git/': The requested URL returned error: 504
-

-            47
*** syncing qt
-

-            48
!!! failed syncing qt
-

-            49
 * Sync failed with 1
-
[FATAL]
-            50
 * Will try to re-create
-

-            51
$ pmaint sync qt
-

-            52
Cloning into '/var/lib/repo-mirror-ci/sync/qt'...
-

-            53
*** syncing qt
-

-            54
*** synced qt
-

-            55
 * Sync succeeded after re-adding
-

-            56
$ git log --format=%ci -1
-

-            57
$ git show -q --pretty=format:%G? HEAD
-

-            58
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 qt
-

-            59
 * Cache regenerated successfully
+            43
 * Cache regenerated successfully
 

 
         
diff --git a/qt.txt b/qt.txt
index 8e5c6fdee36f..0981b620334b 100644
--- a/qt.txt
+++ b/qt.txt
@@ -15,21 +15,11 @@
             {'type': 'git', 'uri': 'git+ssh://git@git.gentoo.org/proj/qt.git'}],
  'status': 'official'}
 $ pmaint sync qt
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
@@ -43,16 +33,10 @@ 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.
 
-fatal: unable to access 'https://anongit.gentoo.org/git/proj/qt.git/': The requested URL returned error: 504
-*** syncing qt
-!!! failed syncing qt
- * Sync failed with 1
- * Will try to re-create
-$ pmaint sync qt
-Cloning into '/var/lib/repo-mirror-ci/sync/qt'...
+Already up to date.
 *** syncing qt
 *** synced qt
- * Sync succeeded after re-adding
+ * Sync succeeded
 $ git log --format=%ci -1
 $ git show -q --pretty=format:%G? HEAD
 $ pmaint regen --use-local-desc --pkg-desc-index -t 1 qt
diff --git a/quarks.html b/quarks.html
index 5a63022a4cd9..c33b19f260ff 100644
--- a/quarks.html
+++ b/quarks.html
@@ -34,77 +34,57 @@
 

             12
$ pmaint sync quarks
 

-            13
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
warning: Pulling without specifying how to reconcile divergent branches is
 

-            19
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
discouraged. You can squelch this message by running one of the following
 

-            20
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
commands sometime before your next pull:
 

-            21
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
 

-            22
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase false  # merge (the default strategy)
 

-            23
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase true   # rebase
 

-            24
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.ff only       # fast-forward only
 

-            25
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 

-            26
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
You can replace "git config" with "git config --global" to set a default
 

-            27
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            28
warning: Pulling without specifying how to reconcile divergent branches is
+            28
or --ff-only on the command line to override the configured default per
 

-            29
discouraged. You can squelch this message by running one of the following
+            29
invocation.
 

-            30
commands sometime before your next pull:
+            30
 

-            31
+            31
Already up to date.
 

-            32
  git config pull.rebase false  # merge (the default strategy)
+            32
*** syncing quarks
 

-            33
  git config pull.rebase true   # rebase
+            33
*** synced quarks
 

-            34
  git config pull.ff only       # fast-forward only
+            34
 * Sync succeeded
 

-            35
+            35
$ git log --format=%ci -1
 

-            36
You can replace "git config" with "git config --global" to set a default
+            36
$ git show -q --pretty=format:%G? HEAD
 

-            37
preference for all repositories. You can also pass --rebase, --no-rebase,
+            37
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 quarks
 

-            38
or --ff-only on the command line to override the configured default per
-

-            39
invocation.
-

-            40
-

-            41
Already up to date.
-

-            42
*** syncing quarks
-

-            43
*** synced quarks
-

-            44
 * Sync succeeded
-

-            45
$ git log --format=%ci -1
-

-            46
$ git show -q --pretty=format:%G? HEAD
-

-            47
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 quarks
-

-            48
 * Cache regenerated successfully
+            38
 * Cache regenerated successfully
 

 
         
diff --git a/quarks.txt b/quarks.txt
index f94c138c28cb..ff8f64af1bdf 100644
--- a/quarks.txt
+++ b/quarks.txt
@@ -10,21 +10,11 @@
              'uri': 'https://git.zero-downtime.net/quark/quarks.git'}],
  'status': 'unofficial'}
 $ pmaint sync quarks
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/qwin-overlay.html b/qwin-overlay.html
index ad0ee2281986..c3e021df098c 100644
--- a/qwin-overlay.html
+++ b/qwin-overlay.html
@@ -28,81 +28,59 @@
 

             9
$ pmaint sync qwin-overlay
 

-            10
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            10
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            11
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            11
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            12
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
warning: Pulling without specifying how to reconcile divergent branches is
 

-            16
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
discouraged. You can squelch this message by running one of the following
 

-            17
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
commands sometime before your next pull:
 

-            18
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
 

-            19
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
  git config pull.rebase false  # merge (the default strategy)
 

-            20
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
  git config pull.rebase true   # rebase
 

-            21
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
  git config pull.ff only       # fast-forward only
 

-            22
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
 

-            23
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
You can replace "git config" with "git config --global" to set a default
 

-            24
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            25
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
or --ff-only on the command line to override the configured default per
 

-            26
warning: Pulling without specifying how to reconcile divergent branches is
+            26
invocation.
 

-            27
discouraged. You can squelch this message by running one of the following
+            27
 

-            28
commands sometime before your next pull:
+            28
Already up to date.
 

-            29
+            29
*** syncing qwin-overlay
 

-            30
  git config pull.rebase false  # merge (the default strategy)
+            30
*** synced qwin-overlay
 

-            31
  git config pull.rebase true   # rebase
+            31
 * Sync succeeded
 

-            32
  git config pull.ff only       # fast-forward only
+            32
$ git log --format=%ci -1
 

-            33
+            33
$ git show -q --pretty=format:%G? HEAD
 

-            34
You can replace "git config" with "git config --global" to set a default
+            34
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 qwin-overlay
 

-            35
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            36
or --ff-only on the command line to override the configured default per
-

-            37
invocation.
-

-            38
-

-            39
Already up to date.
-

-            40
*** syncing qwin-overlay
-

-            41
*** synced qwin-overlay
-

-            42
 * Sync succeeded
-

-            43
$ git log --format=%ci -1
-

-            44
$ git show -q --pretty=format:%G? HEAD
-

-            45
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 qwin-overlay
-

-            46
 * x11-terms/sakura-9999: failed sourcing ebuild: inherit requires unknown eclass: bzr.eclass
+            35
 * x11-terms/sakura-9999: failed sourcing ebuild: inherit requires unknown eclass: bzr.eclass
 
[FATAL]
-            47
 * Cache regen failed with 1
+            36
 * Cache regen failed with 1
 

 
         
diff --git a/qwin-overlay.txt b/qwin-overlay.txt
index 36fd7bcf7d18..fbd8be699906 100644
--- a/qwin-overlay.txt
+++ b/qwin-overlay.txt
@@ -7,22 +7,11 @@
              'uri': 'git://github.com/Flex1911/qwin-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync qwin-overlay
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/rafaelmartins.html b/rafaelmartins.html
index 912652f66d3a..9fd5629de664 100644
--- a/rafaelmartins.html
+++ b/rafaelmartins.html
@@ -38,79 +38,57 @@
 

             14
$ pmaint sync rafaelmartins
 

-            15
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
warning: Pulling without specifying how to reconcile divergent branches is
 

-            21
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
discouraged. You can squelch this message by running one of the following
 

-            22
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
commands sometime before your next pull:
 

-            23
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
 

-            24
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.rebase false  # merge (the default strategy)
 

-            25
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase true   # rebase
 

-            26
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.ff only       # fast-forward only
 

-            27
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
 

-            28
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
You can replace "git config" with "git config --global" to set a default
 

-            29
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            30
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
or --ff-only on the command line to override the configured default per
 

-            31
warning: Pulling without specifying how to reconcile divergent branches is
+            31
invocation.
 

-            32
discouraged. You can squelch this message by running one of the following
+            32
 

-            33
commands sometime before your next pull:
+            33
Already up to date.
 

-            34
+            34
*** syncing rafaelmartins
 

-            35
  git config pull.rebase false  # merge (the default strategy)
+            35
*** synced rafaelmartins
 

-            36
  git config pull.rebase true   # rebase
+            36
 * Sync succeeded
 

-            37
  git config pull.ff only       # fast-forward only
+            37
$ git log --format=%ci -1
 

-            38
+            38
$ git show -q --pretty=format:%G? HEAD
 

-            39
You can replace "git config" with "git config --global" to set a default
+            39
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 rafaelmartins
 

-            40
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            41
or --ff-only on the command line to override the configured default per
-

-            42
invocation.
-

-            43
-

-            44
Already up to date.
-

-            45
*** syncing rafaelmartins
-

-            46
*** synced rafaelmartins
-

-            47
 * Sync succeeded
-

-            48
$ git log --format=%ci -1
-

-            49
$ git show -q --pretty=format:%G? HEAD
-

-            50
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 rafaelmartins
-

-            51
 * Cache regenerated successfully
+            40
 * Cache regenerated successfully
 

 
         
diff --git a/rafaelmartins.txt b/rafaelmartins.txt
index 3bd8be410d02..df263852c5ab 100644
--- a/rafaelmartins.txt
+++ b/rafaelmartins.txt
@@ -12,22 +12,11 @@
              'uri': 'git://github.com/rafaelmartins/gentoo-overlay.git'}],
  'status': 'official'}
 $ pmaint sync rafaelmartins
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/rage.html b/rage.html
index badb5b3e6330..f38e984accc1 100644
--- a/rage.html
+++ b/rage.html
@@ -36,79 +36,57 @@
 

             13
$ pmaint sync rage
 

-            14
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
warning: Pulling without specifying how to reconcile divergent branches is
 

-            20
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
discouraged. You can squelch this message by running one of the following
 

-            21
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
commands sometime before your next pull:
 

-            22
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
 

-            23
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase false  # merge (the default strategy)
 

-            24
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.rebase true   # rebase
 

-            25
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.ff only       # fast-forward only
 

-            26
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
 

-            27
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
You can replace "git config" with "git config --global" to set a default
 

-            28
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            29
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
or --ff-only on the command line to override the configured default per
 

-            30
warning: Pulling without specifying how to reconcile divergent branches is
+            30
invocation.
 

-            31
discouraged. You can squelch this message by running one of the following
+            31
 

-            32
commands sometime before your next pull:
+            32
Already up to date.
 

-            33
+            33
*** syncing rage
 

-            34
  git config pull.rebase false  # merge (the default strategy)
+            34
*** synced rage
 

-            35
  git config pull.rebase true   # rebase
+            35
 * Sync succeeded
 

-            36
  git config pull.ff only       # fast-forward only
+            36
$ git log --format=%ci -1
 

-            37
+            37
$ git show -q --pretty=format:%G? HEAD
 

-            38
You can replace "git config" with "git config --global" to set a default
+            38
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 rage
 

-            39
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            40
or --ff-only on the command line to override the configured default per
-

-            41
invocation.
-

-            42
-

-            43
Already up to date.
-

-            44
*** syncing rage
-

-            45
*** synced rage
-

-            46
 * Sync succeeded
-

-            47
$ git log --format=%ci -1
-

-            48
$ git show -q --pretty=format:%G? HEAD
-

-            49
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 rage
-

-            50
 * Cache regenerated successfully
+            39
 * Cache regenerated successfully
 

 
         
diff --git a/rage.txt b/rage.txt
index 75d144af8fdf..4c1a993dd749 100644
--- a/rage.txt
+++ b/rage.txt
@@ -11,22 +11,11 @@
              'uri': 'git+ssh://git@gitlab.com/oxr463/overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync rage
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/raiagent.html b/raiagent.html
index cdf4a4df52de..5245851b7e7c 100644
--- a/raiagent.html
+++ b/raiagent.html
@@ -34,77 +34,59 @@
 

             12
$ pmaint sync raiagent
 

-            13
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
warning: Pulling without specifying how to reconcile divergent branches is
 

-            20
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
discouraged. You can squelch this message by running one of the following
 

-            21
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
commands sometime before your next pull:
 

-            22
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
 

-            23
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase false  # merge (the default strategy)
 

-            24
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.rebase true   # rebase
 

-            25
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.ff only       # fast-forward only
 

-            26
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
 

-            27
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
You can replace "git config" with "git config --global" to set a default
 

-            28
warning: Pulling without specifying how to reconcile divergent branches is
+            28
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            29
discouraged. You can squelch this message by running one of the following
+            29
or --ff-only on the command line to override the configured default per
 

-            30
commands sometime before your next pull:
+            30
invocation.
 

             31
 

-            32
  git config pull.rebase false  # merge (the default strategy)
+            32
Already up to date.
 

-            33
  git config pull.rebase true   # rebase
+            33
*** syncing raiagent
 

-            34
  git config pull.ff only       # fast-forward only
+            34
*** synced raiagent
 

-            35
+            35
 * Sync succeeded
 

-            36
You can replace "git config" with "git config --global" to set a default
+            36
$ git log --format=%ci -1
 

-            37
preference for all repositories. You can also pass --rebase, --no-rebase,
+            37
$ git show -q --pretty=format:%G? HEAD
 

-            38
or --ff-only on the command line to override the configured default per
+            38
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 raiagent
 

-            39
invocation.
-

-            40
-

-            41
Already up to date.
-

-            42
*** syncing raiagent
-

-            43
*** synced raiagent
-

-            44
 * Sync succeeded
-

-            45
$ git log --format=%ci -1
-

-            46
$ git show -q --pretty=format:%G? HEAD
-

-            47
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 raiagent
-

-            48
 * Cache regenerated successfully
+            39
 * Cache regenerated successfully
 

 
         
diff --git a/raiagent.txt b/raiagent.txt
index 071be14e5403..6f9e3abc635c 100644
--- a/raiagent.txt
+++ b/raiagent.txt
@@ -10,21 +10,12 @@
             {'type': 'git', 'uri': 'git://github.com/leycec/raiagent.git'}],
  'status': 'unofficial'}
 $ pmaint sync raiagent
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/rasdark.html b/rasdark.html
index d8351928180b..f10e92183eee 100644
--- a/rasdark.html
+++ b/rasdark.html
@@ -32,77 +32,57 @@
 

             11
$ pmaint sync rasdark
 

-            12
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
warning: Pulling without specifying how to reconcile divergent branches is
 

-            18
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
discouraged. You can squelch this message by running one of the following
 

-            19
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
commands sometime before your next pull:
 

-            20
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
 

-            21
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
  git config pull.rebase false  # merge (the default strategy)
 

-            22
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase true   # rebase
 

-            23
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.ff only       # fast-forward only
 

-            24
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 

-            25
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
You can replace "git config" with "git config --global" to set a default
 

-            26
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            27
warning: Pulling without specifying how to reconcile divergent branches is
+            27
or --ff-only on the command line to override the configured default per
 

-            28
discouraged. You can squelch this message by running one of the following
+            28
invocation.
 

-            29
commands sometime before your next pull:
+            29
 

-            30
+            30
Already up to date.
 

-            31
  git config pull.rebase false  # merge (the default strategy)
+            31
*** syncing rasdark
 

-            32
  git config pull.rebase true   # rebase
+            32
*** synced rasdark
 

-            33
  git config pull.ff only       # fast-forward only
+            33
 * Sync succeeded
 

-            34
+            34
$ git log --format=%ci -1
 

-            35
You can replace "git config" with "git config --global" to set a default
+            35
$ git show -q --pretty=format:%G? HEAD
 

-            36
preference for all repositories. You can also pass --rebase, --no-rebase,
+            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 rasdark
 

-            37
or --ff-only on the command line to override the configured default per
-

-            38
invocation.
-

-            39
-

-            40
Already up to date.
-

-            41
*** syncing rasdark
-

-            42
*** synced rasdark
-

-            43
 * Sync succeeded
-

-            44
$ git log --format=%ci -1
-

-            45
$ git show -q --pretty=format:%G? HEAD
-

-            46
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 rasdark
-

-            47
 * Cache regenerated successfully
+            37
 * Cache regenerated successfully
 

 
         
diff --git a/rasdark.txt b/rasdark.txt
index bb0222cb204b..6a4d22e84d88 100644
--- a/rasdark.txt
+++ b/rasdark.txt
@@ -9,21 +9,11 @@
             {'type': 'git', 'uri': 'git://github.com/rasdark/overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync rasdark
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/raw.html b/raw.html
index 7474f3edebdf..43555fc2c910 100644
--- a/raw.html
+++ b/raw.html
@@ -34,79 +34,63 @@
 

             12
$ pmaint sync raw
 

-            13
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
warning: Pulling without specifying how to reconcile divergent branches is
 

-            20
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
discouraged. You can squelch this message by running one of the following
 

-            21
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
commands sometime before your next pull:
 

-            22
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
 

-            23
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase false  # merge (the default strategy)
 

-            24
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.rebase true   # rebase
 

-            25
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.ff only       # fast-forward only
 

-            26
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
 

-            27
warning: Pulling without specifying how to reconcile divergent branches is
+            27
You can replace "git config" with "git config --global" to set a default
 

-            28
discouraged. You can squelch this message by running one of the following
+            28
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            29
commands sometime before your next pull:
+            29
or --ff-only on the command line to override the configured default per
 

-            30
+            30
invocation.
 

-            31
  git config pull.rebase false  # merge (the default strategy)
+            31
 

-            32
  git config pull.rebase true   # rebase
+            32
Already up to date.
 

-            33
  git config pull.ff only       # fast-forward only
+            33
*** syncing raw
 

-            34
+            34
*** synced raw
 

-            35
You can replace "git config" with "git config --global" to set a default
+            35
 * Sync succeeded
 

-            36
preference for all repositories. You can also pass --rebase, --no-rebase,
+            36
$ git log --format=%ci -1
 

-            37
or --ff-only on the command line to override the configured default per
+            37
$ git show -q --pretty=format:%G? HEAD
 

-            38
invocation.
+            38
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 raw
 

-            39
-

-            40
Already up to date.
-

-            41
*** syncing raw
-

-            42
*** synced raw
-

-            43
 * Sync succeeded
-

-            44
$ git log --format=%ci -1
-

-            45
$ git show -q --pretty=format:%G? HEAD
-

-            46
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 raw
-

-            47
 * sys-kernel/next-sources-9999: failed sourcing ebuild: returned val from gen_metadata was 'False'
+            39
 * sys-kernel/next-sources-9999: failed sourcing ebuild: returned val from gen_metadata was 'False'
 
[FATAL]
-            48
 * sys-kernel/torvalds-sources-9999: failed sourcing ebuild: returned val from gen_metadata was 'False'
+            40
 * sys-kernel/torvalds-sources-9999: failed sourcing ebuild: returned val from gen_metadata was 'False'
 
[FATAL]
-            49
 * Cache regen failed with 1
+            41
 * Cache regen failed with 1
 

 
         
diff --git a/raw.txt b/raw.txt
index c8e938054f13..1c84709614ce 100644
--- a/raw.txt
+++ b/raw.txt
@@ -10,20 +10,12 @@
              'uri': 'https://github.com/mahatma-kaganovich/raw.git'}],
  'status': 'unofficial'}
 $ pmaint sync raw
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/rdnetto-overlay.html b/rdnetto-overlay.html
index c0a34f220f6f..f4feddb22622 100644
--- a/rdnetto-overlay.html
+++ b/rdnetto-overlay.html
@@ -38,73 +38,59 @@
 

             14
$ pmaint sync rdnetto-overlay
 

-            15
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
warning: Pulling without specifying how to reconcile divergent branches is
 

-            22
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
discouraged. You can squelch this message by running one of the following
 

-            23
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
commands sometime before your next pull:
 

-            24
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 

-            25
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase false  # merge (the default strategy)
 

-            26
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.rebase true   # rebase
 

-            27
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.ff only       # fast-forward only
 

-            28
warning: Pulling without specifying how to reconcile divergent branches is
+            28
 

-            29
discouraged. You can squelch this message by running one of the following
+            29
You can replace "git config" with "git config --global" to set a default
 

-            30
commands sometime before your next pull:
+            30
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            31
+            31
or --ff-only on the command line to override the configured default per
 

-            32
  git config pull.rebase false  # merge (the default strategy)
+            32
invocation.
 

-            33
  git config pull.rebase true   # rebase
+            33
 

-            34
  git config pull.ff only       # fast-forward only
+            34
Already up to date.
 

-            35
+            35
*** syncing rdnetto-overlay
 

-            36
You can replace "git config" with "git config --global" to set a default
+            36
*** synced rdnetto-overlay
 

-            37
preference for all repositories. You can also pass --rebase, --no-rebase,
+            37
 * Sync succeeded
 

-            38
or --ff-only on the command line to override the configured default per
+            38
$ git log --format=%ci -1
 

-            39
invocation.
+            39
$ git show -q --pretty=format:%G? HEAD
 

-            40
+            40
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 rdnetto-overlay
 

-            41
Already up to date.
-

-            42
*** syncing rdnetto-overlay
-

-            43
*** synced rdnetto-overlay
-

-            44
 * Sync succeeded
-

-            45
$ git log --format=%ci -1
-

-            46
$ git show -q --pretty=format:%G? HEAD
-

-            47
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 rdnetto-overlay
-

-            48
 * Cache regenerated successfully
+            41
 * Cache regenerated successfully
 

 
         
diff --git a/rdnetto-overlay.txt b/rdnetto-overlay.txt
index 0bb4399c8e72..9d91ef65e1c7 100644
--- a/rdnetto-overlay.txt
+++ b/rdnetto-overlay.txt
@@ -12,19 +12,12 @@
              'uri': 'git+ssh://git@github.com:rdnetto/rdnetto-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync rdnetto-overlay
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/reagentoo.html b/reagentoo.html
index ef6f83930cf9..c90533b4adf5 100644
--- a/reagentoo.html
+++ b/reagentoo.html
@@ -38,75 +38,59 @@
 

             14
$ pmaint sync reagentoo
 

-            15
WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
warning: Pulling without specifying how to reconcile divergent branches is
 

-            22
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
discouraged. You can squelch this message by running one of the following
 

-            23
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
commands sometime before your next pull:
 

-            24
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 

-            25
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase false  # merge (the default strategy)
 

-            26
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.rebase true   # rebase
 

-            27
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.ff only       # fast-forward only
 

-            28
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
 

-            29
warning: Pulling without specifying how to reconcile divergent branches is
+            29
You can replace "git config" with "git config --global" to set a default
 

-            30
discouraged. You can squelch this message by running one of the following
+            30
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            31
commands sometime before your next pull:
+            31
or --ff-only on the command line to override the configured default per
 

-            32
+            32
invocation.
 

-            33
  git config pull.rebase false  # merge (the default strategy)
+            33
 

-            34
  git config pull.rebase true   # rebase
+            34
Already up to date.
 

-            35
  git config pull.ff only       # fast-forward only
+            35
*** syncing reagentoo
 

-            36
+            36
*** synced reagentoo
 

-            37
You can replace "git config" with "git config --global" to set a default
+            37
 * Sync succeeded
 

-            38
preference for all repositories. You can also pass --rebase, --no-rebase,
+            38
$ git log --format=%ci -1
 

-            39
or --ff-only on the command line to override the configured default per
+            39
$ git show -q --pretty=format:%G? HEAD
 

-            40
invocation.
+            40
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 reagentoo
 

-            41
-

-            42
Already up to date.
-

-            43
*** syncing reagentoo
-

-            44
*** synced reagentoo
-

-            45
 * Sync succeeded
-

-            46
$ git log --format=%ci -1
-

-            47
$ git show -q --pretty=format:%G? HEAD
-

-            48
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 reagentoo
-

-            49
 * Cache regenerated successfully
+            41
 * Cache regenerated successfully
 

 
         
diff --git a/reagentoo.txt b/reagentoo.txt
index 1fcd73ef2b51..f3dc15f1990d 100644
--- a/reagentoo.txt
+++ b/reagentoo.txt
@@ -12,20 +12,12 @@
              'uri': 'git@github.com:reagentoo/gentoo-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync reagentoo
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/rebutia.html b/rebutia.html
index 3f369b5aa381..059fd6bf1571 100644
--- a/rebutia.html
+++ b/rebutia.html
@@ -42,66 +42,42 @@
 

             16
$ pmaint sync rebutia
 

-            17
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            23
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            24
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

             25
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            26
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            27
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
Cloning into '/var/lib/repo-mirror-ci/sync/rebutia'...
 

-            28
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
*** syncing rebutia
 

-            29
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
*** synced rebutia
 

-            30
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
 * Sync succeeded
 

-            31
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
$ git log --format=%ci -1
 

-            32
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
$ git show -q --pretty=format:%G? HEAD
 

-            33
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 rebutia
 

-            34
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
 * Cache regenerated successfully
 

-            35
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            36
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            37
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            38
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            39
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            40
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            41
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            42
Cloning into '/var/lib/repo-mirror-ci/sync/rebutia'...
-

-            43
fatal: unable to access 'https://anongit.gentoo.org/git/user/rebutia.git/': The requested URL returned error: 504
-

-            44
*** syncing rebutia
-

-            45
!!! failed syncing rebutia
-

-            46
 * Sync failed with 1
-
[FATAL]
 
         
     
diff --git a/rebutia.txt b/rebutia.txt
index 3541b991a2f4..b692553e2ddd 100644
--- a/rebutia.txt
+++ b/rebutia.txt
@@ -14,33 +14,21 @@
  'status': 'unofficial'}
  * Adding new repository
 $ pmaint sync rebutia
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 Cloning into '/var/lib/repo-mirror-ci/sync/rebutia'...
-fatal: unable to access 'https://anongit.gentoo.org/git/user/rebutia.git/': The requested URL returned error: 504
 *** syncing rebutia
-!!! failed syncing rebutia
- * Sync failed with 1
+*** synced rebutia
+ * Sync succeeded
+$ git log --format=%ci -1
+$ git show -q --pretty=format:%G? HEAD
+$ pmaint regen --use-local-desc --pkg-desc-index -t 1 rebutia
+ * Cache regenerated successfully
diff --git a/regina-gentoo.html b/regina-gentoo.html
index 32a1c13d3b8e..ba72b86f1dd3 100644
--- a/regina-gentoo.html
+++ b/regina-gentoo.html
@@ -34,73 +34,59 @@
 

             12
$ pmaint sync regina-gentoo
 

-            13
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
warning: Pulling without specifying how to reconcile divergent branches is
 

-            20
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
discouraged. You can squelch this message by running one of the following
 

-            21
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
commands sometime before your next pull:
 

-            22
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
 

-            23
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase false  # merge (the default strategy)
 

-            24
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.rebase true   # rebase
 

-            25
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.ff only       # fast-forward only
 

-            26
warning: Pulling without specifying how to reconcile divergent branches is
+            26
 

-            27
discouraged. You can squelch this message by running one of the following
+            27
You can replace "git config" with "git config --global" to set a default
 

-            28
commands sometime before your next pull:
+            28
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            29
+            29
or --ff-only on the command line to override the configured default per
 

-            30
  git config pull.rebase false  # merge (the default strategy)
+            30
invocation.
 

-            31
  git config pull.rebase true   # rebase
+            31
 

-            32
  git config pull.ff only       # fast-forward only
+            32
Already up to date.
 

-            33
+            33
*** syncing regina-gentoo
 

-            34
You can replace "git config" with "git config --global" to set a default
+            34
*** synced regina-gentoo
 

-            35
preference for all repositories. You can also pass --rebase, --no-rebase,
+            35
 * Sync succeeded
 

-            36
or --ff-only on the command line to override the configured default per
+            36
$ git log --format=%ci -1
 

-            37
invocation.
+            37
$ git show -q --pretty=format:%G? HEAD
 

-            38
+            38
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 regina-gentoo
 

-            39
Already up to date.
-

-            40
*** syncing regina-gentoo
-

-            41
*** synced regina-gentoo
-

-            42
 * Sync succeeded
-

-            43
$ git log --format=%ci -1
-

-            44
$ git show -q --pretty=format:%G? HEAD
-

-            45
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 regina-gentoo
-

-            46
 * Cache regenerated successfully
+            39
 * Cache regenerated successfully
 

 
         
diff --git a/regina-gentoo.txt b/regina-gentoo.txt
index 3f2235cfffd4..1e5e1abf19ef 100644
--- a/regina-gentoo.txt
+++ b/regina-gentoo.txt
@@ -10,19 +10,12 @@
              'uri': 'git://github.com/WPettersson/regina-gentoo.git'}],
  'status': 'unofficial'}
 $ pmaint sync regina-gentoo
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/ricerlay.html b/ricerlay.html
index 0d68be5bd223..c37706d510cc 100644
--- a/ricerlay.html
+++ b/ricerlay.html
@@ -32,73 +32,59 @@
 

             11
$ pmaint sync ricerlay
 

-            12
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
warning: Pulling without specifying how to reconcile divergent branches is
 

-            19
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
discouraged. You can squelch this message by running one of the following
 

-            20
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
commands sometime before your next pull:
 

-            21
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
 

-            22
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase false  # merge (the default strategy)
 

-            23
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase true   # rebase
 

-            24
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.ff only       # fast-forward only
 

-            25
warning: Pulling without specifying how to reconcile divergent branches is
+            25
 

-            26
discouraged. You can squelch this message by running one of the following
+            26
You can replace "git config" with "git config --global" to set a default
 

-            27
commands sometime before your next pull:
+            27
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            28
+            28
or --ff-only on the command line to override the configured default per
 

-            29
  git config pull.rebase false  # merge (the default strategy)
+            29
invocation.
 

-            30
  git config pull.rebase true   # rebase
+            30
 

-            31
  git config pull.ff only       # fast-forward only
+            31
Already up to date.
 

-            32
+            32
*** syncing ricerlay
 

-            33
You can replace "git config" with "git config --global" to set a default
+            33
*** synced ricerlay
 

-            34
preference for all repositories. You can also pass --rebase, --no-rebase,
+            34
 * Sync succeeded
 

-            35
or --ff-only on the command line to override the configured default per
+            35
$ git log --format=%ci -1
 

-            36
invocation.
+            36
$ git show -q --pretty=format:%G? HEAD
 

-            37
+            37
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 ricerlay
 

-            38
Already up to date.
-

-            39
*** syncing ricerlay
-

-            40
*** synced ricerlay
-

-            41
 * Sync succeeded
-

-            42
$ git log --format=%ci -1
-

-            43
$ git show -q --pretty=format:%G? HEAD
-

-            44
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 ricerlay
-

-            45
 * Cache regenerated successfully
+            38
 * Cache regenerated successfully
 

 
         
diff --git a/ricerlay.txt b/ricerlay.txt
index 2afb59620372..396a8e335ead 100644
--- a/ricerlay.txt
+++ b/ricerlay.txt
@@ -9,19 +9,12 @@
              'uri': 'git+ssh://git@github.com/azahi/ricerlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync ricerlay
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/rich0.html b/rich0.html
index ad21dca79bdd..20d91cc5ea0b 100644
--- a/rich0.html
+++ b/rich0.html
@@ -32,73 +32,59 @@
 

             11
$ pmaint sync rich0
 

-            12
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
warning: Pulling without specifying how to reconcile divergent branches is
 

-            19
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
discouraged. You can squelch this message by running one of the following
 

-            20
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
commands sometime before your next pull:
 

-            21
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
 

-            22
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase false  # merge (the default strategy)
 

-            23
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase true   # rebase
 

-            24
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.ff only       # fast-forward only
 

-            25
warning: Pulling without specifying how to reconcile divergent branches is
+            25
 

-            26
discouraged. You can squelch this message by running one of the following
+            26
You can replace "git config" with "git config --global" to set a default
 

-            27
commands sometime before your next pull:
+            27
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            28
+            28
or --ff-only on the command line to override the configured default per
 

-            29
  git config pull.rebase false  # merge (the default strategy)
+            29
invocation.
 

-            30
  git config pull.rebase true   # rebase
+            30
 

-            31
  git config pull.ff only       # fast-forward only
+            31
Already up to date.
 

-            32
+            32
*** syncing rich0
 

-            33
You can replace "git config" with "git config --global" to set a default
+            33
*** synced rich0
 

-            34
preference for all repositories. You can also pass --rebase, --no-rebase,
+            34
 * Sync succeeded
 

-            35
or --ff-only on the command line to override the configured default per
+            35
$ git log --format=%ci -1
 

-            36
invocation.
+            36
$ git show -q --pretty=format:%G? HEAD
 

-            37
+            37
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 rich0
 

-            38
Already up to date.
-

-            39
*** syncing rich0
-

-            40
*** synced rich0
-

-            41
 * Sync succeeded
-

-            42
$ git log --format=%ci -1
-

-            43
$ git show -q --pretty=format:%G? HEAD
-

-            44
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 rich0
-

-            45
 * Cache regenerated successfully
+            38
 * Cache regenerated successfully
 

 
         
diff --git a/rich0.txt b/rich0.txt
index ee9fec4853a2..dd1bc3e6246b 100644
--- a/rich0.txt
+++ b/rich0.txt
@@ -9,19 +9,12 @@
  'source': [{'type': 'git', 'uri': 'git://github.com/rich0/rich0-overlay.git'}],
  'status': 'official'}
 $ pmaint sync rich0
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/ring-overlay.html b/ring-overlay.html
index 16896f935448..fe857ece472c 100644
--- a/ring-overlay.html
+++ b/ring-overlay.html
@@ -44,73 +44,59 @@
 

             17
$ pmaint sync ring-overlay
 

-            18
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            23
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            24
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
warning: Pulling without specifying how to reconcile divergent branches is
 

-            25
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
discouraged. You can squelch this message by running one of the following
 

-            26
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
commands sometime before your next pull:
 

-            27
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
 

-            28
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
  git config pull.rebase false  # merge (the default strategy)
 

-            29
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
  git config pull.rebase true   # rebase
 

-            30
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
  git config pull.ff only       # fast-forward only
 

-            31
warning: Pulling without specifying how to reconcile divergent branches is
+            31
 

-            32
discouraged. You can squelch this message by running one of the following
+            32
You can replace "git config" with "git config --global" to set a default
 

-            33
commands sometime before your next pull:
+            33
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            34
+            34
or --ff-only on the command line to override the configured default per
 

-            35
  git config pull.rebase false  # merge (the default strategy)
+            35
invocation.
 

-            36
  git config pull.rebase true   # rebase
+            36
 

-            37
  git config pull.ff only       # fast-forward only
+            37
Already up to date.
 

-            38
+            38
*** syncing ring-overlay
 

-            39
You can replace "git config" with "git config --global" to set a default
+            39
*** synced ring-overlay
 

-            40
preference for all repositories. You can also pass --rebase, --no-rebase,
+            40
 * Sync succeeded
 

-            41
or --ff-only on the command line to override the configured default per
+            41
$ git log --format=%ci -1
 

-            42
invocation.
+            42
$ git show -q --pretty=format:%G? HEAD
 

-            43
+            43
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 ring-overlay
 

-            44
Already up to date.
-

-            45
*** syncing ring-overlay
-

-            46
*** synced ring-overlay
-

-            47
 * Sync succeeded
-

-            48
$ git log --format=%ci -1
-

-            49
$ git show -q --pretty=format:%G? HEAD
-

-            50
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 ring-overlay
-

-            51
 * Cache regenerated successfully
+            44
 * Cache regenerated successfully
 

 
         
diff --git a/ring-overlay.txt b/ring-overlay.txt
index c0434117efb2..1d26cfe32cc0 100644
--- a/ring-overlay.txt
+++ b/ring-overlay.txt
@@ -15,19 +15,12 @@
              'uri': 'git@github.com:stefan-langenmaier/ring-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync ring-overlay
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/rion.html b/rion.html
index d42334b83b1a..26f469b26db3 100644
--- a/rion.html
+++ b/rion.html
@@ -40,73 +40,59 @@
 

             15
$ pmaint sync rion
 

-            16
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
warning: Pulling without specifying how to reconcile divergent branches is
 

-            23
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
discouraged. You can squelch this message by running one of the following
 

-            24
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
commands sometime before your next pull:
 

-            25
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 

-            26
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.rebase false  # merge (the default strategy)
 

-            27
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.rebase true   # rebase
 

-            28
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
  git config pull.ff only       # fast-forward only
 

-            29
warning: Pulling without specifying how to reconcile divergent branches is
+            29
 

-            30
discouraged. You can squelch this message by running one of the following
+            30
You can replace "git config" with "git config --global" to set a default
 

-            31
commands sometime before your next pull:
+            31
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            32
+            32
or --ff-only on the command line to override the configured default per
 

-            33
  git config pull.rebase false  # merge (the default strategy)
+            33
invocation.
 

-            34
  git config pull.rebase true   # rebase
+            34
 

-            35
  git config pull.ff only       # fast-forward only
+            35
Already up to date.
 

-            36
+            36
*** syncing rion
 

-            37
You can replace "git config" with "git config --global" to set a default
+            37
*** synced rion
 

-            38
preference for all repositories. You can also pass --rebase, --no-rebase,
+            38
 * Sync succeeded
 

-            39
or --ff-only on the command line to override the configured default per
+            39
$ git log --format=%ci -1
 

-            40
invocation.
+            40
$ git show -q --pretty=format:%G? HEAD
 

-            41
+            41
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 rion
 

-            42
Already up to date.
-

-            43
*** syncing rion
-

-            44
*** synced rion
-

-            45
 * Sync succeeded
-

-            46
$ git log --format=%ci -1
-

-            47
$ git show -q --pretty=format:%G? HEAD
-

-            48
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 rion
-

-            49
 * Cache regenerated successfully
+            42
 * Cache regenerated successfully
 

 
         
diff --git a/rion.txt b/rion.txt
index 1baf4b5e2559..fd6aaa7b72cb 100644
--- a/rion.txt
+++ b/rion.txt
@@ -13,19 +13,12 @@
              'uri': 'git+ssh://git@github.com/rion-overlay/rion-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync rion
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/riru.html b/riru.html
index 818505b5209b..e483dcb8f45f 100644
--- a/riru.html
+++ b/riru.html
@@ -40,75 +40,59 @@
 

             15
$ pmaint sync riru
 

-            16
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
warning: Pulling without specifying how to reconcile divergent branches is
 

-            23
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
discouraged. You can squelch this message by running one of the following
 

-            24
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
commands sometime before your next pull:
 

-            25
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 

-            26
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.rebase false  # merge (the default strategy)
 

-            27
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.rebase true   # rebase
 

-            28
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
  git config pull.ff only       # fast-forward only
 

-            29
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
 

-            30
warning: Pulling without specifying how to reconcile divergent branches is
+            30
You can replace "git config" with "git config --global" to set a default
 

-            31
discouraged. You can squelch this message by running one of the following
+            31
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            32
commands sometime before your next pull:
+            32
or --ff-only on the command line to override the configured default per
 

-            33
+            33
invocation.
 

-            34
  git config pull.rebase false  # merge (the default strategy)
+            34
 

-            35
  git config pull.rebase true   # rebase
+            35
Already up to date.
 

-            36
  git config pull.ff only       # fast-forward only
+            36
*** syncing riru
 

-            37
+            37
*** synced riru
 

-            38
You can replace "git config" with "git config --global" to set a default
+            38
 * Sync succeeded
 

-            39
preference for all repositories. You can also pass --rebase, --no-rebase,
+            39
$ git log --format=%ci -1
 

-            40
or --ff-only on the command line to override the configured default per
+            40
$ git show -q --pretty=format:%G? HEAD
 

-            41
invocation.
+            41
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 riru
 

-            42
-

-            43
Already up to date.
-

-            44
*** syncing riru
-

-            45
*** synced riru
-

-            46
 * Sync succeeded
-

-            47
$ git log --format=%ci -1
-

-            48
$ git show -q --pretty=format:%G? HEAD
-

-            49
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 riru
-

-            50
 * Cache regenerated successfully
+            42
 * Cache regenerated successfully
 

 
         
diff --git a/riru.txt b/riru.txt
index 621f271ba302..782c3976a1db 100644
--- a/riru.txt
+++ b/riru.txt
@@ -13,20 +13,12 @@
             {'type': 'git', 'uri': 'git@github.com:pkulev/riru.git'}],
  'status': 'unofficial'}
 $ pmaint sync riru
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/robert7k.html b/robert7k.html
index a23a43df8d0a..28336f25e9d6 100644
--- a/robert7k.html
+++ b/robert7k.html
@@ -30,75 +30,57 @@
 

             10
$ pmaint sync robert7k
 

-            11
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            11
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            12
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
warning: Pulling without specifying how to reconcile divergent branches is
 

-            17
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
discouraged. You can squelch this message by running one of the following
 

-            18
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
commands sometime before your next pull:
 

-            19
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
 

-            20
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
  git config pull.rebase false  # merge (the default strategy)
 

-            21
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
  git config pull.rebase true   # rebase
 

-            22
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.ff only       # fast-forward only
 

-            23
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
 

-            24
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
You can replace "git config" with "git config --global" to set a default
 

-            25
warning: Pulling without specifying how to reconcile divergent branches is
+            25
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            26
discouraged. You can squelch this message by running one of the following
+            26
or --ff-only on the command line to override the configured default per
 

-            27
commands sometime before your next pull:
+            27
invocation.
 

             28
 

-            29
  git config pull.rebase false  # merge (the default strategy)
+            29
Already up to date.
 

-            30
  git config pull.rebase true   # rebase
+            30
*** syncing robert7k
 

-            31
  git config pull.ff only       # fast-forward only
+            31
*** synced robert7k
 

-            32
+            32
 * Sync succeeded
 

-            33
You can replace "git config" with "git config --global" to set a default
+            33
$ git log --format=%ci -1
 

-            34
preference for all repositories. You can also pass --rebase, --no-rebase,
+            34
$ git show -q --pretty=format:%G? HEAD
 

-            35
or --ff-only on the command line to override the configured default per
+            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 robert7k
 

-            36
invocation.
-

-            37
-

-            38
Already up to date.
-

-            39
*** syncing robert7k
-

-            40
*** synced robert7k
-

-            41
 * Sync succeeded
-

-            42
$ git log --format=%ci -1
-

-            43
$ git show -q --pretty=format:%G? HEAD
-

-            44
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 robert7k
-

-            45
 * Cache regenerated successfully
+            36
 * Cache regenerated successfully
 

 
         
diff --git a/robert7k.txt b/robert7k.txt
index 02fabdefdd4b..6c7c017d9084 100644
--- a/robert7k.txt
+++ b/robert7k.txt
@@ -8,20 +8,11 @@
              'uri': 'https://github.com/robert7k/gentoo-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync robert7k
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/ros-overlay.html b/ros-overlay.html
index c8272452c99a..f34b1fe2db55 100644
--- a/ros-overlay.html
+++ b/ros-overlay.html
@@ -28,75 +28,57 @@
 

             9
$ pmaint sync ros-overlay
 

-            10
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            10
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            11
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            11
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            12
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
warning: Pulling without specifying how to reconcile divergent branches is
 

-            16
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
discouraged. You can squelch this message by running one of the following
 

-            17
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
commands sometime before your next pull:
 

-            18
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
 

-            19
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
  git config pull.rebase false  # merge (the default strategy)
 

-            20
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
  git config pull.rebase true   # rebase
 

-            21
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
  git config pull.ff only       # fast-forward only
 

-            22
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
 

-            23
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
You can replace "git config" with "git config --global" to set a default
 

-            24
warning: Pulling without specifying how to reconcile divergent branches is
+            24
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            25
discouraged. You can squelch this message by running one of the following
+            25
or --ff-only on the command line to override the configured default per
 

-            26
commands sometime before your next pull:
+            26
invocation.
 

             27
 

-            28
  git config pull.rebase false  # merge (the default strategy)
+            28
Already up to date.
 

-            29
  git config pull.rebase true   # rebase
+            29
*** syncing ros-overlay
 

-            30
  git config pull.ff only       # fast-forward only
+            30
*** synced ros-overlay
 

-            31
+            31
 * Sync succeeded
 

-            32
You can replace "git config" with "git config --global" to set a default
+            32
$ git log --format=%ci -1
 

-            33
preference for all repositories. You can also pass --rebase, --no-rebase,
+            33
$ git show -q --pretty=format:%G? HEAD
 

-            34
or --ff-only on the command line to override the configured default per
+            34
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 ros-overlay
 

-            35
invocation.
-

-            36
-

-            37
Already up to date.
-

-            38
*** syncing ros-overlay
-

-            39
*** synced ros-overlay
-

-            40
 * Sync succeeded
-

-            41
$ git log --format=%ci -1
-

-            42
$ git show -q --pretty=format:%G? HEAD
-

-            43
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 ros-overlay
-

-            44
 * Cache regenerated successfully
+            35
 * Cache regenerated successfully
 

 
         
diff --git a/ros-overlay.txt b/ros-overlay.txt
index 49bb3da32a58..7de2adf7db6a 100644
--- a/ros-overlay.txt
+++ b/ros-overlay.txt
@@ -7,20 +7,11 @@
  'source': [{'type': 'git', 'uri': 'git://github.com/ros/ros-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync ros-overlay
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/roslin.html b/roslin.html
index 93892effa1c8..7775af003c5d 100644
--- a/roslin.html
+++ b/roslin.html
@@ -38,75 +38,55 @@
 

             14
$ pmaint sync roslin
 

-            15
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
warning: Pulling without specifying how to reconcile divergent branches is
 

-            20
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
discouraged. You can squelch this message by running one of the following
 

-            21
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
commands sometime before your next pull:
 

-            22
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
 

-            23
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase false  # merge (the default strategy)
 

-            24
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.rebase true   # rebase
 

-            25
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.ff only       # fast-forward only
 

-            26
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
 

-            27
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
You can replace "git config" with "git config --global" to set a default
 

-            28
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            29
warning: Pulling without specifying how to reconcile divergent branches is
+            29
or --ff-only on the command line to override the configured default per
 

-            30
discouraged. You can squelch this message by running one of the following
+            30
invocation.
 

-            31
commands sometime before your next pull:
+            31
 

-            32
+            32
Already up to date.
 

-            33
  git config pull.rebase false  # merge (the default strategy)
+            33
*** syncing roslin
 

-            34
  git config pull.rebase true   # rebase
+            34
*** synced roslin
 

-            35
  git config pull.ff only       # fast-forward only
+            35
 * Sync succeeded
 

-            36
+            36
$ git log --format=%ci -1
 

-            37
You can replace "git config" with "git config --global" to set a default
+            37
$ git show -q --pretty=format:%G? HEAD
 

-            38
preference for all repositories. You can also pass --rebase, --no-rebase,
+            38
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 roslin
 

-            39
or --ff-only on the command line to override the configured default per
-

-            40
invocation.
-

-            41
-

-            42
Already up to date.
-

-            43
*** syncing roslin
-

-            44
*** synced roslin
-

-            45
 * Sync succeeded
-

-            46
$ git log --format=%ci -1
-

-            47
$ git show -q --pretty=format:%G? HEAD
-

-            48
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 roslin
-

-            49
 * Cache regenerated successfully
+            39
 * Cache regenerated successfully
 

 
         
diff --git a/roslin.txt b/roslin.txt
index d3e8eeeb52be..c67838f4fcc8 100644
--- a/roslin.txt
+++ b/roslin.txt
@@ -12,20 +12,10 @@
              'uri': 'https://gitlab.com/roslin-uberlay/roslin.git'}],
  'status': 'unofficial'}
 $ pmaint sync roslin
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/rpm.html b/rpm.html
index fb6a46a0c871..5eeef06762ac 100644
--- a/rpm.html
+++ b/rpm.html
@@ -32,75 +32,57 @@
 

             11
$ pmaint sync rpm
 

-            12
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
warning: Pulling without specifying how to reconcile divergent branches is
 

-            18
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
discouraged. You can squelch this message by running one of the following
 

-            19
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
commands sometime before your next pull:
 

-            20
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
 

-            21
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
  git config pull.rebase false  # merge (the default strategy)
 

-            22
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase true   # rebase
 

-            23
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.ff only       # fast-forward only
 

-            24
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 

-            25
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
You can replace "git config" with "git config --global" to set a default
 

-            26
warning: Pulling without specifying how to reconcile divergent branches is
+            26
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            27
discouraged. You can squelch this message by running one of the following
+            27
or --ff-only on the command line to override the configured default per
 

-            28
commands sometime before your next pull:
+            28
invocation.
 

             29
 

-            30
  git config pull.rebase false  # merge (the default strategy)
+            30
Already up to date.
 

-            31
  git config pull.rebase true   # rebase
+            31
*** syncing rpm
 

-            32
  git config pull.ff only       # fast-forward only
+            32
*** synced rpm
 

-            33
+            33
 * Sync succeeded
 

-            34
You can replace "git config" with "git config --global" to set a default
+            34
$ git log --format=%ci -1
 

-            35
preference for all repositories. You can also pass --rebase, --no-rebase,
+            35
$ git show -q --pretty=format:%G? HEAD
 

-            36
or --ff-only on the command line to override the configured default per
+            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 rpm
 

-            37
invocation.
-

-            38
-

-            39
Already up to date.
-

-            40
*** syncing rpm
-

-            41
*** synced rpm
-

-            42
 * Sync succeeded
-

-            43
$ git log --format=%ci -1
-

-            44
$ git show -q --pretty=format:%G? HEAD
-

-            45
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 rpm
-

-            46
 * Cache regenerated successfully
+            37
 * Cache regenerated successfully
 

 
         
diff --git a/rpm.txt b/rpm.txt
index 5d8e0597b2b3..ac9211c16cdc 100644
--- a/rpm.txt
+++ b/rpm.txt
@@ -9,20 +9,11 @@
  'source': [{'type': 'git', 'uri': 'https://github.com/pavlix/gentoo-rpm.git'}],
  'status': 'unofficial'}
 $ pmaint sync rpm
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/ruby.html b/ruby.html
index ae8a6d7600c4..e2bfa983c864 100644
--- a/ruby.html
+++ b/ruby.html
@@ -40,79 +40,59 @@
 

             15
 'status': 'official'}
 

-            16
 * Adding new repository
+            16
$ pmaint sync ruby
 

-            17
$ pmaint sync ruby
+            17
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
warning: Pulling without specifying how to reconcile divergent branches is
 

-            23
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
discouraged. You can squelch this message by running one of the following
 

-            24
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
commands sometime before your next pull:
 

-            25
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 

-            26
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.rebase false  # merge (the default strategy)
 

-            27
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.rebase true   # rebase
 

-            28
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
  git config pull.ff only       # fast-forward only
 

-            29
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
 

-            30
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
You can replace "git config" with "git config --global" to set a default
 

-            31
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            32
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
or --ff-only on the command line to override the configured default per
 

-            33
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
invocation.
 

-            34
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
 

-            35
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
Already up to date.
 

-            36
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
*** syncing ruby
 

-            37
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            37
*** synced ruby
 

-            38
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            38
 * Sync succeeded
 

-            39
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            39
$ git log --format=%ci -1
 

-            40
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            40
$ git show -q --pretty=format:%G? HEAD
 

-            41
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            41
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 ruby
 

-            42
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            43
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            44
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            45
Cloning into '/var/lib/repo-mirror-ci/sync/ruby'...
-

-            46
*** syncing ruby
-

-            47
*** synced ruby
-

-            48
 * Sync succeeded
-

-            49
$ git log --format=%ci -1
-

-            50
$ git show -q --pretty=format:%G? HEAD
-

-            51
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 ruby
-

-            52
 * Cache regenerated successfully
+            42
 * Cache regenerated successfully
 

 
         
diff --git a/ruby.txt b/ruby.txt
index 24722eea3c63..eea4b6354ffa 100644
--- a/ruby.txt
+++ b/ruby.txt
@@ -13,36 +13,26 @@
             {'type': 'git',
              'uri': 'git+ssh://git@git.gentoo.org/proj/ruby-overlay.git'}],
  'status': 'official'}
- * Adding new repository
 $ pmaint sync ruby
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-Cloning into '/var/lib/repo-mirror-ci/sync/ruby'...
+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.
+
+Already up to date.
 *** syncing ruby
 *** synced ruby
  * Sync succeeded
diff --git a/rukruk.html b/rukruk.html
index cb4c269c3d5a..7d4937b8ebf9 100644
--- a/rukruk.html
+++ b/rukruk.html
@@ -38,75 +38,57 @@
 

             14
$ pmaint sync rukruk
 

-            15
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
warning: Pulling without specifying how to reconcile divergent branches is
 

-            21
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
discouraged. You can squelch this message by running one of the following
 

-            22
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
commands sometime before your next pull:
 

-            23
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
 

-            24
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.rebase false  # merge (the default strategy)
 

-            25
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase true   # rebase
 

-            26
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.ff only       # fast-forward only
 

-            27
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
 

-            28
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
You can replace "git config" with "git config --global" to set a default
 

-            29
warning: Pulling without specifying how to reconcile divergent branches is
+            29
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            30
discouraged. You can squelch this message by running one of the following
+            30
or --ff-only on the command line to override the configured default per
 

-            31
commands sometime before your next pull:
+            31
invocation.
 

             32
 

-            33
  git config pull.rebase false  # merge (the default strategy)
+            33
Already up to date.
 

-            34
  git config pull.rebase true   # rebase
+            34
*** syncing rukruk
 

-            35
  git config pull.ff only       # fast-forward only
+            35
*** synced rukruk
 

-            36
+            36
 * Sync succeeded
 

-            37
You can replace "git config" with "git config --global" to set a default
+            37
$ git log --format=%ci -1
 

-            38
preference for all repositories. You can also pass --rebase, --no-rebase,
+            38
$ git show -q --pretty=format:%G? HEAD
 

-            39
or --ff-only on the command line to override the configured default per
+            39
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 rukruk
 

-            40
invocation.
-

-            41
-

-            42
Already up to date.
-

-            43
*** syncing rukruk
-

-            44
*** synced rukruk
-

-            45
 * Sync succeeded
-

-            46
$ git log --format=%ci -1
-

-            47
$ git show -q --pretty=format:%G? HEAD
-

-            48
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 rukruk
-

-            49
 * Cache regenerated successfully
+            40
 * Cache regenerated successfully
 

 
         
diff --git a/rukruk.txt b/rukruk.txt
index f5a638ea0b8e..c6dbbb1541b1 100644
--- a/rukruk.txt
+++ b/rukruk.txt
@@ -12,20 +12,11 @@
             {'type': 'git', 'uri': 'git@github.com:Atoms/rukruk.git'}],
  'status': 'unofficial'}
 $ pmaint sync rukruk
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/rust.html b/rust.html
index 3fb197e59c3b..69823f30373e 100644
--- a/rust.html
+++ b/rust.html
@@ -36,75 +36,57 @@
 

             13
$ pmaint sync rust
 

-            14
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
warning: Pulling without specifying how to reconcile divergent branches is
 

-            20
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
discouraged. You can squelch this message by running one of the following
 

-            21
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
commands sometime before your next pull:
 

-            22
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
 

-            23
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase false  # merge (the default strategy)
 

-            24
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.rebase true   # rebase
 

-            25
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.ff only       # fast-forward only
 

-            26
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
 

-            27
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
You can replace "git config" with "git config --global" to set a default
 

-            28
warning: Pulling without specifying how to reconcile divergent branches is
+            28
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            29
discouraged. You can squelch this message by running one of the following
+            29
or --ff-only on the command line to override the configured default per
 

-            30
commands sometime before your next pull:
+            30
invocation.
 

             31
 

-            32
  git config pull.rebase false  # merge (the default strategy)
+            32
Already up to date.
 

-            33
  git config pull.rebase true   # rebase
+            33
*** syncing rust
 

-            34
  git config pull.ff only       # fast-forward only
+            34
*** synced rust
 

-            35
+            35
 * Sync succeeded
 

-            36
You can replace "git config" with "git config --global" to set a default
+            36
$ git log --format=%ci -1
 

-            37
preference for all repositories. You can also pass --rebase, --no-rebase,
+            37
$ git show -q --pretty=format:%G? HEAD
 

-            38
or --ff-only on the command line to override the configured default per
+            38
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 rust
 

-            39
invocation.
-

-            40
-

-            41
Already up to date.
-

-            42
*** syncing rust
-

-            43
*** synced rust
-

-            44
 * Sync succeeded
-

-            45
$ git log --format=%ci -1
-

-            46
$ git show -q --pretty=format:%G? HEAD
-

-            47
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 rust
-

-            48
 * Cache regenerated successfully
+            39
 * Cache regenerated successfully
 

 
         
diff --git a/rust.txt b/rust.txt
index 2b1956fc63ce..c9b9dfdb5839 100644
--- a/rust.txt
+++ b/rust.txt
@@ -11,20 +11,11 @@
             {'type': 'git', 'uri': 'git@github.com:gentoo/gentoo-rust.git'}],
  'status': 'unofficial'}
 $ pmaint sync rust
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/sabayon-distro.html b/sabayon-distro.html
index 6d1c567976d2..d928883700ca 100644
--- a/sabayon-distro.html
+++ b/sabayon-distro.html
@@ -36,75 +36,57 @@
 

             13
$ pmaint sync sabayon-distro
 

-            14
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
warning: Pulling without specifying how to reconcile divergent branches is
 

-            20
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
discouraged. You can squelch this message by running one of the following
 

-            21
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
commands sometime before your next pull:
 

-            22
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
 

-            23
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase false  # merge (the default strategy)
 

-            24
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.rebase true   # rebase
 

-            25
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.ff only       # fast-forward only
 

-            26
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
 

-            27
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
You can replace "git config" with "git config --global" to set a default
 

-            28
warning: Pulling without specifying how to reconcile divergent branches is
+            28
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            29
discouraged. You can squelch this message by running one of the following
+            29
or --ff-only on the command line to override the configured default per
 

-            30
commands sometime before your next pull:
+            30
invocation.
 

             31
 

-            32
  git config pull.rebase false  # merge (the default strategy)
+            32
Already up to date.
 

-            33
  git config pull.rebase true   # rebase
+            33
*** syncing sabayon-distro
 

-            34
  git config pull.ff only       # fast-forward only
+            34
*** synced sabayon-distro
 

-            35
+            35
 * Sync succeeded
 

-            36
You can replace "git config" with "git config --global" to set a default
+            36
$ git log --format=%ci -1
 

-            37
preference for all repositories. You can also pass --rebase, --no-rebase,
+            37
$ git show -q --pretty=format:%G? HEAD
 

-            38
or --ff-only on the command line to override the configured default per
+            38
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 sabayon-distro
 

-            39
invocation.
-

-            40
-

-            41
Already up to date.
-

-            42
*** syncing sabayon-distro
-

-            43
*** synced sabayon-distro
-

-            44
 * Sync succeeded
-

-            45
$ git log --format=%ci -1
-

-            46
$ git show -q --pretty=format:%G? HEAD
-

-            47
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 sabayon-distro
-

-            48
 * Cache regenerated successfully
+            39
 * Cache regenerated successfully
 

 
         
diff --git a/sabayon-distro.txt b/sabayon-distro.txt
index edfed48c9aa4..f00063f3e4c6 100644
--- a/sabayon-distro.txt
+++ b/sabayon-distro.txt
@@ -11,20 +11,11 @@
              'uri': 'git://github.com/Sabayon/sabayon-distro.git'}],
  'status': 'unofficial'}
 $ pmaint sync sabayon-distro
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/sabayon.html b/sabayon.html
index b404019a5034..6c11782e6c0b 100644
--- a/sabayon.html
+++ b/sabayon.html
@@ -40,75 +40,57 @@
 

             15
$ pmaint sync sabayon
 

-            16
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
warning: Pulling without specifying how to reconcile divergent branches is
 

-            22
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
discouraged. You can squelch this message by running one of the following
 

-            23
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
commands sometime before your next pull:
 

-            24
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 

-            25
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase false  # merge (the default strategy)
 

-            26
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.rebase true   # rebase
 

-            27
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.ff only       # fast-forward only
 

-            28
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
 

-            29
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
You can replace "git config" with "git config --global" to set a default
 

-            30
warning: Pulling without specifying how to reconcile divergent branches is
+            30
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            31
discouraged. You can squelch this message by running one of the following
+            31
or --ff-only on the command line to override the configured default per
 

-            32
commands sometime before your next pull:
+            32
invocation.
 

             33
 

-            34
  git config pull.rebase false  # merge (the default strategy)
+            34
Already up to date.
 

-            35
  git config pull.rebase true   # rebase
+            35
*** syncing sabayon
 

-            36
  git config pull.ff only       # fast-forward only
+            36
*** synced sabayon
 

-            37
+            37
 * Sync succeeded
 

-            38
You can replace "git config" with "git config --global" to set a default
+            38
$ git log --format=%ci -1
 

-            39
preference for all repositories. You can also pass --rebase, --no-rebase,
+            39
$ git show -q --pretty=format:%G? HEAD
 

-            40
or --ff-only on the command line to override the configured default per
+            40
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 sabayon
 

-            41
invocation.
-

-            42
-

-            43
Already up to date.
-

-            44
*** syncing sabayon
-

-            45
*** synced sabayon
-

-            46
 * Sync succeeded
-

-            47
$ git log --format=%ci -1
-

-            48
$ git show -q --pretty=format:%G? HEAD
-

-            49
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 sabayon
-

-            50
 * Cache regenerated successfully
+            41
 * Cache regenerated successfully
 

 
         
diff --git a/sabayon.txt b/sabayon.txt
index d3d98104b6d1..94acc73b1a9b 100644
--- a/sabayon.txt
+++ b/sabayon.txt
@@ -13,20 +13,11 @@
  'source': [{'type': 'git', 'uri': 'git://github.com/Sabayon/for-gentoo.git'}],
  'status': 'unofficial'}
 $ pmaint sync sabayon
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/sage-on-gentoo.html b/sage-on-gentoo.html
index e98940540d49..f0bb4d37855b 100644
--- a/sage-on-gentoo.html
+++ b/sage-on-gentoo.html
@@ -38,75 +38,55 @@
 

             14
$ pmaint sync sage-on-gentoo
 

-            15
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
warning: Pulling without specifying how to reconcile divergent branches is
 

-            20
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
discouraged. You can squelch this message by running one of the following
 

-            21
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
commands sometime before your next pull:
 

-            22
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
 

-            23
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase false  # merge (the default strategy)
 

-            24
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.rebase true   # rebase
 

-            25
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.ff only       # fast-forward only
 

-            26
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
 

-            27
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
You can replace "git config" with "git config --global" to set a default
 

-            28
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            29
warning: Pulling without specifying how to reconcile divergent branches is
+            29
or --ff-only on the command line to override the configured default per
 

-            30
discouraged. You can squelch this message by running one of the following
+            30
invocation.
 

-            31
commands sometime before your next pull:
+            31
 

-            32
+            32
Already up to date.
 

-            33
  git config pull.rebase false  # merge (the default strategy)
+            33
*** syncing sage-on-gentoo
 

-            34
  git config pull.rebase true   # rebase
+            34
*** synced sage-on-gentoo
 

-            35
  git config pull.ff only       # fast-forward only
+            35
 * Sync succeeded
 

-            36
+            36
$ git log --format=%ci -1
 

-            37
You can replace "git config" with "git config --global" to set a default
+            37
$ git show -q --pretty=format:%G? HEAD
 

-            38
preference for all repositories. You can also pass --rebase, --no-rebase,
+            38
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 sage-on-gentoo
 

-            39
or --ff-only on the command line to override the configured default per
-

-            40
invocation.
-

-            41
-

-            42
Already up to date.
-

-            43
*** syncing sage-on-gentoo
-

-            44
*** synced sage-on-gentoo
-

-            45
 * Sync succeeded
-

-            46
$ git log --format=%ci -1
-

-            47
$ git show -q --pretty=format:%G? HEAD
-

-            48
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 sage-on-gentoo
-

-            49
 * Cache regenerated successfully
+            39
 * Cache regenerated successfully
 

 
         
diff --git a/sage-on-gentoo.txt b/sage-on-gentoo.txt
index ac020814fd6c..cd9f90cd90ca 100644
--- a/sage-on-gentoo.txt
+++ b/sage-on-gentoo.txt
@@ -12,20 +12,10 @@
              'uri': 'https://github.com/cschwan/sage-on-gentoo.git'}],
  'status': 'unofficial'}
 $ pmaint sync sage-on-gentoo
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/salfter.html b/salfter.html
index 759a42b817a3..201004c651db 100644
--- a/salfter.html
+++ b/salfter.html
@@ -30,79 +30,57 @@
 

             10
$ pmaint sync salfter
 

-            11
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            11
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            12
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
warning: Pulling without specifying how to reconcile divergent branches is
 

-            16
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
discouraged. You can squelch this message by running one of the following
 

-            17
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
commands sometime before your next pull:
 

-            18
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
 

-            19
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
  git config pull.rebase false  # merge (the default strategy)
 

-            20
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
  git config pull.rebase true   # rebase
 

-            21
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
  git config pull.ff only       # fast-forward only
 

-            22
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
 

-            23
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
You can replace "git config" with "git config --global" to set a default
 

-            24
WARNING:pkgcore:ruby repo at '/var/lib/repo-mirror-ci/sync/ruby', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            25
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
or --ff-only on the command line to override the configured default per
 

-            26
warning: Pulling without specifying how to reconcile divergent branches is
+            26
invocation.
 

-            27
discouraged. You can squelch this message by running one of the following
+            27
 

-            28
commands sometime before your next pull:
+            28
Already up to date.
 

-            29
+            29
*** syncing salfter
 

-            30
  git config pull.rebase false  # merge (the default strategy)
+            30
*** synced salfter
 

-            31
  git config pull.rebase true   # rebase
+            31
 * Sync succeeded
 

-            32
  git config pull.ff only       # fast-forward only
+            32
$ git log --format=%ci -1
 

-            33
+            33
$ git show -q --pretty=format:%G? HEAD
 

-            34
You can replace "git config" with "git config --global" to set a default
+            34
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 salfter
 

-            35
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            36
or --ff-only on the command line to override the configured default per
-

-            37
invocation.
-

-            38
-

-            39
Already up to date.
-

-            40
*** syncing salfter
-

-            41
*** synced salfter
-

-            42
 * Sync succeeded
-

-            43
$ git log --format=%ci -1
-

-            44
$ git show -q --pretty=format:%G? HEAD
-

-            45
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 salfter
-

-            46
 * dev-python/jsonrpc-9999: failed sourcing ebuild: inherit requires unknown eclass: bzr.eclass
+            35
 * dev-python/jsonrpc-9999: failed sourcing ebuild: inherit requires unknown eclass: bzr.eclass
 
[FATAL]
-            47
 * Cache regen failed with 1
+            36
 * Cache regen failed with 1
 

 
         
diff --git a/salfter.txt b/salfter.txt
index ef839f473918..b7435da3171a 100644
--- a/salfter.txt
+++ b/salfter.txt
@@ -8,21 +8,10 @@
  'source': [{'type': 'git', 'uri': 'https://gitlab.com/salfter/portage.git'}],
  'status': 'unofficial'}
 $ pmaint sync salfter
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ruby repo at '/var/lib/repo-mirror-ci/sync/ruby', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/sam_c.html b/sam_c.html
index 0ee95bdbd0bf..3845617b981d 100644
--- a/sam_c.html
+++ b/sam_c.html
@@ -32,77 +32,55 @@
 

             11
$ pmaint sync sam_c
 

-            12
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
warning: Pulling without specifying how to reconcile divergent branches is
 

-            17
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
discouraged. You can squelch this message by running one of the following
 

-            18
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
commands sometime before your next pull:
 

-            19
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
 

-            20
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
  git config pull.rebase false  # merge (the default strategy)
 

-            21
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
  git config pull.rebase true   # rebase
 

-            22
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.ff only       # fast-forward only
 

-            23
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
 

-            24
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
You can replace "git config" with "git config --global" to set a default
 

-            25
WARNING:pkgcore:ruby repo at '/var/lib/repo-mirror-ci/sync/ruby', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            26
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
or --ff-only on the command line to override the configured default per
 

-            27
warning: Pulling without specifying how to reconcile divergent branches is
+            27
invocation.
 

-            28
discouraged. You can squelch this message by running one of the following
+            28
 

-            29
commands sometime before your next pull:
+            29
Already up to date.
 

-            30
+            30
*** syncing sam_c
 

-            31
  git config pull.rebase false  # merge (the default strategy)
+            31
*** synced sam_c
 

-            32
  git config pull.rebase true   # rebase
+            32
 * Sync succeeded
 

-            33
  git config pull.ff only       # fast-forward only
+            33
$ git log --format=%ci -1
 

-            34
+            34
$ git show -q --pretty=format:%G? HEAD
 

-            35
You can replace "git config" with "git config --global" to set a default
+            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 sam_c
 

-            36
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            37
or --ff-only on the command line to override the configured default per
-

-            38
invocation.
-

-            39
-

-            40
Already up to date.
-

-            41
*** syncing sam_c
-

-            42
*** synced sam_c
-

-            43
 * Sync succeeded
-

-            44
$ git log --format=%ci -1
-

-            45
$ git show -q --pretty=format:%G? HEAD
-

-            46
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 sam_c
-

-            47
 * Cache regenerated successfully
+            36
 * Cache regenerated successfully
 

 
         
diff --git a/sam_c.txt b/sam_c.txt
index 2accc5973c23..896e345a9647 100644
--- a/sam_c.txt
+++ b/sam_c.txt
@@ -9,21 +9,10 @@
              'uri': 'git+ssh://git@github.com/thesamesam/overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync sam_c
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ruby repo at '/var/lib/repo-mirror-ci/sync/ruby', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/sarnex-overlay.html b/sarnex-overlay.html
index 24d52813da2f..154236286f89 100644
--- a/sarnex-overlay.html
+++ b/sarnex-overlay.html
@@ -38,77 +38,55 @@
 

             14
$ pmaint sync sarnex-overlay
 

-            15
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
warning: Pulling without specifying how to reconcile divergent branches is
 

-            20
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
discouraged. You can squelch this message by running one of the following
 

-            21
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
commands sometime before your next pull:
 

-            22
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
 

-            23
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase false  # merge (the default strategy)
 

-            24
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.rebase true   # rebase
 

-            25
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.ff only       # fast-forward only
 

-            26
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
 

-            27
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
You can replace "git config" with "git config --global" to set a default
 

-            28
WARNING:pkgcore:ruby repo at '/var/lib/repo-mirror-ci/sync/ruby', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            29
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
or --ff-only on the command line to override the configured default per
 

-            30
warning: Pulling without specifying how to reconcile divergent branches is
+            30
invocation.
 

-            31
discouraged. You can squelch this message by running one of the following
+            31
 

-            32
commands sometime before your next pull:
+            32
Already up to date.
 

-            33
+            33
*** syncing sarnex-overlay
 

-            34
  git config pull.rebase false  # merge (the default strategy)
+            34
*** synced sarnex-overlay
 

-            35
  git config pull.rebase true   # rebase
+            35
 * Sync succeeded
 

-            36
  git config pull.ff only       # fast-forward only
+            36
$ git log --format=%ci -1
 

-            37
+            37
$ git show -q --pretty=format:%G? HEAD
 

-            38
You can replace "git config" with "git config --global" to set a default
+            38
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 sarnex-overlay
 

-            39
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            40
or --ff-only on the command line to override the configured default per
-

-            41
invocation.
-

-            42
-

-            43
Already up to date.
-

-            44
*** syncing sarnex-overlay
-

-            45
*** synced sarnex-overlay
-

-            46
 * Sync succeeded
-

-            47
$ git log --format=%ci -1
-

-            48
$ git show -q --pretty=format:%G? HEAD
-

-            49
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 sarnex-overlay
-

-            50
 * Cache regenerated successfully
+            39
 * Cache regenerated successfully
 

 
         
diff --git a/sarnex-overlay.txt b/sarnex-overlay.txt
index 028220eb9ab4..f7291c4b61be 100644
--- a/sarnex-overlay.txt
+++ b/sarnex-overlay.txt
@@ -12,21 +12,10 @@
              'uri': 'git+ssh://git@github.com/sarnex/sarnex-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync sarnex-overlay
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ruby repo at '/var/lib/repo-mirror-ci/sync/ruby', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/sattvik.html b/sattvik.html
index 3ab400f8b163..e605746a2eac 100644
--- a/sattvik.html
+++ b/sattvik.html
@@ -44,74 +44,38 @@
 

             17
$ pmaint sync sattvik
 

-            18
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            23
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            24
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            25
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            26
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
Cloning into '/var/lib/repo-mirror-ci/sync/sattvik'...
 

-            27
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
*** syncing sattvik
 

-            28
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
*** synced sattvik
 

-            29
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
 * Sync succeeded
 

-            30
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
$ git log --format=%ci -1
 

-            31
WARNING:pkgcore:ruby repo at '/var/lib/repo-mirror-ci/sync/ruby', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
$ git show -q --pretty=format:%G? HEAD
 

-            32
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 sattvik
 

-            33
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
 * Cache regenerated successfully
 

-            34
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            35
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            36
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            37
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            38
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            39
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            40
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            41
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            42
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            43
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            44
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            45
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            46
WARNING:pkgcore:ruby repo at '/var/lib/repo-mirror-ci/sync/ruby', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            47
Cloning into '/var/lib/repo-mirror-ci/sync/sattvik'...
-

-            48
fatal: unable to access 'https://anongit.gentoo.org/git/user/sattvik.git/': The requested URL returned error: 504
-

-            49
*** syncing sattvik
-

-            50
!!! failed syncing sattvik
-

-            51
 * Sync failed with 1
-
[FATAL]
 
         
     
diff --git a/sattvik.txt b/sattvik.txt
index ebd890549bd8..a880e1ece3e5 100644
--- a/sattvik.txt
+++ b/sattvik.txt
@@ -15,37 +15,19 @@
  'status': 'unofficial'}
  * Adding new repository
 $ pmaint sync sattvik
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ruby repo at '/var/lib/repo-mirror-ci/sync/ruby', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ruby repo at '/var/lib/repo-mirror-ci/sync/ruby', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 Cloning into '/var/lib/repo-mirror-ci/sync/sattvik'...
-fatal: unable to access 'https://anongit.gentoo.org/git/user/sattvik.git/': The requested URL returned error: 504
 *** syncing sattvik
-!!! failed syncing sattvik
- * Sync failed with 1
+*** synced sattvik
+ * Sync succeeded
+$ git log --format=%ci -1
+$ git show -q --pretty=format:%G? HEAD
+$ pmaint regen --use-local-desc --pkg-desc-index -t 1 sattvik
+ * Cache regenerated successfully
diff --git a/science.html b/science.html
index b847d83b7804..f43b99c044cb 100644
--- a/science.html
+++ b/science.html
@@ -68,74 +68,38 @@
 

             29
$ pmaint sync science
 

-            30
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            31
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            32
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            33
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            34
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            35
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            36
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            37
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            37
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            38
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            38
Cloning into '/var/lib/repo-mirror-ci/sync/science'...
 

-            39
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            39
*** syncing science
 

-            40
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            40
*** synced science
 

-            41
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            41
 * Sync succeeded
 

-            42
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            42
$ git log --format=%ci -1
 

-            43
WARNING:pkgcore:ruby repo at '/var/lib/repo-mirror-ci/sync/ruby', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            43
$ git show -q --pretty=format:%G? HEAD
 

-            44
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            44
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 science
 

-            45
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            45
 * Cache regenerated successfully
 

-            46
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            47
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            48
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            49
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            50
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            51
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            52
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            53
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            54
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            55
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            56
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            57
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            58
WARNING:pkgcore:ruby repo at '/var/lib/repo-mirror-ci/sync/ruby', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            59
Cloning into '/var/lib/repo-mirror-ci/sync/science'...
-

-            60
fatal: unable to access 'https://anongit.gentoo.org/git/proj/sci.git/': The requested URL returned error: 504
-

-            61
*** syncing science
-

-            62
!!! failed syncing science
-

-            63
 * Sync failed with 1
-
[FATAL]
 
         
     
diff --git a/science.txt b/science.txt
index 94b7fa782d94..87757805b7cc 100644
--- a/science.txt
+++ b/science.txt
@@ -27,37 +27,19 @@
  'status': 'official'}
  * Adding new repository
 $ pmaint sync science
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ruby repo at '/var/lib/repo-mirror-ci/sync/ruby', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ruby repo at '/var/lib/repo-mirror-ci/sync/ruby', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 Cloning into '/var/lib/repo-mirror-ci/sync/science'...
-fatal: unable to access 'https://anongit.gentoo.org/git/proj/sci.git/': The requested URL returned error: 504
 *** syncing science
-!!! failed syncing science
- * Sync failed with 1
+*** synced science
+ * Sync succeeded
+$ git log --format=%ci -1
+$ git show -q --pretty=format:%G? HEAD
+$ pmaint regen --use-local-desc --pkg-desc-index -t 1 science
+ * Cache regenerated successfully
diff --git a/scrill.html b/scrill.html
index 034553865c37..c262f1681bc2 100644
--- a/scrill.html
+++ b/scrill.html
@@ -34,77 +34,55 @@
 

             12
$ pmaint sync scrill
 

-            13
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
warning: Pulling without specifying how to reconcile divergent branches is
 

-            18
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
discouraged. You can squelch this message by running one of the following
 

-            19
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
commands sometime before your next pull:
 

-            20
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
 

-            21
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
  git config pull.rebase false  # merge (the default strategy)
 

-            22
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase true   # rebase
 

-            23
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.ff only       # fast-forward only
 

-            24
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 

-            25
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
You can replace "git config" with "git config --global" to set a default
 

-            26
WARNING:pkgcore:ruby repo at '/var/lib/repo-mirror-ci/sync/ruby', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            27
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
or --ff-only on the command line to override the configured default per
 

-            28
warning: Pulling without specifying how to reconcile divergent branches is
+            28
invocation.
 

-            29
discouraged. You can squelch this message by running one of the following
+            29
 

-            30
commands sometime before your next pull:
+            30
Already up to date.
 

-            31
+            31
*** syncing scrill
 

-            32
  git config pull.rebase false  # merge (the default strategy)
+            32
*** synced scrill
 

-            33
  git config pull.rebase true   # rebase
+            33
 * Sync succeeded
 

-            34
  git config pull.ff only       # fast-forward only
+            34
$ git log --format=%ci -1
 

-            35
+            35
$ git show -q --pretty=format:%G? HEAD
 

-            36
You can replace "git config" with "git config --global" to set a default
+            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 scrill
 

-            37
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            38
or --ff-only on the command line to override the configured default per
-

-            39
invocation.
-

-            40
-

-            41
Already up to date.
-

-            42
*** syncing scrill
-

-            43
*** synced scrill
-

-            44
 * Sync succeeded
-

-            45
$ git log --format=%ci -1
-

-            46
$ git show -q --pretty=format:%G? HEAD
-

-            47
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 scrill
-

-            48
 * Cache regenerated successfully
+            37
 * Cache regenerated successfully
 

 
         
diff --git a/scrill.txt b/scrill.txt
index 99ede214d4bd..b44ad613c80d 100644
--- a/scrill.txt
+++ b/scrill.txt
@@ -10,21 +10,10 @@
              'uri': 'git://github.com/scrill/scrill-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync scrill
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ruby repo at '/var/lib/repo-mirror-ci/sync/ruby', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/seadep.html b/seadep.html
index 4a7d7a7b1a25..586e4a18ce4e 100644
--- a/seadep.html
+++ b/seadep.html
@@ -42,77 +42,55 @@
 

             16
$ pmaint sync seadep
 

-            17
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
warning: Pulling without specifying how to reconcile divergent branches is
 

-            22
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
discouraged. You can squelch this message by running one of the following
 

-            23
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
commands sometime before your next pull:
 

-            24
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 

-            25
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase false  # merge (the default strategy)
 

-            26
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.rebase true   # rebase
 

-            27
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.ff only       # fast-forward only
 

-            28
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
 

-            29
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
You can replace "git config" with "git config --global" to set a default
 

-            30
WARNING:pkgcore:ruby repo at '/var/lib/repo-mirror-ci/sync/ruby', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            31
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
or --ff-only on the command line to override the configured default per
 

-            32
warning: Pulling without specifying how to reconcile divergent branches is
+            32
invocation.
 

-            33
discouraged. You can squelch this message by running one of the following
+            33
 

-            34
commands sometime before your next pull:
+            34
Already up to date.
 

-            35
+            35
*** syncing seadep
 

-            36
  git config pull.rebase false  # merge (the default strategy)
+            36
*** synced seadep
 

-            37
  git config pull.rebase true   # rebase
+            37
 * Sync succeeded
 

-            38
  git config pull.ff only       # fast-forward only
+            38
$ git log --format=%ci -1
 

-            39
+            39
$ git show -q --pretty=format:%G? HEAD
 

-            40
You can replace "git config" with "git config --global" to set a default
+            40
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 seadep
 

-            41
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            42
or --ff-only on the command line to override the configured default per
-

-            43
invocation.
-

-            44
-

-            45
Already up to date.
-

-            46
*** syncing seadep
-

-            47
*** synced seadep
-

-            48
 * Sync succeeded
-

-            49
$ git log --format=%ci -1
-

-            50
$ git show -q --pretty=format:%G? HEAD
-

-            51
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 seadep
-

-            52
 * Cache regenerated successfully
+            41
 * Cache regenerated successfully
 

 
         
diff --git a/seadep.txt b/seadep.txt
index 81a1b4eee91e..3a3a393c3742 100644
--- a/seadep.txt
+++ b/seadep.txt
@@ -14,21 +14,10 @@
              'uri': 'git@github.com:Keepco/gentoo-overlay-seadep.git'}],
  'status': 'unofficial'}
 $ pmaint sync seadep
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ruby repo at '/var/lib/repo-mirror-ci/sync/ruby', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/seden.html b/seden.html
index 23abcd88023b..68a59925e14e 100644
--- a/seden.html
+++ b/seden.html
@@ -42,78 +42,38 @@
 

             16
$ pmaint sync seden
 

-            17
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            23
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            24
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            25
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
Cloning into '/var/lib/repo-mirror-ci/sync/seden'...
 

-            26
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
*** syncing seden
 

-            27
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
*** synced seden
 

-            28
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
 * Sync succeeded
 

-            29
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
$ git log --format=%ci -1
 

-            30
WARNING:pkgcore:ruby repo at '/var/lib/repo-mirror-ci/sync/ruby', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
$ git show -q --pretty=format:%G? HEAD
 

-            31
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 seden
 

-            32
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
 * Cache regenerated successfully
 

-            33
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            34
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            35
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            36
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            37
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            38
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            39
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            40
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            41
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            42
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            43
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            44
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            45
WARNING:pkgcore:ruby repo at '/var/lib/repo-mirror-ci/sync/ruby', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            46
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            47
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            48
Cloning into '/var/lib/repo-mirror-ci/sync/seden'...
-

-            49
fatal: unable to access 'https://anongit.gentoo.org/git/user/seden.git/': The requested URL returned error: 504
-

-            50
*** syncing seden
-

-            51
!!! failed syncing seden
-

-            52
 * Sync failed with 1
-
[FATAL]
 
         
     
diff --git a/seden.txt b/seden.txt
index d3b6dffcdcf5..9de4f82761fc 100644
--- a/seden.txt
+++ b/seden.txt
@@ -14,39 +14,19 @@
  'status': 'unofficial'}
  * Adding new repository
 $ pmaint sync seden
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ruby repo at '/var/lib/repo-mirror-ci/sync/ruby', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ruby repo at '/var/lib/repo-mirror-ci/sync/ruby', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 Cloning into '/var/lib/repo-mirror-ci/sync/seden'...
-fatal: unable to access 'https://anongit.gentoo.org/git/user/seden.git/': The requested URL returned error: 504
 *** syncing seden
-!!! failed syncing seden
- * Sync failed with 1
+*** synced seden
+ * Sync succeeded
+$ git log --format=%ci -1
+$ git show -q --pretty=format:%G? HEAD
+$ pmaint regen --use-local-desc --pkg-desc-index -t 1 seden
+ * Cache regenerated successfully
diff --git a/seeds.html b/seeds.html
index 3ea7d1343a28..78c0a0711c14 100644
--- a/seeds.html
+++ b/seeds.html
@@ -32,81 +32,59 @@
 

             11
$ pmaint sync seeds
 

-            12
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
warning: Pulling without specifying how to reconcile divergent branches is
 

-            17
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
discouraged. You can squelch this message by running one of the following
 

-            18
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
commands sometime before your next pull:
 

-            19
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
 

-            20
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
  git config pull.rebase false  # merge (the default strategy)
 

-            21
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
  git config pull.rebase true   # rebase
 

-            22
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.ff only       # fast-forward only
 

-            23
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
 

-            24
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
You can replace "git config" with "git config --global" to set a default
 

-            25
WARNING:pkgcore:ruby repo at '/var/lib/repo-mirror-ci/sync/ruby', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            26
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
or --ff-only on the command line to override the configured default per
 

-            27
warning: Pulling without specifying how to reconcile divergent branches is
+            27
invocation.
 

-            28
discouraged. You can squelch this message by running one of the following
+            28
 

-            29
commands sometime before your next pull:
+            29
Already up to date.
 

-            30
+            30
*** syncing seeds
 

-            31
  git config pull.rebase false  # merge (the default strategy)
+            31
*** synced seeds
 

-            32
  git config pull.rebase true   # rebase
+            32
 * Sync succeeded
 

-            33
  git config pull.ff only       # fast-forward only
+            33
$ git log --format=%ci -1
 

-            34
+            34
$ git show -q --pretty=format:%G? HEAD
 

-            35
You can replace "git config" with "git config --global" to set a default
+            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 seeds
 

-            36
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            37
or --ff-only on the command line to override the configured default per
-

-            38
invocation.
-

-            39
-

-            40
Already up to date.
-

-            41
*** syncing seeds
-

-            42
*** synced seeds
-

-            43
 * Sync succeeded
-

-            44
$ git log --format=%ci -1
-

-            45
$ git show -q --pretty=format:%G? HEAD
-

-            46
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 seeds
-

-            47
 * x11-misc/caffeine-2.9.3-r1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
+            36
 * x11-misc/caffeine-2.9.3-r1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
 
[FATAL]
-            48
 * x11-misc/caffeine-2.9.3-r2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
+            37
 * x11-misc/caffeine-2.9.3-r2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
 
[FATAL]
-            49
 * Cache regen failed with 1
+            38
 * Cache regen failed with 1
 

 
         
diff --git a/seeds.txt b/seeds.txt
index 94e697e07019..534093b25cef 100644
--- a/seeds.txt
+++ b/seeds.txt
@@ -9,21 +9,10 @@
  'source': [{'type': 'git', 'uri': 'git://github.com/vonavi/seeds.git'}],
  'status': 'unofficial'}
 $ pmaint sync seeds
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ruby repo at '/var/lib/repo-mirror-ci/sync/ruby', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/setkeh.html b/setkeh.html
index 43fe4b30edf9..f763d32febce 100644
--- a/setkeh.html
+++ b/setkeh.html
@@ -38,77 +38,55 @@
 

             14
$ pmaint sync setkeh
 

-            15
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
warning: Pulling without specifying how to reconcile divergent branches is
 

-            20
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
discouraged. You can squelch this message by running one of the following
 

-            21
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
commands sometime before your next pull:
 

-            22
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
 

-            23
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase false  # merge (the default strategy)
 

-            24
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.rebase true   # rebase
 

-            25
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.ff only       # fast-forward only
 

-            26
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
 

-            27
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
You can replace "git config" with "git config --global" to set a default
 

-            28
WARNING:pkgcore:ruby repo at '/var/lib/repo-mirror-ci/sync/ruby', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            29
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
or --ff-only on the command line to override the configured default per
 

-            30
warning: Pulling without specifying how to reconcile divergent branches is
+            30
invocation.
 

-            31
discouraged. You can squelch this message by running one of the following
+            31
 

-            32
commands sometime before your next pull:
+            32
Already up to date.
 

-            33
+            33
*** syncing setkeh
 

-            34
  git config pull.rebase false  # merge (the default strategy)
+            34
*** synced setkeh
 

-            35
  git config pull.rebase true   # rebase
+            35
 * Sync succeeded
 

-            36
  git config pull.ff only       # fast-forward only
+            36
$ git log --format=%ci -1
 

-            37
+            37
$ git show -q --pretty=format:%G? HEAD
 

-            38
You can replace "git config" with "git config --global" to set a default
+            38
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 setkeh
 

-            39
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            40
or --ff-only on the command line to override the configured default per
-

-            41
invocation.
-

-            42
-

-            43
Already up to date.
-

-            44
*** syncing setkeh
-

-            45
*** synced setkeh
-

-            46
 * Sync succeeded
-

-            47
$ git log --format=%ci -1
-

-            48
$ git show -q --pretty=format:%G? HEAD
-

-            49
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 setkeh
-

-            50
 * Cache regenerated successfully
+            39
 * Cache regenerated successfully
 

 
         
diff --git a/setkeh.txt b/setkeh.txt
index ebf950216b88..bcc637f57220 100644
--- a/setkeh.txt
+++ b/setkeh.txt
@@ -12,21 +12,10 @@
              'uri': 'git+ssh://git@github.com:setkeh/Portage-Overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync setkeh
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ruby repo at '/var/lib/repo-mirror-ci/sync/ruby', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/sevcsik.html b/sevcsik.html
index 978230cccf1e..a1c79fbc8864 100644
--- a/sevcsik.html
+++ b/sevcsik.html
@@ -36,77 +36,55 @@
 

             13
$ pmaint sync sevcsik
 

-            14
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
warning: Pulling without specifying how to reconcile divergent branches is
 

-            19
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
discouraged. You can squelch this message by running one of the following
 

-            20
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
commands sometime before your next pull:
 

-            21
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
 

-            22
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase false  # merge (the default strategy)
 

-            23
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase true   # rebase
 

-            24
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.ff only       # fast-forward only
 

-            25
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 

-            26
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
You can replace "git config" with "git config --global" to set a default
 

-            27
WARNING:pkgcore:ruby repo at '/var/lib/repo-mirror-ci/sync/ruby', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            28
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
or --ff-only on the command line to override the configured default per
 

-            29
warning: Pulling without specifying how to reconcile divergent branches is
+            29
invocation.
 

-            30
discouraged. You can squelch this message by running one of the following
+            30
 

-            31
commands sometime before your next pull:
+            31
Already up to date.
 

-            32
+            32
*** syncing sevcsik
 

-            33
  git config pull.rebase false  # merge (the default strategy)
+            33
*** synced sevcsik
 

-            34
  git config pull.rebase true   # rebase
+            34
 * Sync succeeded
 

-            35
  git config pull.ff only       # fast-forward only
+            35
$ git log --format=%ci -1
 

-            36
+            36
$ git show -q --pretty=format:%G? HEAD
 

-            37
You can replace "git config" with "git config --global" to set a default
+            37
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 sevcsik
 

-            38
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            39
or --ff-only on the command line to override the configured default per
-

-            40
invocation.
-

-            41
-

-            42
Already up to date.
-

-            43
*** syncing sevcsik
-

-            44
*** synced sevcsik
-

-            45
 * Sync succeeded
-

-            46
$ git log --format=%ci -1
-

-            47
$ git show -q --pretty=format:%G? HEAD
-

-            48
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 sevcsik
-

-            49
 * Cache regenerated successfully
+            38
 * Cache regenerated successfully
 

 
         
diff --git a/sevcsik.txt b/sevcsik.txt
index e800e8032b65..c36f4d307f09 100644
--- a/sevcsik.txt
+++ b/sevcsik.txt
@@ -11,21 +11,10 @@
             {'type': 'git', 'uri': 'git@github.com:sevcsik/overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync sevcsik
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ruby repo at '/var/lib/repo-mirror-ci/sync/ruby', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/sft.html b/sft.html
index 5b5a45b36196..fc06f7332412 100644
--- a/sft.html
+++ b/sft.html
@@ -34,77 +34,55 @@
 

             12
$ pmaint sync sft
 

-            13
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
warning: Pulling without specifying how to reconcile divergent branches is
 

-            18
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
discouraged. You can squelch this message by running one of the following
 

-            19
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
commands sometime before your next pull:
 

-            20
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
 

-            21
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
  git config pull.rebase false  # merge (the default strategy)
 

-            22
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase true   # rebase
 

-            23
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.ff only       # fast-forward only
 

-            24
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 

-            25
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
You can replace "git config" with "git config --global" to set a default
 

-            26
WARNING:pkgcore:ruby repo at '/var/lib/repo-mirror-ci/sync/ruby', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            27
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
or --ff-only on the command line to override the configured default per
 

-            28
warning: Pulling without specifying how to reconcile divergent branches is
+            28
invocation.
 

-            29
discouraged. You can squelch this message by running one of the following
+            29
 

-            30
commands sometime before your next pull:
+            30
Already up to date.
 

-            31
+            31
*** syncing sft
 

-            32
  git config pull.rebase false  # merge (the default strategy)
+            32
*** synced sft
 

-            33
  git config pull.rebase true   # rebase
+            33
 * Sync succeeded
 

-            34
  git config pull.ff only       # fast-forward only
+            34
$ git log --format=%ci -1
 

-            35
+            35
$ git show -q --pretty=format:%G? HEAD
 

-            36
You can replace "git config" with "git config --global" to set a default
+            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 sft
 

-            37
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            38
or --ff-only on the command line to override the configured default per
-

-            39
invocation.
-

-            40
-

-            41
Already up to date.
-

-            42
*** syncing sft
-

-            43
*** synced sft
-

-            44
 * Sync succeeded
-

-            45
$ git log --format=%ci -1
-

-            46
$ git show -q --pretty=format:%G? HEAD
-

-            47
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 sft
-

-            48
 * Cache regenerated successfully
+            37
 * Cache regenerated successfully
 

 
         
diff --git a/sft.txt b/sft.txt
index 57a10d7142f4..752959961f19 100644
--- a/sft.txt
+++ b/sft.txt
@@ -10,21 +10,10 @@
              'uri': 'https://github.com/SFTtech/gentoo-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync sft
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ruby repo at '/var/lib/repo-mirror-ci/sync/ruby', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/sgs.html b/sgs.html
index b19101220811..39f57601989a 100644
--- a/sgs.html
+++ b/sgs.html
@@ -38,83 +38,55 @@
 

             14
$ pmaint sync sgs
 

-            15
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
warning: Pulling without specifying how to reconcile divergent branches is
 

-            20
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
discouraged. You can squelch this message by running one of the following
 

-            21
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
commands sometime before your next pull:
 

-            22
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
 

-            23
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase false  # merge (the default strategy)
 

-            24
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.rebase true   # rebase
 

-            25
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.ff only       # fast-forward only
 

-            26
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
 

-            27
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
You can replace "git config" with "git config --global" to set a default
 

-            28
WARNING:pkgcore:ruby repo at '/var/lib/repo-mirror-ci/sync/ruby', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            29
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
or --ff-only on the command line to override the configured default per
 

-            30
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
invocation.
 

-            31
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
 

-            32
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
Already up to date.
 

-            33
warning: Pulling without specifying how to reconcile divergent branches is
+            33
*** syncing sgs
 

-            34
discouraged. You can squelch this message by running one of the following
+            34
*** synced sgs
 

-            35
commands sometime before your next pull:
+            35
 * Sync succeeded
 

-            36
+            36
$ git log --format=%ci -1
 

-            37
  git config pull.rebase false  # merge (the default strategy)
+            37
$ git show -q --pretty=format:%G? HEAD
 

-            38
  git config pull.rebase true   # rebase
+            38
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 sgs
 

-            39
  git config pull.ff only       # fast-forward only
-

-            40
-

-            41
You can replace "git config" with "git config --global" to set a default
-

-            42
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            43
or --ff-only on the command line to override the configured default per
-

-            44
invocation.
-

-            45
-

-            46
Already up to date.
-

-            47
*** syncing sgs
-

-            48
*** synced sgs
-

-            49
 * Sync succeeded
-

-            50
$ git log --format=%ci -1
-

-            51
$ git show -q --pretty=format:%G? HEAD
-

-            52
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 sgs
-

-            53
 * Cache regenerated successfully
+            39
 * Cache regenerated successfully
 

 
         
diff --git a/sgs.txt b/sgs.txt
index df5987a0b129..ae667ec500c6 100644
--- a/sgs.txt
+++ b/sgs.txt
@@ -12,24 +12,10 @@
              'uri': 'git+ssh://git@github.com:blackm0re/sgs-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync sgs
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ruby repo at '/var/lib/repo-mirror-ci/sync/ruby', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/shnurise.html b/shnurise.html
index 97c9c3e8d158..a39236d47c00 100644
--- a/shnurise.html
+++ b/shnurise.html
@@ -44,173 +44,165 @@
 

             17
$ pmaint sync shnurise
 

-            18
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
warning: Pulling without specifying how to reconcile divergent branches is
 

-            23
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
discouraged. You can squelch this message by running one of the following
 

-            24
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
commands sometime before your next pull:
 

-            25
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 

-            26
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.rebase false  # merge (the default strategy)
 

-            27
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.rebase true   # rebase
 

-            28
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
  git config pull.ff only       # fast-forward only
 

-            29
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
 

-            30
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
You can replace "git config" with "git config --global" to set a default
 

-            31
WARNING:pkgcore:ruby repo at '/var/lib/repo-mirror-ci/sync/ruby', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            32
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
or --ff-only on the command line to override the configured default per
 

-            33
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
invocation.
 

-            34
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
 

-            35
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
From https://github.com/ArsenShnurkov/shnurise
 

-            36
warning: Pulling without specifying how to reconcile divergent branches is
+            36
   2faee5d..61d13af  master     -> origin/master
 

-            37
discouraged. You can squelch this message by running one of the following
+            37
Updating 2faee5d..61d13af
 

-            38
commands sometime before your next pull:
+            38
Fast-forward
 

-            39
+            39
 .../msbuild/files/15.9.20.62856/MSBuild.exe.config |  3 ++
 

-            40
  git config pull.rebase false  # merge (the default strategy)
+            40
 dev-util/msbuild/msbuild-15.9.20.62856-r5.ebuild   |  8 ++++
 

-            41
  git config pull.rebase true   # rebase
+            41
 www-servers/xsp/files/props.patch                  | 45 ++++++++++++++++++++++
 

-            42
  git config pull.ff only       # fast-forward only
+            42
 .../xsp/{xsp-4.7.1.ebuild => xsp-4.7.1-r1.ebuild}  |  1 +
 

-            43
+            43
 4 files changed, 57 insertions(+)
 

-            44
You can replace "git config" with "git config --global" to set a default
+            44
 create mode 100644 www-servers/xsp/files/props.patch
 

-            45
preference for all repositories. You can also pass --rebase, --no-rebase,
+            45
 rename www-servers/xsp/{xsp-4.7.1.ebuild => xsp-4.7.1-r1.ebuild} (99%)
 

-            46
or --ff-only on the command line to override the configured default per
+            46
*** syncing shnurise
 

-            47
invocation.
+            47
*** synced shnurise
 

-            48
+            48
 * Sync succeeded
 

-            49
Already up to date.
+            49
$ git log --format=%ci -1
 

-            50
*** syncing shnurise
+            50
$ git show -q --pretty=format:%G? HEAD
 

-            51
*** synced shnurise
+            51
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 shnurise
 

-            52
 * Sync succeeded
-

-            53
$ git log --format=%ci -1
-

-            54
$ git show -q --pretty=format:%G? HEAD
-

-            55
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 shnurise
-

-            56
 * dev-db/sharphsql-1.4-r20150714: failed sourcing ebuild: this eclass doesn't support EAPI-5
+            52
 * dev-db/sharphsql-1.4-r20150714: failed sourcing ebuild: this eclass doesn't support EAPI-5
 
[FATAL]
-            57
 * dev-dotnet/antlr3-runtime-3.1.3-r1: failed sourcing ebuild: this eclass doesn't support EAPI-6
+            53
 * dev-dotnet/antlr3-runtime-3.1.3-r1: failed sourcing ebuild: this eclass doesn't support EAPI-6
 
[FATAL]
-            58
 * dev-dotnet/antlr3-runtime-3.5.2_beta1_p2017080216-r3: failed sourcing ebuild: this eclass doesn't support EAPI-6
+            54
 * dev-dotnet/antlr3-runtime-3.5.2_beta1_p2017080216-r3: failed sourcing ebuild: this eclass doesn't support EAPI-6
 
[FATAL]
-            59
 * dev-dotnet/aspnetwebstack-2014.10.27: failed sourcing ebuild: this eclass doesn't support EAPI-5
+            55
 * dev-dotnet/aspnetwebstack-2014.10.27: failed sourcing ebuild: this eclass doesn't support EAPI-5
 
[FATAL]
-            60
 * dev-dotnet/autofac-configuration-3.5.2: failed sourcing ebuild: this eclass doesn't support EAPI-6
+            56
 * dev-dotnet/autofac-configuration-3.5.2: failed sourcing ebuild: this eclass doesn't support EAPI-6
 
[FATAL]
-            61
 * dev-dotnet/autofac-web-3.0.0.0-r1: failed sourcing ebuild: this eclass doesn't support EAPI-6
+            57
 * dev-dotnet/autofac-web-3.0.0.0-r1: failed sourcing ebuild: this eclass doesn't support EAPI-6
 
[FATAL]
-            62
 * dev-dotnet/castle-core-1.2.0-r2: failed sourcing ebuild: this eclass doesn't support EAPI-6
+            58
 * dev-dotnet/castle-core-1.2.0-r2: failed sourcing ebuild: this eclass doesn't support EAPI-6
 
[FATAL]
-            63
 * dev-dotnet/castle-core-4.0.0_beta1-r1: failed sourcing ebuild: this eclass doesn't support EAPI-6
+            59
 * dev-dotnet/castle-core-4.0.0_beta1-r1: failed sourcing ebuild: this eclass doesn't support EAPI-6
 
[FATAL]
-            64
 * dev-dotnet/cecil-0.10_beta7_p2018031901-r1: failed sourcing ebuild: this eclass doesn't support EAPI-6
+            60
 * dev-dotnet/cecil-0.10_beta7_p2018031901-r1: failed sourcing ebuild: this eclass doesn't support EAPI-6
 
[FATAL]
-            65
 * dev-dotnet/command-line-api-0.0.0.0_p1499-r1: failed sourcing ebuild: this eclass doesn't support EAPI-6
+            61
 * dev-dotnet/command-line-api-0.0.0.0_p1499-r1: failed sourcing ebuild: this eclass doesn't support EAPI-6
 
[FATAL]
-            66
 * dev-dotnet/fluent-nhibernate-2.0.2-r1: failed sourcing ebuild: this eclass doesn't support EAPI-6
+            62
 * dev-dotnet/fluent-nhibernate-2.0.2-r1: failed sourcing ebuild: this eclass doesn't support EAPI-6
 
[FATAL]
-            67
 * dev-dotnet/htmlparsersharp-1.0.0.0-r20150614: failed sourcing ebuild: this eclass doesn't support EAPI-5
+            63
 * dev-dotnet/htmlparsersharp-1.0.0.0-r20150614: failed sourcing ebuild: this eclass doesn't support EAPI-5
 
[FATAL]
-            68
 * dev-dotnet/icsharpcode-nrefactory-5.5.1: failed sourcing ebuild: this eclass doesn't support EAPI-6
+            64
 * dev-dotnet/icsharpcode-nrefactory-5.5.1: failed sourcing ebuild: this eclass doesn't support EAPI-6
 
[FATAL]
-            69
 * dev-dotnet/irony-daxnet-1.0.0_p2017083101: failed sourcing ebuild: this eclass doesn't support EAPI-6
+            65
 * dev-dotnet/irony-daxnet-1.0.0_p2017083101: failed sourcing ebuild: this eclass doesn't support EAPI-6
 
[FATAL]
-            70
 * dev-dotnet/microsoft-extensions-commandlineutils-2.3.4: failed sourcing ebuild: this eclass doesn't support EAPI-6
+            66
 * dev-dotnet/microsoft-extensions-commandlineutils-2.3.4: failed sourcing ebuild: this eclass doesn't support EAPI-6
 
[FATAL]
-            71
 * dev-dotnet/nhibernate-4.1.1: failed sourcing ebuild: this eclass doesn't support EAPI-6
+            67
 * dev-dotnet/nhibernate-4.1.1: failed sourcing ebuild: this eclass doesn't support EAPI-6
 
[FATAL]
-            72
 * dev-dotnet/nhibernate-core-3.3.4-r2: failed sourcing ebuild: this eclass doesn't support EAPI-6
+            68
 * dev-dotnet/nhibernate-core-3.3.4-r2: failed sourcing ebuild: this eclass doesn't support EAPI-6
 
[FATAL]
-            73
 * dev-dotnet/nhibernate-core-5.0.0-r2: failed sourcing ebuild: this eclass doesn't support EAPI-6
+            69
 * dev-dotnet/nhibernate-core-5.0.0-r2: failed sourcing ebuild: this eclass doesn't support EAPI-6
 
[FATAL]
-            74
 * dev-dotnet/nhibernate-iesi-collections-4.0.2-r2: failed sourcing ebuild: this eclass doesn't support EAPI-6
+            70
 * dev-dotnet/nhibernate-iesi-collections-4.0.2-r2: failed sourcing ebuild: this eclass doesn't support EAPI-6
 
[FATAL]
-            75
 * dev-dotnet/nhibernate-linq-1.0.0.0_p2010050601-r1: failed sourcing ebuild: this eclass doesn't support EAPI-6
+            71
 * dev-dotnet/nhibernate-linq-1.0.0.0_p2010050601-r1: failed sourcing ebuild: this eclass doesn't support EAPI-6
 
[FATAL]
-            76
 * dev-dotnet/npgsql-3.1.6-r2: failed sourcing ebuild: this eclass doesn't support EAPI-6
+            72
 * dev-dotnet/npgsql-3.1.6-r2: failed sourcing ebuild: this eclass doesn't support EAPI-6
 
[FATAL]
-            77
 * dev-dotnet/npgsql-4.0.4: failed sourcing ebuild: this eclass doesn't support EAPI-6
+            73
 * dev-dotnet/npgsql-4.0.4: failed sourcing ebuild: this eclass doesn't support EAPI-6
 
[FATAL]
-            78
 * dev-dotnet/pliant-0.4.2.1: failed sourcing ebuild: this eclass doesn't support EAPI-6
+            74
 * dev-dotnet/pliant-0.4.2.1: failed sourcing ebuild: this eclass doesn't support EAPI-6
 
[FATAL]
-            79
 * dev-dotnet/remotion-linq-2.1.2-r1: failed sourcing ebuild: this eclass doesn't support EAPI-6
+            75
 * dev-dotnet/remotion-linq-2.1.2-r1: failed sourcing ebuild: this eclass doesn't support EAPI-6
 
[FATAL]
-            80
 * dev-dotnet/remotion-linq-eagerfetching-2.1.0-r1: failed sourcing ebuild: this eclass doesn't support EAPI-6
+            76
 * dev-dotnet/remotion-linq-eagerfetching-2.1.0-r1: failed sourcing ebuild: this eclass doesn't support EAPI-6
 
[FATAL]
-            81
 * dev-dotnet/roslyn-tools-0.0.0_p2019011903: failed sourcing ebuild: this eclass doesn't support EAPI-6
+            77
 * dev-dotnet/roslyn-tools-0.0.0_p2019011903: failed sourcing ebuild: this eclass doesn't support EAPI-6
 
[FATAL]
-            82
 * dev-dotnet/slntools-1.1.3_p201508170-r2: failed sourcing ebuild: this eclass doesn't support EAPI-6
+            78
 * dev-dotnet/slntools-1.1.3_p201508170-r2: failed sourcing ebuild: this eclass doesn't support EAPI-6
 
[FATAL]
-            83
 * dev-dotnet/ssh-config-parser-1.0-r1: failed sourcing ebuild: this eclass doesn't support EAPI-6
+            79
 * dev-dotnet/ssh-config-parser-1.0-r1: failed sourcing ebuild: this eclass doesn't support EAPI-6
 
[FATAL]
-            84
 * dev-dotnet/ssh-net-2016.1.0_p33-r1: failed sourcing ebuild: this eclass doesn't support EAPI-6
+            80
 * dev-dotnet/ssh-net-2016.1.0_p33-r1: failed sourcing ebuild: this eclass doesn't support EAPI-6
 
[FATAL]
-            85
 * dev-gaclibs/Autopsy-Formats-PeCoff-1.0: failed sourcing ebuild: this eclass doesn't support EAPI-5
+            81
 * dev-gaclibs/Autopsy-Formats-PeCoff-1.0: failed sourcing ebuild: this eclass doesn't support EAPI-5
 
[FATAL]
-            86
 * dev-gaclibs/github-api-0.0-r20150331: failed sourcing ebuild: this eclass doesn't support EAPI-5
+            82
 * dev-gaclibs/github-api-0.0-r20150331: failed sourcing ebuild: this eclass doesn't support EAPI-5
 
[FATAL]
-            87
 * dev-lang/mono-patched-6.12.0.102: failed sourcing ebuild: versionator: banned in EAPI=7; use ver_* instead
+            83
 * dev-lang/mono-patched-6.12.0.102: failed sourcing ebuild: versionator: banned in EAPI=7; use ver_* instead
 
[FATAL]
-            88
 * dev-util/antlrcs-3.5.2_beta1_p2017080216-r1: failed sourcing ebuild: this eclass doesn't support EAPI 0..6
+            84
 * dev-util/antlrcs-3.5.2_beta1_p2017080216-r1: failed sourcing ebuild: this eclass doesn't support EAPI 0..6
 
[FATAL]
-            89
 * dev-util/asmspy-1.2.0: failed sourcing ebuild: this eclass doesn't support EAPI-6
+            85
 * dev-util/asmspy-1.2.0: failed sourcing ebuild: this eclass doesn't support EAPI-6
 
[FATAL]
-            90
 * dev-util/gplex-dbremner-1.2.2_p2015112101-r1: failed sourcing ebuild: this eclass doesn't support EAPI-6
+            86
 * dev-util/gplex-dbremner-1.2.2_p2015112101-r1: failed sourcing ebuild: this eclass doesn't support EAPI-6
 
[FATAL]
-            91
 * dev-util/gppg-dbremner-1.5.2_p2015112101-r1: failed sourcing ebuild: this eclass doesn't support EAPI-6
+            87
 * dev-util/gppg-dbremner-1.5.2_p2015112101-r1: failed sourcing ebuild: this eclass doesn't support EAPI-6
 
[FATAL]
-            92
 * dev-util/monodevelop-5.9.5.9: failed sourcing ebuild: this eclass doesn't support EAPI-5
+            88
 * dev-util/monodevelop-5.9.5.9: failed sourcing ebuild: this eclass doesn't support EAPI-5
 
[FATAL]
-            93
 * dev-util/monodevelop-5.10.0.609: failed sourcing ebuild: this eclass doesn't support EAPI-5
+            89
 * dev-util/monodevelop-5.10.0.609: failed sourcing ebuild: this eclass doesn't support EAPI-5
 
[FATAL]
-            94
 * dev-util/monodevelop-6.1_p2016062206: failed sourcing ebuild: this eclass doesn't support EAPI-6
+            90
 * dev-util/monodevelop-6.1_p2016062206: failed sourcing ebuild: this eclass doesn't support EAPI-6
 
[FATAL]
-            95
 * dev-util/naive-language-tools-1.13.11.16: failed sourcing ebuild: this eclass doesn't support EAPI-6
+            91
 * dev-util/naive-language-tools-1.13.11.16: failed sourcing ebuild: this eclass doesn't support EAPI-6
 
[FATAL]
-            96
 * dev-util/nunit2-2.6.4_p2015011102-r2: failed sourcing ebuild: this eclass doesn't support EAPI-6
+            92
 * dev-util/nunit2-2.6.4_p2015011102-r2: failed sourcing ebuild: this eclass doesn't support EAPI-6
 
[FATAL]
-            97
 * dev-util/repository-analyser-1.0.0.0: failed sourcing ebuild: this eclass doesn't support EAPI-6
+            93
 * dev-util/repository-analyser-1.0.0.0: failed sourcing ebuild: this eclass doesn't support EAPI-6
 
[FATAL]
-            98
 * dev-util/sftp-file-transfer-0.0.0.0_p2: failed sourcing ebuild: this eclass doesn't support EAPI-6
+            94
 * dev-util/sftp-file-transfer-0.0.0.0_p2: failed sourcing ebuild: this eclass doesn't support EAPI-6
 
[FATAL]
-            99
 * dev-util/t4-1.3.1_p2018020903-r1: failed sourcing ebuild: this eclass doesn't support EAPI-6
+            95
 * dev-util/t4-1.3.1_p2018020903-r1: failed sourcing ebuild: this eclass doesn't support EAPI-6
 
[FATAL]
-            100
 * www-apps/orchard-cms-1.7.3-r3: failed sourcing ebuild: this eclass doesn't support EAPI-6
+            96
 * www-apps/orchard-cms-1.7.3-r3: failed sourcing ebuild: this eclass doesn't support EAPI-6
 
[FATAL]
-            101
 * Cache regen failed with 1
+            97
 * Cache regen failed with 1
 

 
         
diff --git a/shnurise.txt b/shnurise.txt
index 0f4cf8bbb1cd..079639e29655 100644
--- a/shnurise.txt
+++ b/shnurise.txt
@@ -15,24 +15,10 @@
              'uri': 'git@github.com:ArsenShnurkov/shnurise.git'}],
  'status': 'unofficial'}
 $ pmaint sync shnurise
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ruby repo at '/var/lib/repo-mirror-ci/sync/ruby', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
@@ -46,7 +32,17 @@ 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.
 
-Already up to date.
+From https://github.com/ArsenShnurkov/shnurise
+   2faee5d..61d13af  master     -> origin/master
+Updating 2faee5d..61d13af
+Fast-forward
+ .../msbuild/files/15.9.20.62856/MSBuild.exe.config |  3 ++
+ dev-util/msbuild/msbuild-15.9.20.62856-r5.ebuild   |  8 ++++
+ www-servers/xsp/files/props.patch                  | 45 ++++++++++++++++++++++
+ .../xsp/{xsp-4.7.1.ebuild => xsp-4.7.1-r1.ebuild}  |  1 +
+ 4 files changed, 57 insertions(+)
+ create mode 100644 www-servers/xsp/files/props.patch
+ rename www-servers/xsp/{xsp-4.7.1.ebuild => xsp-4.7.1-r1.ebuild} (99%)
 *** syncing shnurise
 *** synced shnurise
  * Sync succeeded
diff --git a/sihnon.html b/sihnon.html
index 03fe6d995d0b..51cf5c2fb330 100644
--- a/sihnon.html
+++ b/sihnon.html
@@ -38,83 +38,55 @@
 

             14
$ pmaint sync sihnon
 

-            15
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
warning: Pulling without specifying how to reconcile divergent branches is
 

-            20
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
discouraged. You can squelch this message by running one of the following
 

-            21
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
commands sometime before your next pull:
 

-            22
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
 

-            23
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase false  # merge (the default strategy)
 

-            24
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.rebase true   # rebase
 

-            25
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.ff only       # fast-forward only
 

-            26
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
 

-            27
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
You can replace "git config" with "git config --global" to set a default
 

-            28
WARNING:pkgcore:ruby repo at '/var/lib/repo-mirror-ci/sync/ruby', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            29
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
or --ff-only on the command line to override the configured default per
 

-            30
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
invocation.
 

-            31
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
 

-            32
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
Already up to date.
 

-            33
warning: Pulling without specifying how to reconcile divergent branches is
+            33
*** syncing sihnon
 

-            34
discouraged. You can squelch this message by running one of the following
+            34
*** synced sihnon
 

-            35
commands sometime before your next pull:
+            35
 * Sync succeeded
 

-            36
+            36
$ git log --format=%ci -1
 

-            37
  git config pull.rebase false  # merge (the default strategy)
+            37
$ git show -q --pretty=format:%G? HEAD
 

-            38
  git config pull.rebase true   # rebase
+            38
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 sihnon
 

-            39
  git config pull.ff only       # fast-forward only
-

-            40
-

-            41
You can replace "git config" with "git config --global" to set a default
-

-            42
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            43
or --ff-only on the command line to override the configured default per
-

-            44
invocation.
-

-            45
-

-            46
Already up to date.
-

-            47
*** syncing sihnon
-

-            48
*** synced sihnon
-

-            49
 * Sync succeeded
-

-            50
$ git log --format=%ci -1
-

-            51
$ git show -q --pretty=format:%G? HEAD
-

-            52
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 sihnon
-

-            53
 * Cache regenerated successfully
+            39
 * Cache regenerated successfully
 

 
         
diff --git a/sihnon.txt b/sihnon.txt
index 1bc6b96ff8ba..8bdf817966a8 100644
--- a/sihnon.txt
+++ b/sihnon.txt
@@ -12,24 +12,10 @@
              'uri': 'git@github.com:optiz0r/gentoo-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync sihnon
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ruby repo at '/var/lib/repo-mirror-ci/sync/ruby', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/simonvanderveldt.html b/simonvanderveldt.html
index 05f3f4548f77..75124a5a64e2 100644
--- a/simonvanderveldt.html
+++ b/simonvanderveldt.html
@@ -44,81 +44,55 @@
 

             17
$ pmaint sync simonvanderveldt
 

-            18
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
warning: Pulling without specifying how to reconcile divergent branches is
 

-            23
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
discouraged. You can squelch this message by running one of the following
 

-            24
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
commands sometime before your next pull:
 

-            25
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 

-            26
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.rebase false  # merge (the default strategy)
 

-            27
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.rebase true   # rebase
 

-            28
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
  git config pull.ff only       # fast-forward only
 

-            29
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
 

-            30
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
You can replace "git config" with "git config --global" to set a default
 

-            31
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            32
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
or --ff-only on the command line to override the configured default per
 

-            33
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
invocation.
 

-            34
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
 

-            35
warning: Pulling without specifying how to reconcile divergent branches is
+            35
Already up to date.
 

-            36
discouraged. You can squelch this message by running one of the following
+            36
*** syncing simonvanderveldt
 

-            37
commands sometime before your next pull:
+            37
*** synced simonvanderveldt
 

-            38
+            38
 * Sync succeeded
 

-            39
  git config pull.rebase false  # merge (the default strategy)
+            39
$ git log --format=%ci -1
 

-            40
  git config pull.rebase true   # rebase
+            40
$ git show -q --pretty=format:%G? HEAD
 

-            41
  git config pull.ff only       # fast-forward only
+            41
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 simonvanderveldt
 

-            42
-

-            43
You can replace "git config" with "git config --global" to set a default
-

-            44
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            45
or --ff-only on the command line to override the configured default per
-

-            46
invocation.
-

-            47
-

-            48
Already up to date.
-

-            49
*** syncing simonvanderveldt
-

-            50
*** synced simonvanderveldt
-

-            51
 * Sync succeeded
-

-            52
$ git log --format=%ci -1
-

-            53
$ git show -q --pretty=format:%G? HEAD
-

-            54
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 simonvanderveldt
-

-            55
 * Cache regenerated successfully
+            42
 * Cache regenerated successfully
 

 
         
diff --git a/simonvanderveldt.txt b/simonvanderveldt.txt
index 317d4f82ebb0..a55be370dfa2 100644
--- a/simonvanderveldt.txt
+++ b/simonvanderveldt.txt
@@ -15,23 +15,10 @@
              'uri': 'git@github.com:simonvanderveldt/simonvanderveldt-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync simonvanderveldt
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/sinustrom.html b/sinustrom.html
index ae8295affae6..2c32160c8391 100644
--- a/sinustrom.html
+++ b/sinustrom.html
@@ -42,81 +42,57 @@
 

             16
$ pmaint sync sinustrom
 

-            17
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
warning: Pulling without specifying how to reconcile divergent branches is
 

-            23
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
discouraged. You can squelch this message by running one of the following
 

-            24
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
commands sometime before your next pull:
 

-            25
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 

-            26
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.rebase false  # merge (the default strategy)
 

-            27
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.rebase true   # rebase
 

-            28
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
  git config pull.ff only       # fast-forward only
 

-            29
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
 

-            30
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
You can replace "git config" with "git config --global" to set a default
 

-            31
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            32
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
or --ff-only on the command line to override the configured default per
 

-            33
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
invocation.
 

-            34
warning: Pulling without specifying how to reconcile divergent branches is
+            34
 

-            35
discouraged. You can squelch this message by running one of the following
+            35
Already up to date.
 

-            36
commands sometime before your next pull:
+            36
*** syncing sinustrom
 

-            37
+            37
*** synced sinustrom
 

-            38
  git config pull.rebase false  # merge (the default strategy)
+            38
 * Sync succeeded
 

-            39
  git config pull.rebase true   # rebase
+            39
$ git log --format=%ci -1
 

-            40
  git config pull.ff only       # fast-forward only
+            40
$ git show -q --pretty=format:%G? HEAD
 

-            41
+            41
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 sinustrom
 

-            42
You can replace "git config" with "git config --global" to set a default
-

-            43
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            44
or --ff-only on the command line to override the configured default per
-

-            45
invocation.
-

-            46
-

-            47
Already up to date.
-

-            48
*** syncing sinustrom
-

-            49
*** synced sinustrom
-

-            50
 * Sync succeeded
-

-            51
$ git log --format=%ci -1
-

-            52
$ git show -q --pretty=format:%G? HEAD
-

-            53
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 sinustrom
-

-            54
 * Cache regenerated successfully
+            42
 * Cache regenerated successfully
 

 
         
diff --git a/sinustrom.txt b/sinustrom.txt
index 20e2cdaee68d..39a5549999e7 100644
--- a/sinustrom.txt
+++ b/sinustrom.txt
@@ -14,23 +14,11 @@
              'uri': 'git@github.com:zpuskas/sinustrom-gentoo-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync sinustrom
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/sk-overlay.html b/sk-overlay.html
index ef7a8b036768..275f46378869 100644
--- a/sk-overlay.html
+++ b/sk-overlay.html
@@ -40,81 +40,57 @@
 

             15
$ pmaint sync sk-overlay
 

-            16
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
warning: Pulling without specifying how to reconcile divergent branches is
 

-            22
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
discouraged. You can squelch this message by running one of the following
 

-            23
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
commands sometime before your next pull:
 

-            24
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 

-            25
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase false  # merge (the default strategy)
 

-            26
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.rebase true   # rebase
 

-            27
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.ff only       # fast-forward only
 

-            28
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
 

-            29
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
You can replace "git config" with "git config --global" to set a default
 

-            30
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            31
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
or --ff-only on the command line to override the configured default per
 

-            32
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
invocation.
 

-            33
warning: Pulling without specifying how to reconcile divergent branches is
+            33
 

-            34
discouraged. You can squelch this message by running one of the following
+            34
Already up to date.
 

-            35
commands sometime before your next pull:
+            35
*** syncing sk-overlay
 

-            36
+            36
*** synced sk-overlay
 

-            37
  git config pull.rebase false  # merge (the default strategy)
+            37
 * Sync succeeded
 

-            38
  git config pull.rebase true   # rebase
+            38
$ git log --format=%ci -1
 

-            39
  git config pull.ff only       # fast-forward only
+            39
$ git show -q --pretty=format:%G? HEAD
 

-            40
+            40
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 sk-overlay
 

-            41
You can replace "git config" with "git config --global" to set a default
-

-            42
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            43
or --ff-only on the command line to override the configured default per
-

-            44
invocation.
-

-            45
-

-            46
Already up to date.
-

-            47
*** syncing sk-overlay
-

-            48
*** synced sk-overlay
-

-            49
 * Sync succeeded
-

-            50
$ git log --format=%ci -1
-

-            51
$ git show -q --pretty=format:%G? HEAD
-

-            52
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 sk-overlay
-

-            53
 * Cache regenerated successfully
+            41
 * Cache regenerated successfully
 

 
         
diff --git a/sk-overlay.txt b/sk-overlay.txt
index 698ab698d0ce..7804285114c1 100644
--- a/sk-overlay.txt
+++ b/sk-overlay.txt
@@ -13,23 +13,11 @@
             {'type': 'git', 'uri': 'git@github.com:scriptkitties/overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync sk-overlay
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/slonko.html b/slonko.html
index cf55650ff1f8..d38be594710f 100644
--- a/slonko.html
+++ b/slonko.html
@@ -32,79 +32,57 @@
 

             11
$ pmaint sync slonko
 

-            12
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
warning: Pulling without specifying how to reconcile divergent branches is
 

-            18
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
discouraged. You can squelch this message by running one of the following
 

-            19
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
commands sometime before your next pull:
 

-            20
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
 

-            21
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
  git config pull.rebase false  # merge (the default strategy)
 

-            22
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase true   # rebase
 

-            23
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.ff only       # fast-forward only
 

-            24
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 

-            25
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
You can replace "git config" with "git config --global" to set a default
 

-            26
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            27
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
or --ff-only on the command line to override the configured default per
 

-            28
warning: Pulling without specifying how to reconcile divergent branches is
+            28
invocation.
 

-            29
discouraged. You can squelch this message by running one of the following
+            29
 

-            30
commands sometime before your next pull:
+            30
Already up to date.
 

-            31
+            31
*** syncing slonko
 

-            32
  git config pull.rebase false  # merge (the default strategy)
+            32
*** synced slonko
 

-            33
  git config pull.rebase true   # rebase
+            33
 * Sync succeeded
 

-            34
  git config pull.ff only       # fast-forward only
+            34
$ git log --format=%ci -1
 

-            35
+            35
$ git show -q --pretty=format:%G? HEAD
 

-            36
You can replace "git config" with "git config --global" to set a default
+            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 slonko
 

-            37
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            38
or --ff-only on the command line to override the configured default per
-

-            39
invocation.
-

-            40
-

-            41
Already up to date.
-

-            42
*** syncing slonko
-

-            43
*** synced slonko
-

-            44
 * Sync succeeded
-

-            45
$ git log --format=%ci -1
-

-            46
$ git show -q --pretty=format:%G? HEAD
-

-            47
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 slonko
-

-            48
 * Cache regenerated successfully
+            37
 * Cache regenerated successfully
 

 
         
diff --git a/slonko.txt b/slonko.txt
index b5bef20bdad5..742e20c3c98f 100644
--- a/slonko.txt
+++ b/slonko.txt
@@ -9,22 +9,11 @@
  'source': [{'type': 'git', 'uri': 'https://slonko.net/git/portage'}],
  'status': 'unofficial'}
 $ pmaint sync slonko
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/slyfox.html b/slyfox.html
index 266d52799758..1365c953b2af 100644
--- a/slyfox.html
+++ b/slyfox.html
@@ -32,79 +32,57 @@
 

             11
$ pmaint sync slyfox
 

-            12
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
warning: Pulling without specifying how to reconcile divergent branches is
 

-            18
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
discouraged. You can squelch this message by running one of the following
 

-            19
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
commands sometime before your next pull:
 

-            20
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
 

-            21
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
  git config pull.rebase false  # merge (the default strategy)
 

-            22
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase true   # rebase
 

-            23
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.ff only       # fast-forward only
 

-            24
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 

-            25
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
You can replace "git config" with "git config --global" to set a default
 

-            26
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            27
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
or --ff-only on the command line to override the configured default per
 

-            28
warning: Pulling without specifying how to reconcile divergent branches is
+            28
invocation.
 

-            29
discouraged. You can squelch this message by running one of the following
+            29
 

-            30
commands sometime before your next pull:
+            30
Already up to date.
 

-            31
+            31
*** syncing slyfox
 

-            32
  git config pull.rebase false  # merge (the default strategy)
+            32
*** synced slyfox
 

-            33
  git config pull.rebase true   # rebase
+            33
 * Sync succeeded
 

-            34
  git config pull.ff only       # fast-forward only
+            34
$ git log --format=%ci -1
 

-            35
+            35
$ git show -q --pretty=format:%G? HEAD
 

-            36
You can replace "git config" with "git config --global" to set a default
+            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 slyfox
 

-            37
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            38
or --ff-only on the command line to override the configured default per
-

-            39
invocation.
-

-            40
-

-            41
Already up to date.
-

-            42
*** syncing slyfox
-

-            43
*** synced slyfox
-

-            44
 * Sync succeeded
-

-            45
$ git log --format=%ci -1
-

-            46
$ git show -q --pretty=format:%G? HEAD
-

-            47
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 slyfox
-

-            48
 * Cache regenerated successfully
+            37
 * Cache regenerated successfully
 

 
         
diff --git a/slyfox.txt b/slyfox.txt
index dc65de49c060..ed3c630a1de3 100644
--- a/slyfox.txt
+++ b/slyfox.txt
@@ -9,22 +9,11 @@
  'source': [{'type': 'git', 'uri': 'https://github.com/trofi/slyfox-gentoo'}],
  'status': 'official'}
 $ pmaint sync slyfox
-WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/snapd.html b/snapd.html
index 7339987aab01..d06401254ef4 100644
--- a/snapd.html
+++ b/snapd.html
@@ -32,77 +32,57 @@
 

             11
$ pmaint sync snapd
 

-            12
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
warning: Pulling without specifying how to reconcile divergent branches is
 

-            18
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
discouraged. You can squelch this message by running one of the following
 

-            19
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
commands sometime before your next pull:
 

-            20
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
 

-            21
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
  git config pull.rebase false  # merge (the default strategy)
 

-            22
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase true   # rebase
 

-            23
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.ff only       # fast-forward only
 

-            24
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 

-            25
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
You can replace "git config" with "git config --global" to set a default
 

-            26
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            27
warning: Pulling without specifying how to reconcile divergent branches is
+            27
or --ff-only on the command line to override the configured default per
 

-            28
discouraged. You can squelch this message by running one of the following
+            28
invocation.
 

-            29
commands sometime before your next pull:
+            29
 

-            30
+            30
Already up to date.
 

-            31
  git config pull.rebase false  # merge (the default strategy)
+            31
*** syncing snapd
 

-            32
  git config pull.rebase true   # rebase
+            32
*** synced snapd
 

-            33
  git config pull.ff only       # fast-forward only
+            33
 * Sync succeeded
 

-            34
+            34
$ git log --format=%ci -1
 

-            35
You can replace "git config" with "git config --global" to set a default
+            35
$ git show -q --pretty=format:%G? HEAD
 

-            36
preference for all repositories. You can also pass --rebase, --no-rebase,
+            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 snapd
 

-            37
or --ff-only on the command line to override the configured default per
-

-            38
invocation.
-

-            39
-

-            40
Already up to date.
-

-            41
*** syncing snapd
-

-            42
*** synced snapd
-

-            43
 * Sync succeeded
-

-            44
$ git log --format=%ci -1
-

-            45
$ git show -q --pretty=format:%G? HEAD
-

-            46
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 snapd
-

-            47
 * Cache regenerated successfully
+            37
 * Cache regenerated successfully
 

 
         
diff --git a/snapd.txt b/snapd.txt
index 7eb175d96d41..9d1b1d90c1f2 100644
--- a/snapd.txt
+++ b/snapd.txt
@@ -9,21 +9,11 @@
  'source': [{'type': 'git', 'uri': 'https://github.com/zigford/snapd.git'}],
  'status': 'unofficial'}
 $ pmaint sync snapd
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/soft.html b/soft.html
index d74a8a4a9128..461bdba8899b 100644
--- a/soft.html
+++ b/soft.html
@@ -32,71 +32,33 @@
 

             11
$ pmaint sync soft
 

-            12
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
abort: HTTP Error 404: Not Found
 

-            23
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
*** syncing soft
 

-            24
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
!!! failed syncing soft
 

-            25
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            26
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            27
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            28
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            29
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            30
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            31
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            32
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            33
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            34
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            35
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            36
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            37
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            38
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            39
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            40
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            41
abort: HTTP Error 404: Not Found
-

-            42
*** syncing soft
-

-            43
!!! failed syncing soft
-

-            44
 * Sync failed with 1
+            25
 * Sync failed with 1
 
[FATAL]
 
         
diff --git a/soft.txt b/soft.txt
index ad7932fce330..cb4d3c4a2248 100644
--- a/soft.txt
+++ b/soft.txt
@@ -9,32 +9,13 @@
  'status': 'unofficial'}
  * Adding new repository
 $ pmaint sync soft
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
diff --git a/sogo-connector.html b/sogo-connector.html
index 3abcfa5ff83c..461ab70db434 100644
--- a/sogo-connector.html
+++ b/sogo-connector.html
@@ -40,83 +40,59 @@
 

             15
 'status': 'unofficial'}
 

-            16
 * Adding new repository
+            16
$ pmaint sync sogo-connector
 

-            17
$ pmaint sync sogo-connector
+            17
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
warning: Pulling without specifying how to reconcile divergent branches is
 

-            23
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
discouraged. You can squelch this message by running one of the following
 

-            24
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
commands sometime before your next pull:
 

-            25
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 

-            26
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.rebase false  # merge (the default strategy)
 

-            27
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.rebase true   # rebase
 

-            28
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
  git config pull.ff only       # fast-forward only
 

-            29
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
 

-            30
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
You can replace "git config" with "git config --global" to set a default
 

-            31
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            32
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
or --ff-only on the command line to override the configured default per
 

-            33
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
invocation.
 

-            34
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
 

-            35
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
Already up to date.
 

-            36
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
*** syncing sogo-connector
 

-            37
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            37
*** synced sogo-connector
 

-            38
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            38
 * Sync succeeded
 

-            39
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            39
$ git log --format=%ci -1
 

-            40
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            40
$ git show -q --pretty=format:%G? HEAD
 

-            41
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            41
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 sogo-connector
 

-            42
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            43
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            44
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            45
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            46
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            47
Cloning into '/var/lib/repo-mirror-ci/sync/sogo-connector'...
-

-            48
*** syncing sogo-connector
-

-            49
*** synced sogo-connector
-

-            50
 * Sync succeeded
-

-            51
$ git log --format=%ci -1
-

-            52
$ git show -q --pretty=format:%G? HEAD
-

-            53
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 sogo-connector
-

-            54
 * Cache regenerated successfully
+            42
 * Cache regenerated successfully
 

 
         
diff --git a/sogo-connector.txt b/sogo-connector.txt
index 5c4b74bbb11a..ba10bbc93880 100644
--- a/sogo-connector.txt
+++ b/sogo-connector.txt
@@ -13,38 +13,26 @@
             {'type': 'git',
              'uri': 'git+ssh://git@git.gentoo.org/repo/user/sogo-connector.git'}],
  'status': 'unofficial'}
- * Adding new repository
 $ pmaint sync sogo-connector
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-Cloning into '/var/lib/repo-mirror-ci/sync/sogo-connector'...
+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.
+
+Already up to date.
 *** syncing sogo-connector
 *** synced sogo-connector
  * Sync succeeded
diff --git a/soltys.html b/soltys.html
index cf44c51aac93..46da13c79c6b 100644
--- a/soltys.html
+++ b/soltys.html
@@ -40,77 +40,57 @@
 

             15
$ pmaint sync soltys
 

-            16
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
warning: Pulling without specifying how to reconcile divergent branches is
 

-            22
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
discouraged. You can squelch this message by running one of the following
 

-            23
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
commands sometime before your next pull:
 

-            24
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 

-            25
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase false  # merge (the default strategy)
 

-            26
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.rebase true   # rebase
 

-            27
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.ff only       # fast-forward only
 

-            28
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
 

-            29
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
You can replace "git config" with "git config --global" to set a default
 

-            30
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            31
warning: Pulling without specifying how to reconcile divergent branches is
+            31
or --ff-only on the command line to override the configured default per
 

-            32
discouraged. You can squelch this message by running one of the following
+            32
invocation.
 

-            33
commands sometime before your next pull:
+            33
 

-            34
+            34
Already up to date.
 

-            35
  git config pull.rebase false  # merge (the default strategy)
+            35
*** syncing soltys
 

-            36
  git config pull.rebase true   # rebase
+            36
*** synced soltys
 

-            37
  git config pull.ff only       # fast-forward only
+            37
 * Sync succeeded
 

-            38
+            38
$ git log --format=%ci -1
 

-            39
You can replace "git config" with "git config --global" to set a default
+            39
$ git show -q --pretty=format:%G? HEAD
 

-            40
preference for all repositories. You can also pass --rebase, --no-rebase,
+            40
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 soltys
 

-            41
or --ff-only on the command line to override the configured default per
-

-            42
invocation.
-

-            43
-

-            44
Already up to date.
-

-            45
*** syncing soltys
-

-            46
*** synced soltys
-

-            47
 * Sync succeeded
-

-            48
$ git log --format=%ci -1
-

-            49
$ git show -q --pretty=format:%G? HEAD
-

-            50
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 soltys
-

-            51
 * Cache regenerated successfully
+            41
 * Cache regenerated successfully
 

 
         
diff --git a/soltys.txt b/soltys.txt
index bac06ee0a043..a542e30294dc 100644
--- a/soltys.txt
+++ b/soltys.txt
@@ -13,21 +13,11 @@
              'uri': 'git+ssh://git@github.com/soltysek/soltys-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync soltys
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/sorinp.html b/sorinp.html
index f08aae748982..6ca10ec94db6 100644
--- a/sorinp.html
+++ b/sorinp.html
@@ -36,77 +36,57 @@
 

             13
$ pmaint sync sorinp
 

-            14
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
warning: Pulling without specifying how to reconcile divergent branches is
 

-            20
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
discouraged. You can squelch this message by running one of the following
 

-            21
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
commands sometime before your next pull:
 

-            22
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
 

-            23
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase false  # merge (the default strategy)
 

-            24
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.rebase true   # rebase
 

-            25
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.ff only       # fast-forward only
 

-            26
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
 

-            27
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
You can replace "git config" with "git config --global" to set a default
 

-            28
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            29
warning: Pulling without specifying how to reconcile divergent branches is
+            29
or --ff-only on the command line to override the configured default per
 

-            30
discouraged. You can squelch this message by running one of the following
+            30
invocation.
 

-            31
commands sometime before your next pull:
+            31
 

-            32
+            32
Already up to date.
 

-            33
  git config pull.rebase false  # merge (the default strategy)
+            33
*** syncing sorinp
 

-            34
  git config pull.rebase true   # rebase
+            34
*** synced sorinp
 

-            35
  git config pull.ff only       # fast-forward only
+            35
 * Sync succeeded
 

-            36
+            36
$ git log --format=%ci -1
 

-            37
You can replace "git config" with "git config --global" to set a default
+            37
$ git show -q --pretty=format:%G? HEAD
 

-            38
preference for all repositories. You can also pass --rebase, --no-rebase,
+            38
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 sorinp
 

-            39
or --ff-only on the command line to override the configured default per
-

-            40
invocation.
-

-            41
-

-            42
Already up to date.
-

-            43
*** syncing sorinp
-

-            44
*** synced sorinp
-

-            45
 * Sync succeeded
-

-            46
$ git log --format=%ci -1
-

-            47
$ git show -q --pretty=format:%G? HEAD
-

-            48
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 sorinp
-

-            49
 * Cache regenerated successfully
+            39
 * Cache regenerated successfully
 

 
         
diff --git a/sorinp.txt b/sorinp.txt
index 544ff8c402a2..8349b85bc40e 100644
--- a/sorinp.txt
+++ b/sorinp.txt
@@ -11,21 +11,11 @@
              'uri': 'https://github.com/psihozefir/sorinp-gentoo-overlay'}],
  'status': 'unofficial'}
 $ pmaint sync sorinp
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/sorrow.html b/sorrow.html
index 132fa9b253fd..7b6eaff0e58c 100644
--- a/sorrow.html
+++ b/sorrow.html
@@ -36,77 +36,57 @@
 

             13
$ pmaint sync sorrow
 

-            14
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
warning: Pulling without specifying how to reconcile divergent branches is
 

-            20
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
discouraged. You can squelch this message by running one of the following
 

-            21
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
commands sometime before your next pull:
 

-            22
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
 

-            23
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase false  # merge (the default strategy)
 

-            24
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.rebase true   # rebase
 

-            25
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.ff only       # fast-forward only
 

-            26
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
 

-            27
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
You can replace "git config" with "git config --global" to set a default
 

-            28
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            29
warning: Pulling without specifying how to reconcile divergent branches is
+            29
or --ff-only on the command line to override the configured default per
 

-            30
discouraged. You can squelch this message by running one of the following
+            30
invocation.
 

-            31
commands sometime before your next pull:
+            31
 

-            32
+            32
Already up to date.
 

-            33
  git config pull.rebase false  # merge (the default strategy)
+            33
*** syncing sorrow
 

-            34
  git config pull.rebase true   # rebase
+            34
*** synced sorrow
 

-            35
  git config pull.ff only       # fast-forward only
+            35
 * Sync succeeded
 

-            36
+            36
$ git log --format=%ci -1
 

-            37
You can replace "git config" with "git config --global" to set a default
+            37
$ git show -q --pretty=format:%G? HEAD
 

-            38
preference for all repositories. You can also pass --rebase, --no-rebase,
+            38
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 sorrow
 

-            39
or --ff-only on the command line to override the configured default per
-

-            40
invocation.
-

-            41
-

-            42
Already up to date.
-

-            43
*** syncing sorrow
-

-            44
*** synced sorrow
-

-            45
 * Sync succeeded
-

-            46
$ git log --format=%ci -1
-

-            47
$ git show -q --pretty=format:%G? HEAD
-

-            48
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 sorrow
-

-            49
 * Cache regenerated successfully
+            39
 * Cache regenerated successfully
 

 
         
diff --git a/sorrow.txt b/sorrow.txt
index 218c58a82c21..19b252bf25f7 100644
--- a/sorrow.txt
+++ b/sorrow.txt
@@ -11,21 +11,11 @@
              'uri': 'git+ssh://git@gitlab.com:eternal-sorrow/gentoo-local.git'}],
  'status': 'unofficial'}
 $ pmaint sync sorrow
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/sortsmill.html b/sortsmill.html
index 1a15cc90dcb4..f98303d0bb61 100644
--- a/sortsmill.html
+++ b/sortsmill.html
@@ -42,73 +42,33 @@
 

             16
$ pmaint sync sortsmill
 

-            17
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            23
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            24
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            25
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            26
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            27
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
abort: HTTP Error 404: Not Found
 

-            28
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
*** syncing sortsmill
 

-            29
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
!!! failed syncing sortsmill
 

-            30
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            31
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            32
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            33
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            34
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            35
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            36
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            37
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            38
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            39
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            40
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            41
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            42
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            43
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            44
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            45
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            46
WARNING:pkgcore:sogo-connector repo at '/var/lib/repo-mirror-ci/sync/sogo-connector', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            47
abort: HTTP Error 404: Not Found
-

-            48
*** syncing sortsmill
-

-            49
!!! failed syncing sortsmill
-

-            50
 * Sync failed with 1
+            30
 * Sync failed with 1
 
[FATAL]
 
         
diff --git a/sortsmill.txt b/sortsmill.txt
index ab8d5ddce57d..dff60b574bf7 100644
--- a/sortsmill.txt
+++ b/sortsmill.txt
@@ -14,36 +14,16 @@
  'status': 'unofficial'}
  * Adding new repository
 $ pmaint sync sortsmill
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sogo-connector repo at '/var/lib/repo-mirror-ci/sync/sogo-connector', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 abort: HTTP Error 404: Not Found
 *** syncing sortsmill
 !!! failed syncing sortsmill
diff --git a/spikyatlinux.html b/spikyatlinux.html
index fb3c218d0805..ea9dcc245943 100644
--- a/spikyatlinux.html
+++ b/spikyatlinux.html
@@ -34,77 +34,57 @@
 

             12
$ pmaint sync spikyatlinux
 

-            13
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
warning: Pulling without specifying how to reconcile divergent branches is
 

-            19
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
discouraged. You can squelch this message by running one of the following
 

-            20
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
commands sometime before your next pull:
 

-            21
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
 

-            22
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase false  # merge (the default strategy)
 

-            23
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase true   # rebase
 

-            24
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.ff only       # fast-forward only
 

-            25
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 

-            26
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
You can replace "git config" with "git config --global" to set a default
 

-            27
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            28
warning: Pulling without specifying how to reconcile divergent branches is
+            28
or --ff-only on the command line to override the configured default per
 

-            29
discouraged. You can squelch this message by running one of the following
+            29
invocation.
 

-            30
commands sometime before your next pull:
+            30
 

-            31
+            31
Already up to date.
 

-            32
  git config pull.rebase false  # merge (the default strategy)
+            32
*** syncing spikyatlinux
 

-            33
  git config pull.rebase true   # rebase
+            33
*** synced spikyatlinux
 

-            34
  git config pull.ff only       # fast-forward only
+            34
 * Sync succeeded
 

-            35
+            35
$ git log --format=%ci -1
 

-            36
You can replace "git config" with "git config --global" to set a default
+            36
$ git show -q --pretty=format:%G? HEAD
 

-            37
preference for all repositories. You can also pass --rebase, --no-rebase,
+            37
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 spikyatlinux
 

-            38
or --ff-only on the command line to override the configured default per
-

-            39
invocation.
-

-            40
-

-            41
Already up to date.
-

-            42
*** syncing spikyatlinux
-

-            43
*** synced spikyatlinux
-

-            44
 * Sync succeeded
-

-            45
$ git log --format=%ci -1
-

-            46
$ git show -q --pretty=format:%G? HEAD
-

-            47
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 spikyatlinux
-

-            48
 * Cache regenerated successfully
+            38
 * Cache regenerated successfully
 

 
         
diff --git a/spikyatlinux.txt b/spikyatlinux.txt
index 40dabeb825db..76b8c770c027 100644
--- a/spikyatlinux.txt
+++ b/spikyatlinux.txt
@@ -10,21 +10,11 @@
              'uri': 'https://github.com/spikyatlinux/ebuilds_for_gentoo.git'}],
  'status': 'unofficial'}
 $ pmaint sync spikyatlinux
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/sping.html b/sping.html
index bf37fbcf145a..873eae1db5ca 100644
--- a/sping.html
+++ b/sping.html
@@ -44,77 +44,57 @@
 

             17
$ pmaint sync sping
 

-            18
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            23
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
warning: Pulling without specifying how to reconcile divergent branches is
 

-            24
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
discouraged. You can squelch this message by running one of the following
 

-            25
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
commands sometime before your next pull:
 

-            26
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
 

-            27
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.rebase false  # merge (the default strategy)
 

-            28
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
  git config pull.rebase true   # rebase
 

-            29
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
  git config pull.ff only       # fast-forward only
 

-            30
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
 

-            31
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
You can replace "git config" with "git config --global" to set a default
 

-            32
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            33
warning: Pulling without specifying how to reconcile divergent branches is
+            33
or --ff-only on the command line to override the configured default per
 

-            34
discouraged. You can squelch this message by running one of the following
+            34
invocation.
 

-            35
commands sometime before your next pull:
+            35
 

-            36
+            36
Already up to date.
 

-            37
  git config pull.rebase false  # merge (the default strategy)
+            37
*** syncing sping
 

-            38
  git config pull.rebase true   # rebase
+            38
*** synced sping
 

-            39
  git config pull.ff only       # fast-forward only
+            39
 * Sync succeeded
 

-            40
+            40
$ git log --format=%ci -1
 

-            41
You can replace "git config" with "git config --global" to set a default
+            41
$ git show -q --pretty=format:%G? HEAD
 

-            42
preference for all repositories. You can also pass --rebase, --no-rebase,
+            42
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 sping
 

-            43
or --ff-only on the command line to override the configured default per
-

-            44
invocation.
-

-            45
-

-            46
Already up to date.
-

-            47
*** syncing sping
-

-            48
*** synced sping
-

-            49
 * Sync succeeded
-

-            50
$ git log --format=%ci -1
-

-            51
$ git show -q --pretty=format:%G? HEAD
-

-            52
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 sping
-

-            53
 * Cache regenerated successfully
+            43
 * Cache regenerated successfully
 

 
         
diff --git a/sping.txt b/sping.txt
index 5bb171517af0..2b77d1db438c 100644
--- a/sping.txt
+++ b/sping.txt
@@ -15,21 +15,11 @@
              'uri': 'git@github.com:hartwork/gentoo-overlay-sping.git'}],
  'status': 'official'}
 $ pmaint sync sping
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/squeezebox.html b/squeezebox.html
index 1f910f8eccb6..401b47daca9f 100644
--- a/squeezebox.html
+++ b/squeezebox.html
@@ -46,76 +46,42 @@
 

             18
$ pmaint sync squeezebox
 

-            19
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            23
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            24
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            25
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            26
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            27
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            28
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            29
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
Cloning into '/var/lib/repo-mirror-ci/sync/squeezebox'...
 

-            30
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
*** syncing squeezebox
 

-            31
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
*** synced squeezebox
 

-            32
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
 * Sync succeeded
 

-            33
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
$ git log --format=%ci -1
 

-            34
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
$ git show -q --pretty=format:%G? HEAD
 

-            35
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 squeezebox
 

-            36
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
 * Cache regenerated successfully
 

-            37
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            38
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            39
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            40
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            41
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            42
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            43
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            44
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            45
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            46
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            47
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            48
WARNING:pkgcore:sogo-connector repo at '/var/lib/repo-mirror-ci/sync/sogo-connector', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            49
Cloning into '/var/lib/repo-mirror-ci/sync/squeezebox'...
-

-            50
fatal: unable to access 'https://anongit.gentoo.org/git/user/squeezebox.git/': The requested URL returned error: 504
-

-            51
*** syncing squeezebox
-

-            52
!!! failed syncing squeezebox
-

-            53
 * Sync failed with 1
-
[FATAL]
 
         
     
diff --git a/squeezebox.txt b/squeezebox.txt
index 177aaadb2f9d..1fa37c42add0 100644
--- a/squeezebox.txt
+++ b/squeezebox.txt
@@ -16,38 +16,21 @@
  'status': 'unofficial'}
  * Adding new repository
 $ pmaint sync squeezebox
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sogo-connector repo at '/var/lib/repo-mirror-ci/sync/sogo-connector', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 Cloning into '/var/lib/repo-mirror-ci/sync/squeezebox'...
-fatal: unable to access 'https://anongit.gentoo.org/git/user/squeezebox.git/': The requested URL returned error: 504
 *** syncing squeezebox
-!!! failed syncing squeezebox
- * Sync failed with 1
+*** synced squeezebox
+ * Sync succeeded
+$ git log --format=%ci -1
+$ git show -q --pretty=format:%G? HEAD
+$ pmaint regen --use-local-desc --pkg-desc-index -t 1 squeezebox
+ * Cache regenerated successfully
diff --git a/src_prepare-overlay.html b/src_prepare-overlay.html
index 0ea0b7833aed..0a909f8328d2 100644
--- a/src_prepare-overlay.html
+++ b/src_prepare-overlay.html
@@ -34,115 +34,155 @@
 

             12
$ pmaint sync src_prepare-overlay
 

-            13
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
warning: Pulling without specifying how to reconcile divergent branches is
 

-            19
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
discouraged. You can squelch this message by running one of the following
 

-            20
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
commands sometime before your next pull:
 

-            21
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
 

-            22
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase false  # merge (the default strategy)
 

-            23
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase true   # rebase
 

-            24
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.ff only       # fast-forward only
 

-            25
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 

-            26
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
You can replace "git config" with "git config --global" to set a default
 

-            27
WARNING:pkgcore:sogo-connector repo at '/var/lib/repo-mirror-ci/sync/sogo-connector', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            28
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
or --ff-only on the command line to override the configured default per
 

-            29
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
invocation.
 

-            30
warning: Pulling without specifying how to reconcile divergent branches is
+            30
 

-            31
discouraged. You can squelch this message by running one of the following
+            31
From https://gitlab.com/src_prepare/src_prepare-overlay
 

-            32
commands sometime before your next pull:
+            32
   007a7a0..01071af  master     -> origin/master
 

-            33
+            33
Updating 007a7a0..01071af
 

-            34
  git config pull.rebase false  # merge (the default strategy)
+            34
Fast-forward
 

-            35
  git config pull.rebase true   # rebase
+            35
 app-admin/grub-customizer/grub-customizer-5.1.0.ebuild                  | 2 +-
 

-            36
  git config pull.ff only       # fast-forward only
+            36
 app-admin/grub-customizer/grub-customizer-9999.ebuild                   | 2 +-
 

-            37
+            37
 app-editors/howl/howl-0.6.ebuild                                        | 2 +-
 

-            38
You can replace "git config" with "git config --global" to set a default
+            38
 app-editors/howl/howl-9999.ebuild                                       | 2 +-
 

-            39
preference for all repositories. You can also pass --rebase, --no-rebase,
+            39
 app-editors/lite/lite-1.11-r1.ebuild                                    | 2 +-
 

-            40
or --ff-only on the command line to override the configured default per
+            40
 app-editors/lite/lite-9999.ebuild                                       | 2 +-
 

-            41
invocation.
+            41
 app-portage/src_prepare-scripts/src_prepare-scripts-9999.ebuild         | 2 +-
 

-            42
+            42
 dev-games/godot/godot-3.2.3.ebuild                                      | 2 +-
 

-            43
From https://gitlab.com/src_prepare/src_prepare-overlay
+            43
 dev-libs/libQtOlm/libQtOlm-3.0.1.ebuild                                 | 2 +-
 

-            44
   18e8939..007a7a0  master     -> origin/master
+            44
 dev-libs/libQtOlm/libQtOlm-9999.ebuild                                  | 2 +-
 

-            45
Updating 18e8939..007a7a0
+            45
 dev-libs/libQuotient/libQuotient-0.6.0.ebuild                           | 2 +-
 

-            46
Fast-forward
+            46
 dev-libs/libQuotient/libQuotient-0.6.1.ebuild                           | 2 +-
 

-            47
 app-portage/euscan-ng/Manifest               |  1 +
+            47
 dev-libs/libQuotient/libQuotient-9999.ebuild                            | 2 +-
 

-            48
 app-portage/euscan-ng/euscan-ng-1.0.0.ebuild | 47 ++++++++++++++++++++++++++++
+            48
 dev-scheme/guile-colorized/guile-colorized-9999.ebuild                  | 2 +-
 

-            49
 app-portage/euscan-ng/euscan-ng-9999.ebuild  |  3 +-
+            49
 games-emulation/melonds/melonds-0.8.3.ebuild                            | 2 +-
 

-            50
 app-portage/gen-pkgs/Manifest                |  1 +
+            50
 games-emulation/melonds/melonds-0.9.ebuild                              | 2 +-
 

-            51
 app-portage/gen-pkgs/gen-pkgs-1.0.0.ebuild   | 33 +++++++++++++++++++
+            51
 games-emulation/melonds/melonds-9999.ebuild                             | 2 +-
 

-            52
 app-portage/gen-pkgs/gen-pkgs-9999.ebuild    |  2 --
+            52
 games-fps/darkplaces/darkplaces-20170829_beta1.ebuild                   | 2 +-
 

-            53
 net-firewall/hblock/hblock-2.1.5.ebuild      |  3 +-
+            53
 games-strategy/mindustry/mindustry-106.ebuild                           | 2 +-
 

-            54
 net-firewall/hblock/hblock-2.1.7.ebuild      |  3 +-
+            54
 games-strategy/mindustry/mindustry-107.ebuild                           | 2 +-
 

-            55
 net-firewall/hblock/hblock-9999.ebuild       |  3 +-
+            55
 games-strategy/mindustry/mindustry-108.ebuild                           | 2 +-
 

-            56
 9 files changed, 86 insertions(+), 10 deletions(-)
+            56
 media-fonts/spleen/spleen-1.7.0.ebuild                                  | 2 +-
 

-            57
 create mode 100644 app-portage/euscan-ng/Manifest
+            57
 media-fonts/spleen/spleen-9999.ebuild                                   | 2 +-
 

-            58
 create mode 100644 app-portage/euscan-ng/euscan-ng-1.0.0.ebuild
+            58
 media-video/tartube/tartube-2.0.0.ebuild                                | 2 +-
 

-            59
 create mode 100644 app-portage/gen-pkgs/Manifest
+            59
 media-video/tartube/tartube-2.1.0.ebuild                                | 2 +-
 

-            60
 create mode 100644 app-portage/gen-pkgs/gen-pkgs-1.0.0.ebuild
+            60
 media-video/tartube/tartube-2.2.007.ebuild                              | 2 +-
 

-            61
*** syncing src_prepare-overlay
+            61
 media-video/tartube/tartube-9999.ebuild                                 | 2 +-
 

-            62
*** synced src_prepare-overlay
+            62
 net-analyzer/nutty/nutty-1.1.1.ebuild                                   | 2 +-
 

-            63
 * Sync succeeded
+            63
 net-analyzer/nutty/nutty-9999.ebuild                                    | 2 +-
 

-            64
$ git log --format=%ci -1
+            64
 net-im/srain/srain-1.0.2.ebuild                                         | 2 +-
 

-            65
$ git show -q --pretty=format:%G? HEAD
+            65
 net-im/srain/srain-9999.ebuild                                          | 2 +-
 

-            66
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 src_prepare-overlay
+            66
 net-misc/jftui/jftui-0.4.0.ebuild                                       | 2 +-
 

-            67
 * Cache regenerated successfully
+            67
 sys-boot/rpi-imager/rpi-imager-1.2.ebuild                               | 2 +-
+

+            68
 sys-boot/rpi-imager/rpi-imager-1.4.ebuild                               | 2 +-
+

+            69
 sys-boot/rpi-imager/rpi-imager-9999.ebuild                              | 2 +-
+

+            70
 www-client/brave-bin/brave-bin-1.12.77.ebuild                           | 2 +-
+

+            71
 www-client/brave-bin/brave-bin-1.12.78.ebuild                           | 2 +-
+

+            72
 www-client/icecat/icecat-68.7.0-r1.ebuild                               | 2 +-
+

+            73
 .../ungoogled-chromium-bin/ungoogled-chromium-bin-85.0.4183.102.ebuild  | 2 +-
+

+            74
 www-client/waterfox/waterfox-2020.07.1.ebuild                           | 2 +-
+

+            75
 www-client/waterfox/waterfox-2020.07.2.ebuild                           | 2 +-
+

+            76
 www-client/waterfox/waterfox-2020.09.ebuild                             | 2 +-
+

+            77
 www-servers/jellyfin-bin/jellyfin-bin-10.6.4.ebuild                     | 2 +-
+

+            78
 x11-terms/xst/xst-9999.ebuild                                           | 2 +-
+

+            79
 44 files changed, 44 insertions(+), 44 deletions(-)
+

+            80
*** syncing src_prepare-overlay
+

+            81
*** synced src_prepare-overlay
+

+            82
 * Sync succeeded
+

+            83
$ git log --format=%ci -1
+

+            84
$ git show -q --pretty=format:%G? HEAD
+

+            85
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 src_prepare-overlay
+

+            86
 * net-misc/jftui-0.4.0: failed sourcing ebuild: inherit: missing eclass argument
+
[FATAL]
+            87
 * Cache regen failed with 1
 

 
         
diff --git a/src_prepare-overlay.txt b/src_prepare-overlay.txt
index d568b338856a..e8a5335b4546 100644
--- a/src_prepare-overlay.txt
+++ b/src_prepare-overlay.txt
@@ -10,23 +10,11 @@
              'uri': 'git+ssh://git@gitlab.com/src_prepare/src_prepare-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync src_prepare-overlay
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sogo-connector repo at '/var/lib/repo-mirror-ci/sync/sogo-connector', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
@@ -41,27 +29,59 @@ or --ff-only on the command line to override the configured default per
 invocation.
 
 From https://gitlab.com/src_prepare/src_prepare-overlay
-   18e8939..007a7a0  master     -> origin/master
-Updating 18e8939..007a7a0
+   007a7a0..01071af  master     -> origin/master
+Updating 007a7a0..01071af
 Fast-forward
- app-portage/euscan-ng/Manifest               |  1 +
- app-portage/euscan-ng/euscan-ng-1.0.0.ebuild | 47 ++++++++++++++++++++++++++++
- app-portage/euscan-ng/euscan-ng-9999.ebuild  |  3 +-
- app-portage/gen-pkgs/Manifest                |  1 +
- app-portage/gen-pkgs/gen-pkgs-1.0.0.ebuild   | 33 +++++++++++++++++++
- app-portage/gen-pkgs/gen-pkgs-9999.ebuild    |  2 --
- net-firewall/hblock/hblock-2.1.5.ebuild      |  3 +-
- net-firewall/hblock/hblock-2.1.7.ebuild      |  3 +-
- net-firewall/hblock/hblock-9999.ebuild       |  3 +-
- 9 files changed, 86 insertions(+), 10 deletions(-)
- create mode 100644 app-portage/euscan-ng/Manifest
- create mode 100644 app-portage/euscan-ng/euscan-ng-1.0.0.ebuild
- create mode 100644 app-portage/gen-pkgs/Manifest
- create mode 100644 app-portage/gen-pkgs/gen-pkgs-1.0.0.ebuild
+ app-admin/grub-customizer/grub-customizer-5.1.0.ebuild                  | 2 +-
+ app-admin/grub-customizer/grub-customizer-9999.ebuild                   | 2 +-
+ app-editors/howl/howl-0.6.ebuild                                        | 2 +-
+ app-editors/howl/howl-9999.ebuild                                       | 2 +-
+ app-editors/lite/lite-1.11-r1.ebuild                                    | 2 +-
+ app-editors/lite/lite-9999.ebuild                                       | 2 +-
+ app-portage/src_prepare-scripts/src_prepare-scripts-9999.ebuild         | 2 +-
+ dev-games/godot/godot-3.2.3.ebuild                                      | 2 +-
+ dev-libs/libQtOlm/libQtOlm-3.0.1.ebuild                                 | 2 +-
+ dev-libs/libQtOlm/libQtOlm-9999.ebuild                                  | 2 +-
+ dev-libs/libQuotient/libQuotient-0.6.0.ebuild                           | 2 +-
+ dev-libs/libQuotient/libQuotient-0.6.1.ebuild                           | 2 +-
+ dev-libs/libQuotient/libQuotient-9999.ebuild                            | 2 +-
+ dev-scheme/guile-colorized/guile-colorized-9999.ebuild                  | 2 +-
+ games-emulation/melonds/melonds-0.8.3.ebuild                            | 2 +-
+ games-emulation/melonds/melonds-0.9.ebuild                              | 2 +-
+ games-emulation/melonds/melonds-9999.ebuild                             | 2 +-
+ games-fps/darkplaces/darkplaces-20170829_beta1.ebuild                   | 2 +-
+ games-strategy/mindustry/mindustry-106.ebuild                           | 2 +-
+ games-strategy/mindustry/mindustry-107.ebuild                           | 2 +-
+ games-strategy/mindustry/mindustry-108.ebuild                           | 2 +-
+ media-fonts/spleen/spleen-1.7.0.ebuild                                  | 2 +-
+ media-fonts/spleen/spleen-9999.ebuild                                   | 2 +-
+ media-video/tartube/tartube-2.0.0.ebuild                                | 2 +-
+ media-video/tartube/tartube-2.1.0.ebuild                                | 2 +-
+ media-video/tartube/tartube-2.2.007.ebuild                              | 2 +-
+ media-video/tartube/tartube-9999.ebuild                                 | 2 +-
+ net-analyzer/nutty/nutty-1.1.1.ebuild                                   | 2 +-
+ net-analyzer/nutty/nutty-9999.ebuild                                    | 2 +-
+ net-im/srain/srain-1.0.2.ebuild                                         | 2 +-
+ net-im/srain/srain-9999.ebuild                                          | 2 +-
+ net-misc/jftui/jftui-0.4.0.ebuild                                       | 2 +-
+ sys-boot/rpi-imager/rpi-imager-1.2.ebuild                               | 2 +-
+ sys-boot/rpi-imager/rpi-imager-1.4.ebuild                               | 2 +-
+ sys-boot/rpi-imager/rpi-imager-9999.ebuild                              | 2 +-
+ www-client/brave-bin/brave-bin-1.12.77.ebuild                           | 2 +-
+ www-client/brave-bin/brave-bin-1.12.78.ebuild                           | 2 +-
+ www-client/icecat/icecat-68.7.0-r1.ebuild                               | 2 +-
+ .../ungoogled-chromium-bin/ungoogled-chromium-bin-85.0.4183.102.ebuild  | 2 +-
+ www-client/waterfox/waterfox-2020.07.1.ebuild                           | 2 +-
+ www-client/waterfox/waterfox-2020.07.2.ebuild                           | 2 +-
+ www-client/waterfox/waterfox-2020.09.ebuild                             | 2 +-
+ www-servers/jellyfin-bin/jellyfin-bin-10.6.4.ebuild                     | 2 +-
+ x11-terms/xst/xst-9999.ebuild                                           | 2 +-
+ 44 files changed, 44 insertions(+), 44 deletions(-)
 *** syncing src_prepare-overlay
 *** synced src_prepare-overlay
  * Sync succeeded
 $ git log --format=%ci -1
 $ git show -q --pretty=format:%G? HEAD
 $ pmaint regen --use-local-desc --pkg-desc-index -t 1 src_prepare-overlay
- * Cache regenerated successfully
+ * net-misc/jftui-0.4.0: failed sourcing ebuild: inherit: missing eclass argument
+ * Cache regen failed with 1
diff --git a/ssnb.html b/ssnb.html
index 039ae176d0c5..388536ae9388 100644
--- a/ssnb.html
+++ b/ssnb.html
@@ -38,89 +38,59 @@
 

             14
 'status': 'unofficial'}
 

-            15
 * Adding new repository
+            15
$ pmaint sync ssnb
 

-            16
$ pmaint sync ssnb
+            16
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
warning: Pulling without specifying how to reconcile divergent branches is
 

-            22
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
discouraged. You can squelch this message by running one of the following
 

-            23
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
commands sometime before your next pull:
 

-            24
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 

-            25
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase false  # merge (the default strategy)
 

-            26
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.rebase true   # rebase
 

-            27
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.ff only       # fast-forward only
 

-            28
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
 

-            29
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
You can replace "git config" with "git config --global" to set a default
 

-            30
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            31
WARNING:pkgcore:sogo-connector repo at '/var/lib/repo-mirror-ci/sync/sogo-connector', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
or --ff-only on the command line to override the configured default per
 

-            32
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
invocation.
 

-            33
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
 

-            34
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
Already up to date.
 

-            35
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
*** syncing ssnb
 

-            36
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
*** synced ssnb
 

-            37
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            37
 * Sync succeeded
 

-            38
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            38
$ git log --format=%ci -1
 

-            39
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            39
$ git show -q --pretty=format:%G? HEAD
 

-            40
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            40
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 ssnb
 

-            41
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            42
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            43
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            44
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            45
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            46
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            47
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            48
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            49
Cloning into '/var/lib/repo-mirror-ci/sync/ssnb'...
-

-            50
*** syncing ssnb
-

-            51
*** synced ssnb
-

-            52
 * Sync succeeded
-

-            53
$ git log --format=%ci -1
-

-            54
$ git show -q --pretty=format:%G? HEAD
-

-            55
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 ssnb
-

-            56
 * Cache regenerated successfully
+            41
 * Cache regenerated successfully
 

 
         
diff --git a/ssnb.txt b/ssnb.txt
index 8f88e0cd34c4..9d99878c0e21 100644
--- a/ssnb.txt
+++ b/ssnb.txt
@@ -12,41 +12,26 @@
             {'type': 'git',
              'uri': 'git+ssh://git@git.gentoo.org/repo/user/ssnb.git'}],
  'status': 'unofficial'}
- * Adding new repository
 $ pmaint sync ssnb
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sogo-connector repo at '/var/lib/repo-mirror-ci/sync/sogo-connector', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-Cloning into '/var/lib/repo-mirror-ci/sync/ssnb'...
+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.
+
+Already up to date.
 *** syncing ssnb
 *** synced ssnb
  * Sync succeeded
diff --git a/sspreitz.html b/sspreitz.html
index 90f9afefe558..6e81b758ba95 100644
--- a/sspreitz.html
+++ b/sspreitz.html
@@ -42,81 +42,57 @@
 

             16
$ pmaint sync sspreitz
 

-            17
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
warning: Pulling without specifying how to reconcile divergent branches is
 

-            23
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
discouraged. You can squelch this message by running one of the following
 

-            24
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
commands sometime before your next pull:
 

-            25
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 

-            26
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.rebase false  # merge (the default strategy)
 

-            27
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.rebase true   # rebase
 

-            28
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
  git config pull.ff only       # fast-forward only
 

-            29
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
 

-            30
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
You can replace "git config" with "git config --global" to set a default
 

-            31
WARNING:pkgcore:sogo-connector repo at '/var/lib/repo-mirror-ci/sync/sogo-connector', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            32
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
or --ff-only on the command line to override the configured default per
 

-            33
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
invocation.
 

-            34
warning: Pulling without specifying how to reconcile divergent branches is
+            34
 

-            35
discouraged. You can squelch this message by running one of the following
+            35
Already up to date.
 

-            36
commands sometime before your next pull:
+            36
*** syncing sspreitz
 

-            37
+            37
*** synced sspreitz
 

-            38
  git config pull.rebase false  # merge (the default strategy)
+            38
 * Sync succeeded
 

-            39
  git config pull.rebase true   # rebase
+            39
$ git log --format=%ci -1
 

-            40
  git config pull.ff only       # fast-forward only
+            40
$ git show -q --pretty=format:%G? HEAD
 

-            41
+            41
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 sspreitz
 

-            42
You can replace "git config" with "git config --global" to set a default
-

-            43
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            44
or --ff-only on the command line to override the configured default per
-

-            45
invocation.
-

-            46
-

-            47
Already up to date.
-

-            48
*** syncing sspreitz
-

-            49
*** synced sspreitz
-

-            50
 * Sync succeeded
-

-            51
$ git log --format=%ci -1
-

-            52
$ git show -q --pretty=format:%G? HEAD
-

-            53
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 sspreitz
-

-            54
 * Cache regenerated successfully
+            42
 * Cache regenerated successfully
 

 
         
diff --git a/sspreitz.txt b/sspreitz.txt
index 0fb6307b070e..776a96b6e33f 100644
--- a/sspreitz.txt
+++ b/sspreitz.txt
@@ -14,23 +14,11 @@
              'uri': 'git@github.com:sspreitzer/gentoo-repo.git'}],
  'status': 'unofficial'}
 $ pmaint sync sspreitz
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sogo-connector repo at '/var/lib/repo-mirror-ci/sync/sogo-connector', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/steam-overlay.html b/steam-overlay.html
index f729159974e9..dedbf760f546 100644
--- a/steam-overlay.html
+++ b/steam-overlay.html
@@ -38,81 +38,57 @@
 

             14
$ pmaint sync steam-overlay
 

-            15
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
warning: Pulling without specifying how to reconcile divergent branches is
 

-            21
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
discouraged. You can squelch this message by running one of the following
 

-            22
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
commands sometime before your next pull:
 

-            23
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
 

-            24
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.rebase false  # merge (the default strategy)
 

-            25
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase true   # rebase
 

-            26
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.ff only       # fast-forward only
 

-            27
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
 

-            28
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
You can replace "git config" with "git config --global" to set a default
 

-            29
WARNING:pkgcore:sogo-connector repo at '/var/lib/repo-mirror-ci/sync/sogo-connector', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            30
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
or --ff-only on the command line to override the configured default per
 

-            31
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
invocation.
 

-            32
warning: Pulling without specifying how to reconcile divergent branches is
+            32
 

-            33
discouraged. You can squelch this message by running one of the following
+            33
Already up to date.
 

-            34
commands sometime before your next pull:
+            34
*** syncing steam-overlay
 

-            35
+            35
*** synced steam-overlay
 

-            36
  git config pull.rebase false  # merge (the default strategy)
+            36
 * Sync succeeded
 

-            37
  git config pull.rebase true   # rebase
+            37
$ git log --format=%ci -1
 

-            38
  git config pull.ff only       # fast-forward only
+            38
$ git show -q --pretty=format:%G? HEAD
 

-            39
+            39
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 steam-overlay
 

-            40
You can replace "git config" with "git config --global" to set a default
-

-            41
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            42
or --ff-only on the command line to override the configured default per
-

-            43
invocation.
-

-            44
-

-            45
Already up to date.
-

-            46
*** syncing steam-overlay
-

-            47
*** synced steam-overlay
-

-            48
 * Sync succeeded
-

-            49
$ git log --format=%ci -1
-

-            50
$ git show -q --pretty=format:%G? HEAD
-

-            51
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 steam-overlay
-

-            52
 * Cache regenerated successfully
+            40
 * Cache regenerated successfully
 

 
         
diff --git a/steam-overlay.txt b/steam-overlay.txt
index 60e99f964d32..1d7b87480722 100644
--- a/steam-overlay.txt
+++ b/steam-overlay.txt
@@ -12,23 +12,11 @@
             {'type': 'git', 'uri': 'git@github.com:anyc/steam-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync steam-overlay
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sogo-connector repo at '/var/lib/repo-mirror-ci/sync/sogo-connector', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/stefantalpalaru.html b/stefantalpalaru.html
index d644cd15d0e2..c909d7b21ec1 100644
--- a/stefantalpalaru.html
+++ b/stefantalpalaru.html
@@ -44,81 +44,57 @@
 

             17
$ pmaint sync stefantalpalaru
 

-            18
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            23
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
warning: Pulling without specifying how to reconcile divergent branches is
 

-            24
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
discouraged. You can squelch this message by running one of the following
 

-            25
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
commands sometime before your next pull:
 

-            26
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
 

-            27
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.rebase false  # merge (the default strategy)
 

-            28
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
  git config pull.rebase true   # rebase
 

-            29
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
  git config pull.ff only       # fast-forward only
 

-            30
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
 

-            31
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
You can replace "git config" with "git config --global" to set a default
 

-            32
WARNING:pkgcore:sogo-connector repo at '/var/lib/repo-mirror-ci/sync/sogo-connector', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            33
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
or --ff-only on the command line to override the configured default per
 

-            34
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
invocation.
 

-            35
warning: Pulling without specifying how to reconcile divergent branches is
+            35
 

-            36
discouraged. You can squelch this message by running one of the following
+            36
Already up to date.
 

-            37
commands sometime before your next pull:
+            37
*** syncing stefantalpalaru
 

-            38
+            38
*** synced stefantalpalaru
 

-            39
  git config pull.rebase false  # merge (the default strategy)
+            39
 * Sync succeeded
 

-            40
  git config pull.rebase true   # rebase
+            40
$ git log --format=%ci -1
 

-            41
  git config pull.ff only       # fast-forward only
+            41
$ git show -q --pretty=format:%G? HEAD
 

-            42
+            42
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 stefantalpalaru
 

-            43
You can replace "git config" with "git config --global" to set a default
-

-            44
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            45
or --ff-only on the command line to override the configured default per
-

-            46
invocation.
-

-            47
-

-            48
Already up to date.
-

-            49
*** syncing stefantalpalaru
-

-            50
*** synced stefantalpalaru
-

-            51
 * Sync succeeded
-

-            52
$ git log --format=%ci -1
-

-            53
$ git show -q --pretty=format:%G? HEAD
-

-            54
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 stefantalpalaru
-

-            55
 * Cache regenerated successfully
+            43
 * Cache regenerated successfully
 

 
         
diff --git a/stefantalpalaru.txt b/stefantalpalaru.txt
index 6fc4ddc54ac2..cb9bc7f75d93 100644
--- a/stefantalpalaru.txt
+++ b/stefantalpalaru.txt
@@ -15,23 +15,11 @@
              'uri': 'git@github.com:stefantalpalaru/gentoo-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync stefantalpalaru
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sogo-connector repo at '/var/lib/repo-mirror-ci/sync/sogo-connector', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/stha09.html b/stha09.html
index 4c054a2bb660..a90af5753819 100644
--- a/stha09.html
+++ b/stha09.html
@@ -36,79 +36,57 @@
 

             13
$ pmaint sync stha09
 

-            14
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
warning: Pulling without specifying how to reconcile divergent branches is
 

-            20
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
discouraged. You can squelch this message by running one of the following
 

-            21
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
commands sometime before your next pull:
 

-            22
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
 

-            23
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase false  # merge (the default strategy)
 

-            24
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.rebase true   # rebase
 

-            25
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.ff only       # fast-forward only
 

-            26
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
 

-            27
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
You can replace "git config" with "git config --global" to set a default
 

-            28
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            29
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
or --ff-only on the command line to override the configured default per
 

-            30
warning: Pulling without specifying how to reconcile divergent branches is
+            30
invocation.
 

-            31
discouraged. You can squelch this message by running one of the following
+            31
 

-            32
commands sometime before your next pull:
+            32
Already up to date.
 

-            33
+            33
*** syncing stha09
 

-            34
  git config pull.rebase false  # merge (the default strategy)
+            34
*** synced stha09
 

-            35
  git config pull.rebase true   # rebase
+            35
 * Sync succeeded
 

-            36
  git config pull.ff only       # fast-forward only
+            36
$ git log --format=%ci -1
 

-            37
+            37
$ git show -q --pretty=format:%G? HEAD
 

-            38
You can replace "git config" with "git config --global" to set a default
+            38
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 stha09
 

-            39
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            40
or --ff-only on the command line to override the configured default per
-

-            41
invocation.
-

-            42
-

-            43
Already up to date.
-

-            44
*** syncing stha09
-

-            45
*** synced stha09
-

-            46
 * Sync succeeded
-

-            47
$ git log --format=%ci -1
-

-            48
$ git show -q --pretty=format:%G? HEAD
-

-            49
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 stha09
-

-            50
 * Cache regenerated successfully
+            39
 * Cache regenerated successfully
 

 
         
diff --git a/stha09.txt b/stha09.txt
index 676ee0040188..55d2b53fb3bc 100644
--- a/stha09.txt
+++ b/stha09.txt
@@ -11,22 +11,11 @@
             {'type': 'git', 'uri': 'git@github.com:stha09/gpo-stha09.git'}],
  'status': 'unofficial'}
 $ pmaint sync stha09
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/stowe-verlay.html b/stowe-verlay.html
index bf621ce0b3f5..3744f1427b0a 100644
--- a/stowe-verlay.html
+++ b/stowe-verlay.html
@@ -40,79 +40,57 @@
 

             15
$ pmaint sync stowe-verlay
 

-            16
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
warning: Pulling without specifying how to reconcile divergent branches is
 

-            22
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
discouraged. You can squelch this message by running one of the following
 

-            23
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
commands sometime before your next pull:
 

-            24
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 

-            25
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase false  # merge (the default strategy)
 

-            26
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.rebase true   # rebase
 

-            27
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.ff only       # fast-forward only
 

-            28
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
 

-            29
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
You can replace "git config" with "git config --global" to set a default
 

-            30
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            31
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
or --ff-only on the command line to override the configured default per
 

-            32
warning: Pulling without specifying how to reconcile divergent branches is
+            32
invocation.
 

-            33
discouraged. You can squelch this message by running one of the following
+            33
 

-            34
commands sometime before your next pull:
+            34
Already up to date.
 

-            35
+            35
*** syncing stowe-verlay
 

-            36
  git config pull.rebase false  # merge (the default strategy)
+            36
*** synced stowe-verlay
 

-            37
  git config pull.rebase true   # rebase
+            37
 * Sync succeeded
 

-            38
  git config pull.ff only       # fast-forward only
+            38
$ git log --format=%ci -1
 

-            39
+            39
$ git show -q --pretty=format:%G? HEAD
 

-            40
You can replace "git config" with "git config --global" to set a default
+            40
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 stowe-verlay
 

-            41
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            42
or --ff-only on the command line to override the configured default per
-

-            43
invocation.
-

-            44
-

-            45
Already up to date.
-

-            46
*** syncing stowe-verlay
-

-            47
*** synced stowe-verlay
-

-            48
 * Sync succeeded
-

-            49
$ git log --format=%ci -1
-

-            50
$ git show -q --pretty=format:%G? HEAD
-

-            51
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 stowe-verlay
-

-            52
 * Cache regenerated successfully
+            41
 * Cache regenerated successfully
 

 
         
diff --git a/stowe-verlay.txt b/stowe-verlay.txt
index 15252b3dc3cf..6f4767c334c3 100644
--- a/stowe-verlay.txt
+++ b/stowe-verlay.txt
@@ -13,22 +13,11 @@
              'uri': 'https://github.com/mwstowe/stowe-verlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync stowe-verlay
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/strohel.html b/strohel.html
index 0bcef42fc5a0..39f4dff3725a 100644
--- a/strohel.html
+++ b/strohel.html
@@ -42,81 +42,57 @@
 

             16
$ pmaint sync strohel
 

-            17
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
warning: Pulling without specifying how to reconcile divergent branches is
 

-            23
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
discouraged. You can squelch this message by running one of the following
 

-            24
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
commands sometime before your next pull:
 

-            25
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 

-            26
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.rebase false  # merge (the default strategy)
 

-            27
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.rebase true   # rebase
 

-            28
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
  git config pull.ff only       # fast-forward only
 

-            29
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
 

-            30
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
You can replace "git config" with "git config --global" to set a default
 

-            31
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            32
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
or --ff-only on the command line to override the configured default per
 

-            33
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
invocation.
 

-            34
warning: Pulling without specifying how to reconcile divergent branches is
+            34
 

-            35
discouraged. You can squelch this message by running one of the following
+            35
Already up to date.
 

-            36
commands sometime before your next pull:
+            36
*** syncing strohel
 

-            37
+            37
*** synced strohel
 

-            38
  git config pull.rebase false  # merge (the default strategy)
+            38
 * Sync succeeded
 

-            39
  git config pull.rebase true   # rebase
+            39
$ git log --format=%ci -1
 

-            40
  git config pull.ff only       # fast-forward only
+            40
$ git show -q --pretty=format:%G? HEAD
 

-            41
+            41
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 strohel
 

-            42
You can replace "git config" with "git config --global" to set a default
-

-            43
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            44
or --ff-only on the command line to override the configured default per
-

-            45
invocation.
-

-            46
-

-            47
Already up to date.
-

-            48
*** syncing strohel
-

-            49
*** synced strohel
-

-            50
 * Sync succeeded
-

-            51
$ git log --format=%ci -1
-

-            52
$ git show -q --pretty=format:%G? HEAD
-

-            53
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 strohel
-

-            54
 * Cache regenerated successfully
+            42
 * Cache regenerated successfully
 

 
         
diff --git a/strohel.txt b/strohel.txt
index 0c0b7aba7efd..1b2ada5f5210 100644
--- a/strohel.txt
+++ b/strohel.txt
@@ -14,23 +14,11 @@
              'uri': 'git+ssh://git@github.com:strohel/strohel-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync strohel
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/stuff.html b/stuff.html
index 77c207479b5b..384da89d104f 100644
--- a/stuff.html
+++ b/stuff.html
@@ -28,79 +28,57 @@
 

             9
$ pmaint sync stuff
 

-            10
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            10
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

             11
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            12
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
warning: Pulling without specifying how to reconcile divergent branches is
 

-            16
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
discouraged. You can squelch this message by running one of the following
 

-            17
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
commands sometime before your next pull:
 

-            18
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
 

-            19
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
  git config pull.rebase false  # merge (the default strategy)
 

-            20
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
  git config pull.rebase true   # rebase
 

-            21
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
  git config pull.ff only       # fast-forward only
 

-            22
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
 

-            23
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
You can replace "git config" with "git config --global" to set a default
 

-            24
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            25
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
or --ff-only on the command line to override the configured default per
 

-            26
warning: Pulling without specifying how to reconcile divergent branches is
+            26
invocation.
 

-            27
discouraged. You can squelch this message by running one of the following
+            27
 

-            28
commands sometime before your next pull:
+            28
Already up to date.
 

-            29
+            29
*** syncing stuff
 

-            30
  git config pull.rebase false  # merge (the default strategy)
+            30
*** synced stuff
 

-            31
  git config pull.rebase true   # rebase
+            31
 * Sync succeeded
 

-            32
  git config pull.ff only       # fast-forward only
+            32
$ git log --format=%ci -1
 

-            33
+            33
$ git show -q --pretty=format:%G? HEAD
 

-            34
You can replace "git config" with "git config --global" to set a default
+            34
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 stuff
 

-            35
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            36
or --ff-only on the command line to override the configured default per
-

-            37
invocation.
-

-            38
-

-            39
Already up to date.
-

-            40
*** syncing stuff
-

-            41
*** synced stuff
-

-            42
 * Sync succeeded
-

-            43
$ git log --format=%ci -1
-

-            44
$ git show -q --pretty=format:%G? HEAD
-

-            45
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 stuff
-

-            46
 * Cache regenerated successfully
+            35
 * Cache regenerated successfully
 

 
         
diff --git a/stuff.txt b/stuff.txt
index 213e644da214..b2559ee6da6f 100644
--- a/stuff.txt
+++ b/stuff.txt
@@ -7,22 +7,11 @@
  'source': [{'type': 'git', 'uri': 'https://github.com/istitov/stuff.git'}],
  'status': 'unofficial'}
 $ pmaint sync stuff
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/sublime-text.html b/sublime-text.html
index 1274d264c3e4..c7567b7def58 100644
--- a/sublime-text.html
+++ b/sublime-text.html
@@ -44,77 +44,57 @@
 

             17
$ pmaint sync sublime-text
 

-            18
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            23
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
warning: Pulling without specifying how to reconcile divergent branches is
 

-            24
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
discouraged. You can squelch this message by running one of the following
 

-            25
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
commands sometime before your next pull:
 

-            26
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
 

-            27
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.rebase false  # merge (the default strategy)
 

-            28
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
  git config pull.rebase true   # rebase
 

-            29
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
  git config pull.ff only       # fast-forward only
 

-            30
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
 

-            31
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
You can replace "git config" with "git config --global" to set a default
 

-            32
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            33
warning: Pulling without specifying how to reconcile divergent branches is
+            33
or --ff-only on the command line to override the configured default per
 

-            34
discouraged. You can squelch this message by running one of the following
+            34
invocation.
 

-            35
commands sometime before your next pull:
+            35
 

-            36
+            36
Already up to date.
 

-            37
  git config pull.rebase false  # merge (the default strategy)
+            37
*** syncing sublime-text
 

-            38
  git config pull.rebase true   # rebase
+            38
*** synced sublime-text
 

-            39
  git config pull.ff only       # fast-forward only
+            39
 * Sync succeeded
 

-            40
+            40
$ git log --format=%ci -1
 

-            41
You can replace "git config" with "git config --global" to set a default
+            41
$ git show -q --pretty=format:%G? HEAD
 

-            42
preference for all repositories. You can also pass --rebase, --no-rebase,
+            42
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 sublime-text
 

-            43
or --ff-only on the command line to override the configured default per
-

-            44
invocation.
-

-            45
-

-            46
Already up to date.
-

-            47
*** syncing sublime-text
-

-            48
*** synced sublime-text
-

-            49
 * Sync succeeded
-

-            50
$ git log --format=%ci -1
-

-            51
$ git show -q --pretty=format:%G? HEAD
-

-            52
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 sublime-text
-

-            53
 * Cache regenerated successfully
+            43
 * Cache regenerated successfully
 

 
         
diff --git a/sublime-text.txt b/sublime-text.txt
index a479c1ad9608..a45e0fd61388 100644
--- a/sublime-text.txt
+++ b/sublime-text.txt
@@ -15,21 +15,11 @@
              'uri': 'git@github.com:DamnWidget/sublime-text.git'}],
  'status': 'unofficial'}
 $ pmaint sync sublime-text
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/summary.json b/summary.json
index 2a1a2a579014..178f52652298 100644
--- a/summary.json
+++ b/summary.json
@@ -1 +1 @@
-{"0bs1d1an": {"quality": "experimental", "status": "unofficial", "name": "0bs1d1an", "description": {"en": "Personal overlay"}, "homepage": "https://gitlab.com/0bs1d1an/0bs1d1an-overlay", "owner": [{"type": "person", "email": "gkroon@maelstrom.ninja", "name": "Guido Kroon"}], "source": [{"type": "git", "uri": "https://gitlab.com/0bs1d1an/0bs1d1an-overlay.git"}, {"type": "git", "uri": "git+ssh://git@gitlab.com/0bs1d1an/0bs1d1an-overlay.git"}], "feed": ["https://gitlab.com/0bs1d1an/0bs1d1an-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-07-05 16:07:57 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo", "pentoo", "steam-overlay"], "x-ebuild-count": 80}, "0x4d4c": {"quality": "experimental", "status": "unofficial", "name": "0x4d4c", "description": {"en": "Personal overlay with no special focus"}, "homepage": "https://github.com/0x4d4c/gentoo-overlay", "owner": [{"type": "person", "email": "gentoo@0x4d4c.xyz", "name": "Martin Lambertz"}], "source": [{"type": "git", "uri": "https://github.com/0x4d4c/gentoo-overlay.git"}, {"type": "git", "uri": "git://github.com/0x4d4c/gentoo-overlay.git"}, {"type": "git", "uri": "git@github.com:0x4d4c/gentoo-overlay.git"}], "feed": ["https://github.com/0x4d4c/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2017-06-09 22:51:12 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 20}, "4nykey": {"quality": "experimental", "status": "unofficial", "name": "4nykey", "description": {"en": "An experimental portage overlay"}, "homepage": "https://github.com/4nykey/4nykey", "owner": [{"type": "person", "email": "4nykey@gmail.com", "name": "Aleksei Kaveshnikov"}], "source": [{"type": "git", "uri": "https://github.com/4nykey/4nykey.git"}, {"type": "git", "uri": "git://github.com/4nykey/4nykey.git"}, {"type": "git", "uri": "git@github.com:4nykey/4nykey.git"}], "feed": ["https://github.com/4nykey/4nykey/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-22 13:09:00 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 451}, "AlexandreFournier": {"quality": "experimental", "status": "unofficial", "name": "AlexandreFournier", "description": {"en": "Alexandre Fournier's personal overlay"}, "homepage": "https://github.com/AlexandreFournier/gentoo-overlay", "owner": [{"type": "person", "email": "gentoo@alexandrefournier.com", "name": "Alexandre Fournier"}], "source": [{"type": "git", "uri": "https://github.com/AlexandreFournier/gentoo-overlay.git"}, {"type": "git", "uri": "git://github.com/AlexandreFournier/gentoo-overlay.git"}, {"type": "git", "uri": "git@github.com:AlexandreFournier/gentoo-overlay.git"}], "feed": ["https://github.com/AlexandreFournier/gentoo-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2020-10-02 10:07:28 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 67}, "ArchFeh": {"quality": "experimental", "status": "unofficial", "name": "ArchFeh", "description": {"en": "ArchFeh's personal overlay"}, "homepage": "https://github.com/ArchFeh/ArchFeh-overlay", "owner": [{"type": "person", "email": "guyu2876@gmail.com", "name": "ArchFeh"}], "source": [{"type": "git", "uri": "https://github.com/ArchFeh/ArchFeh-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/ArchFeh/ArchFeh-overlay.git"}], "feed": ["https://github.com/ArchFeh/ArchFeh-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-04-22 15:59:45 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 22}, "AstroFloyd": {"quality": "experimental", "status": "unofficial", "name": "AstroFloyd", "description": {"en": "AstroFloyd's Gentoo overlay"}, "homepage": "https://cgit.gentoo.org/user/AstroFloyd.git/", "owner": [{"type": "person", "email": "AstroFloyd@gmail.com", "name": "AstroFloyd"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/AstroFloyd.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/AstroFloyd.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/AstroFloyd.git"}], "feed": ["https://cgit.gentoo.org/user/AstroFloyd.git/atom/"], "x-timestamp-command": ["git", "log", "--format=%ci", "-1"], "x-openpgp-signature-command": ["git", "show", "-q", "--pretty=format:%G?", "HEAD"], "x-state": "SYNC_FAIL"}, "AzP": {"quality": "experimental", "status": "unofficial", "name": "AzP", "description": {"en": "Peter's own software playground"}, "homepage": "https://cgit.gentoo.org/user/AzP.git/", "owner": [{"type": "person", "email": "peterasplund@gentoo.se", "name": "Peter Asplund"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/AzP.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/AzP.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/AzP.git"}], "feed": ["https://cgit.gentoo.org/user/AzP.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-10-17 22:46:05 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 15}, "Case_Of": {"quality": "experimental", "status": "unofficial", "name": "Case_Of", "description": {"en": "Personal overlay"}, "homepage": "https://framagit.org/Case_Of/gentoo-overlay", "owner": [{"type": "person", "email": "gentoo@retornaz.com", "name": "Quentin Retornaz"}], "source": [{"type": "git", "uri": "https://framagit.org/Case_Of/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@framagit.org/Case_Of/gentoo-overlay.git"}], "feed": ["https://framagit.org/Case_Of/gentoo-overlay/commits/master?format=atom"], "x-state": "GOOD", "x-timestamp": "2020-10-10 04:41:35 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 15}, "Drauthius": {"quality": "experimental", "status": "unofficial", "name": "Drauthius", "description": {"en": "Ebuilds related to game dev"}, "homepage": "https://cgit.gentoo.org/repo/user/Drauthius.git/", "owner": [{"type": "person", "email": "albert@diserholt.com", "name": "Albert Diserholt"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/user/Drauthius.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/repo/user/Drauthius"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/user/Drauthius.git"}], "feed": ["https://cgit.gentoo.org/repo/user/Drauthius.git/atom/"], "x-timestamp-command": ["git", "log", "--format=%ci", "-1"], "x-openpgp-signature-command": ["git", "show", "-q", "--pretty=format:%G?", "HEAD"], "x-state": "SYNC_FAIL"}, "DuPol": {"quality": "experimental", "status": "unofficial", "name": "DuPol", "description": {"en": "DuPol's own and modified portage ebuilds."}, "homepage": "https://cgit.gentoo.org/user/DuPol.git/", "owner": [{"type": "person", "email": "DuPol@gmx.de", "name": "Dustin Polke"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/DuPol.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/DuPol.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/DuPol.git"}], "feed": ["https://cgit.gentoo.org/user/DuPol.git/atom/"], "x-timestamp-command": ["git", "log", "--format=%ci", "-1"], "x-openpgp-signature-command": ["git", "show", "-q", "--pretty=format:%G?", "HEAD"], "x-state": "SYNC_FAIL"}, "FireBurn": {"quality": "experimental", "status": "unofficial", "name": "FireBurn", "description": {"en": "32bit ebuilds (libdrm, mesa, libx11, mesa-progs, ..)"}, "homepage": "https://github.com/FireBurn/Overlay", "owner": [{"type": "person", "email": "mike@fireburn.co.uk", "name": "Mike Lothian"}], "source": [{"type": "git", "uri": "git://github.com/FireBurn/Overlay.git"}], "feed": ["https://github.com/FireBurn/Overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2020-10-23 15:27:20 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 55}, "HomeAssistantRepository": {"quality": "experimental", "status": "unofficial", "name": "HomeAssistantRepository", "description": {"en": "Home Assistant on Gentoo Linux without virtualenv or docker."}, "homepage": "https://git.edevau.net/onkelbeh/HomeAssistantRepository", "owner": [{"type": "person", "email": "b@edevau.net", "name": "Andreas Billmeier"}], "source": [{"type": "git", "uri": "https://git.edevau.net/onkelbeh/HomeAssistantRepository.git"}, {"type": "git", "uri": "https://github.com/onkelbeh/HomeAssistantRepository.git"}], "x-state": "GOOD", "x-timestamp": "2020-10-23 08:13:31 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 2533}, "JRG": {"quality": "experimental", "status": "unofficial", "name": "JRG", "description": {"en": "John's Collaboration Overlay"}, "homepage": "https://github.com/john-r-graham/jrg-overlay", "owner": [{"type": "person", "email": "john_r_graham@gentoo.org", "name": "John R. Graham"}], "source": [{"type": "git", "uri": "https://github.com/john-r-graham/jrg-overlay.git"}, {"type": "git", "uri": "git://github.com/john-r-graham/jrg-overlay.git"}, {"type": "git", "uri": "git@github.com:john-r-graham/jrg-overlay.git"}], "feed": ["https://github.com/john-r-graham/jrg-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-09-11 13:52:29 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 14}, "KBrown-pub": {"quality": "experimental", "status": "unofficial", "name": "KBrown-pub", "description": {"en": "KBrown's public overlay"}, "homepage": "http://sandino.araico.net/", "owner": [{"type": "person", "email": "sandino@sandino.net", "name": "Sandino Araico Sanchez"}], "source": [{"type": "git", "uri": "https://git.softwarelibre.mx/KBrown/gentoo-overlay.git"}, {"type": "git", "uri": "https://github.com/KenjiBrown/gentoo-overlay.git"}], "feed": ["https://git.softwarelibre.mx/KBrown/gentoo-overlay/-/commits/KBrown-pub?format=atom"], "x-state": "GOOD", "x-timestamp": "2020-09-17 23:17:57 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 134}, "Krontage": {"quality": "experimental", "status": "unofficial", "name": "Krontage", "description": {"en": "Personal overlay of Kron"}, "homepage": "https://github.com/undying/krontage", "owner": [{"type": "person", "email": "undying-m@yandex.ru", "name": "Kron"}], "source": [{"type": "git", "uri": "https://github.com/undying/krontage.git"}, {"type": "git", "uri": "git://github.com/undying/krontage.git"}, {"type": "git", "uri": "git@github.com:undying/krontage.git"}], "feed": ["https://github.com/undying/krontage/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-18 18:30:47 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 19}, "ROKO__": {"quality": "experimental", "status": "unofficial", "name": "ROKO__", "description": {"en": "Unofficial ebuilds for gentoo based distributions."}, "homepage": "https://github.com/sandikata/ROKO__", "owner": [{"type": "person", "email": "sandikata@yandex.ru", "name": "Alexandrow Rosen"}], "source": [{"type": "git", "uri": "https://github.com/sandikata/ROKO__.git"}, {"type": "git", "uri": "git://github.com/sandikata/ROKO__.git"}], "feed": ["https://github.com/sandikata/ROKO__/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-22 19:53:34 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 105}, "R_Overlay": {"quality": "experimental", "status": "official", "name": "R_Overlay", "description": {"en": "Gentoo overlay of R packages"}, "homepage": "https://cgit.gentoo.org/proj/R_overlay.git/", "owner": [{"type": "person", "email": "heroxbd@gentoo.org", "name": "Benda Xu"}], "source": [{"type": "rsync", "uri": "rsync://roverlay.dev.gentoo.org/roverlay"}], "x-state": "GOOD", "x-timestamp": "2020-08-14 09:27:44.000000000 +0000\n", "x-masters": ["gentoo"], "x-ebuild-count": 30474}, "ShyPixie": {"quality": "experimental", "status": "unofficial", "name": "ShyPixie", "description": {"en": "Personal overlay of Lara Maia"}, "homepage": "https://github.com/ShyPixie/Overlays", "owner": [{"type": "person", "email": "dev@lara.click", "name": "Lara Maia"}], "source": [{"type": "git", "uri": "https://github.com/ShyPixie/Overlays.git"}, {"type": "git", "uri": "git://github.com/ShyPixie/Overlays.git"}, {"type": "git", "uri": "git@github.com:ShyPixie/Overlays.git"}], "feed": ["https://github.com/ShyPixie/Overlays/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2017-03-22 12:26:37 +0000\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 14}, "SwordArMor": {"quality": "experimental", "status": "unofficial", "name": "SwordArMor", "description": {"en": "Personnal overlay of alarig/SwordArMor"}, "homepage": "https://git.grifon.fr/alarig/SwordArMor-gentoo-overlay", "owner": [{"type": "person", "email": "alarig@swordarmor.fr", "name": "Alarig Le Lay"}], "source": [{"type": "git", "uri": "https://git.grifon.fr/alarig/SwordArMor-gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@git.grifon.fr:alarig/SwordArMor-gentoo-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2020-10-22 19:19:51 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 138}, "ace": {"quality": "experimental", "status": "unofficial", "name": "ace", "description": {"en": "Personal overlay with ebuilds that were missing at one point or another"}, "homepage": "https://github.com/ananace/overlay", "owner": [{"type": "person", "email": "ace@haxalot.com", "name": "Alexander Olofsson"}], "source": [{"type": "git", "uri": "https://github.com/ananace/overlay.git"}, {"type": "git", "uri": "git://github.com/ananace/overlay.git"}, {"type": "git", "uri": "git@github.com:ananace/overlay.git"}], "feed": ["https://github.com/ananace/overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-02 11:27:41 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 31}, "activehome": {"quality": "experimental", "status": "unofficial", "name": "activehome", "description": {"en": "Gentoo overlay for ebuilds related to 'hand-made' Active Home construction", "ru": "\u041e\u0432\u0435\u0440\u043b\u0435\u0439 \u0434\u043b\u044f ebuild'\u043e\u0432 \u0441\u0432\u044f\u0437\u0430\u043d\u043d\u044b\u0445 \u0441\u043e\u0437\u0434\u0430\u043d\u0438\u0435\u043c \u0441\u0430\u043c\u043e\u0434\u0435\u043b\u044c\u043d\u043e\u0433\u043e \u0443\u043c\u043d\u043e\u0433\u043e \u0434\u043e\u043c\u0430"}, "homepage": "https://cgit.gentoo.org/user/activehome.git/", "owner": [{"type": "person", "email": "mva@gentoo.org", "name": "Vadim A. Misbakh-Soloviov"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/activehome.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/activehome.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/activehome.git"}], "feed": ["https://cgit.gentoo.org/user/activehome.git/atom/"], "x-timestamp-command": ["git", "log", "--format=%ci", "-1"], "x-openpgp-signature-command": ["git", "show", "-q", "--pretty=format:%G?", "HEAD"], "x-state": "SYNC_FAIL"}, "aeon-gentoo-overlay": {"quality": "experimental", "status": "unofficial", "name": "aeon-gentoo-overlay", "description": {"en": "Gentoo overlay for Aeon Dev packages and dependencies"}, "homepage": "https://github.com/aeon-engine/aeon-gentoo-overlay", "owner": [{"type": "person", "email": "robindegen@gmail.com", "name": "Robin Degen"}], "source": [{"type": "git", "uri": "https://github.com/aeon-engine/aeon-gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/aeon-engine/aeon-gentoo-overlay.git"}], "feed": ["https://github.com/aeon-engine/aeon-gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2019-05-19 12:32:23 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 3}, "ag-ops": {"quality": "experimental", "status": "unofficial", "name": "ag-ops", "description": {"en": "Useful tools for SysAdmins or DevOps"}, "homepage": "https://gitlab.com/ILMostro/ag-ops", "owner": [{"type": "person", "email": "ilmostro7@gmail.com", "name": "John Johnson"}], "source": [{"type": "git", "uri": "https://gitlab.com/ILMostro/ag-ops.git"}, {"type": "git", "uri": "git+ssh://git@gitlab.com/ILMostro/ag-ops.git"}], "feed": ["https://gitlab.com/ILMostro/ag-ops/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-09-02 23:15:27 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 87}, "ago": {"quality": "experimental", "status": "official", "name": "ago", "description": {"en": "Developer overlay"}, "homepage": "https://cgit.gentoo.org/dev/ago.git/", "owner": [{"type": "person", "email": "ago@gentoo.org", "name": "Agostino Sarubbo"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/ago.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/ago.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/ago.git"}], "feed": ["https://cgit.gentoo.org/dev/ago.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-09-25 09:11:19 +0200\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 17}, "ahyangyi-overlay": {"quality": "experimental", "status": "unofficial", "name": "ahyangyi-overlay", "description": {"en": "Ahyangyi's overlay"}, "homepage": "https://github.com/ahyangyi/ahyangyi-overlay", "owner": [{"type": "person", "email": "ahyangyi@gmail.com", "name": "Yi Yang"}], "source": [{"type": "git", "uri": "https://github.com/ahyangyi/ahyangyi-overlay.git"}], "feed": ["https://github.com/ahyangyi/ahyangyi-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-09-06 19:09:37 +0800\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 48}, "alatar-lay": {"quality": "experimental", "status": "unofficial", "name": "alatar-lay", "description": {"en": "Alatar`s personal ebuilds"}, "homepage": "https://github.com/alatarum/alatar-lay", "owner": [{"type": "person", "email": "alatar_@list.ru", "name": "Alatar"}], "source": [{"type": "git", "uri": "https://github.com/alatarum/alatar-lay.git"}, {"type": "git", "uri": "git://github.com/alatarum/alatar-lay.git"}, {"type": "git", "uri": "git@github.com:alatarum/alatar-lay.git"}], "feed": ["https://github.com/alatarum/alatar-lay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2018-05-02 01:46:05 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 7}, "alesharik": {"quality": "experimental", "status": "unofficial", "name": "alesharik", "description": {"en": "Gentoo portage overlay of alesharik"}, "homepage": "https://github.com/alesharik/alesharik-overlay", "owner": [{"type": "person", "email": "alesharik4@gmail.com", "name": "Aleksei Arsenev"}], "source": [{"type": "git", "uri": "https://github.com/alesharik/alesharik-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/alesharik/alesharik-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2020-10-18 15:27:47 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 18}, "alexcepoi": {"quality": "experimental", "status": "unofficial", "name": "alexcepoi", "description": {"en": "Personal User Overlay"}, "homepage": "https://cgit.gentoo.org/user/alexcepoi.git/", "owner": [{"type": "person", "email": "alex.cepoi@gmail.com", "name": "Alexandru Cepoi"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/alexcepoi.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/alexcepoi.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/alexcepoi.git"}], "feed": ["https://cgit.gentoo.org/user/alexcepoi.git/atom/"], "x-timestamp-command": ["git", "log", "--format=%ci", "-1"], "x-openpgp-signature-command": ["git", "show", "-q", "--pretty=format:%G?", "HEAD"], "x-state": "SYNC_FAIL"}, "alexxy": {"quality": "experimental", "status": "official", "name": "alexxy", "description": {"en": "Some random work in progress stuff from alexxy"}, "homepage": "https://cgit.gentoo.org/dev/alexxy.git", "owner": [{"type": "person", "email": "alexxy@gentoo.org", "name": "Alexey Shvetsov"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/alexxy.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/alexxy.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/alexxy.git"}], "feed": ["https://cgit.gentoo.org/dev/alexxy.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-02-11 14:50:24 +0300\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 3}, "alinefr": {"quality": "experimental", "status": "unofficial", "name": "alinefr", "description": {"en": "Some overlays that I could not find anywhere else."}, "homepage": "https://github.com/alinefr/alinefr-overlay", "owner": [{"type": "person", "email": "aline@alinefreitas.com.br", "name": "Aline Freitas"}], "source": [{"type": "git", "uri": "https://github.com/alinefr/alinefr-overlay.git"}, {"type": "git", "uri": "git://github.com/alinefr/alinefr-overlay.git"}, {"type": "git", "uri": "git@github.com:alinefr/alinefr-overlay.git"}], "feed": ["https://github.com/alinefr/alinefr-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2020-05-12 19:16:58 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 28}, "aluco": {"quality": "experimental", "status": "unofficial", "name": "aluco", "description": {"en": "From drm-next to phoronix-test-suite ebuilds"}, "homepage": "https://cgit.gentoo.org/user/aluco.git/", "owner": [{"type": "person", "email": "anthoine.bourgeois@gmail.com", "name": "Anthoine Bourgeois"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/aluco.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/aluco.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/aluco.git"}], "feed": ["https://cgit.gentoo.org/user/aluco.git/atom/"], "x-timestamp-command": ["git", "log", "--format=%ci", "-1"], "x-openpgp-signature-command": ["git", "show", "-q", "--pretty=format:%G?", "HEAD"], "x-state": "SYNC_FAIL"}, "amedeos": {"quality": "experimental", "status": "unofficial", "name": "amedeos", "description": {"en": "amedeos's personal overlay"}, "homepage": "https://github.com/amedeos/amedeos-overlay", "owner": [{"type": "person", "email": "amedeo@linux.com", "name": "Amedeo Salvati"}], "source": [{"type": "git", "uri": "https://github.com/amedeos/amedeos-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/amedeos/amedeos-overlay.git"}], "feed": ["https://github.com/amedeos/amedeos-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-17 20:46:50 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 34}, "anarchy": {"quality": "experimental", "status": "official", "name": "anarchy", "description": {"en": "Testing/Bug fixes, new ebuilds"}, "homepage": "https://cgit.gentoo.org/dev/anarchy.git/", "owner": [{"type": "person", "email": "anarchy@gentoo.org", "name": "Jory Pratt"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/anarchy.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/anarchy"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/anarchy.git"}], "feed": ["https://cgit.gentoo.org/dev/anarchy.git/atom/"], "x-timestamp-command": ["git", "log", "--format=%ci", "-1"], "x-openpgp-signature-command": ["git", "show", "-q", "--pretty=format:%G?", "HEAD"], "x-state": "SYNC_FAIL"}, "anaximander": {"quality": "experimental", "status": "unofficial", "name": "anaximander", "description": {"en": "anaximander's user overlay"}, "homepage": "https://cgit.gentoo.org/user/anaximander.git/", "owner": [{"type": "person", "email": "dominik.kriegner+gentoo@gmail.com", "name": "Dominik Kriegner"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/anaximander.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/anaximander.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/anaximander.git"}], "feed": ["https://cgit.gentoo.org/user/anaximander.git/atom/"], "x-timestamp-command": ["git", "log", "--format=%ci", "-1"], "x-openpgp-signature-command": ["git", "show", "-q", "--pretty=format:%G?", "HEAD"], "x-state": "SYNC_FAIL"}, "anders-larsson": {"quality": "experimental", "status": "unofficial", "name": "anders-larsson", "description": {"en": "A few packages that are not hosted elsewhere."}, "homepage": "https://github.com/anders-larsson/gentoo-overlay", "owner": [{"type": "person", "email": "andla@thethundertemplars.com", "name": "Anders Larsson"}], "source": [{"type": "git", "uri": "https://github.com/anders-larsson/gentoo-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2020-10-23 05:56:48 +0000\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 34}, "andjscott": {"quality": "experimental", "status": "unofficial", "name": "andjscott", "description": {"en": "Few ebuilds that others may find useful"}, "homepage": "https://github.com/andjscott/overlays", "owner": [{"type": "person", "email": "andj.scott@gmail.com"}], "source": [{"type": "git", "uri": "https://github.com/andjscott/overlays.git"}], "x-state": "BAD_CACHE", "x-timestamp": "2016-10-17 16:03:33 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 14}, "andrey_utkin": {"quality": "experimental", "status": "official", "name": "andrey_utkin", "description": {"en": "Developer overlay"}, "homepage": "https://github.com/andrey-utkin/gentoo-overlay.git", "owner": [{"type": "person", "email": "andrey_utkin@gentoo.org", "name": "andrey_utkin"}], "source": [{"type": "git", "uri": "https://github.com/andrey-utkin/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/andrey-utkin/gentoo-overlay.git"}], "feed": ["https://github.com/andrey-utkin/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-09-04 11:23:21 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "andy": {"quality": "experimental", "status": "unofficial", "name": "andy", "description": {"en": "Andy's custom stuff and embedded software"}, "homepage": "https://cgit.gentoo.org/user/andy.git/", "owner": [{"type": "person", "email": "andy@ndyk.de", "name": "Andy K."}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/andy.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/andy.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/andy.git"}], "feed": ["https://cgit.gentoo.org/user/andy.git/atom"], "x-timestamp-command": ["git", "log", "--format=%ci", "-1"], "x-openpgp-signature-command": ["git", "show", "-q", "--pretty=format:%G?", "HEAD"], "x-state": "SYNC_FAIL"}, "anomen": {"quality": "experimental", "status": "unofficial", "name": "anomen", "description": {"en": "anomen's personal Gentoo overlay"}, "homepage": "https://github.com/anomen-s/anomen-overlay", "owner": [{"type": "person", "email": "ludek_h@seznam.cz", "name": "anomen"}], "source": [{"type": "git", "uri": "https://github.com/anomen-s/anomen-overlay.git"}, {"type": "git", "uri": "git://github.com/anomen-s/anomen-overlay.git"}, {"type": "git", "uri": "git@github.com:anomen-s/anomen-overlay.git"}], "feed": ["https://github.com/anomen-s/anomen-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-09-19 13:40:34 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 58}, "anyc": {"quality": "experimental", "status": "unofficial", "name": "anyc", "description": {"en": "Testing ebuilds for out-of-tree applications"}, "homepage": "https://github.com/anyc/anyc-overlay", "owner": [{"type": "person", "email": "dev@kicherer.org", "name": "Mario Kicherer"}], "source": [{"type": "git", "uri": "https://github.com/anyc/anyc-overlay.git"}, {"type": "git", "uri": "git://github.com/anyc/anyc-overlay.git"}, {"type": "git", "uri": "git@github.com:anyc/anyc-overlay.git"}], "feed": ["https://github.com/anyc/anyc-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-02-16 18:56:45 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 95}, "apriluwu": {"quality": "experimental", "status": "unofficial", "name": "apriluwu", "description": {"en": "apriluwu's personal overlay"}, "homepage": "https://github.com/apriluwu/gentoo-overlay", "owner": [{"type": "person", "email": "aaprilthemonth@gmail.com", "name": "April C."}], "source": [{"type": "git", "uri": "https://github.com/apriluwu/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/apriluwu/gentoo-overlay.git"}], "feed": ["https://github.com/apriluwu/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-06-27 13:41:25 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "archenroot": {"quality": "experimental", "status": "unofficial", "name": "archenroot", "description": {"en": "GPU, Neural Networks, Big Data, HPC, Java"}, "homepage": "https://github.com/archenroot/gentoo-overlay", "owner": [{"type": "person", "email": "archenroot@gmail.com", "name": "Ladislav Jech"}], "source": [{"type": "git", "uri": "https://github.com/archenroot/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/archenroot/gentoo-overlay.git"}], "feed": ["https://github.com/archenroot/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2019-05-16 09:43:27 +0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "argent-main": {"quality": "experimental", "status": "unofficial", "name": "argent-main", "description": {"en": "Argent Linux"}, "homepage": "https://gitlab.com/argent/argent-main", "owner": [{"type": "person", "email": "stefan.cristian+gentoo@rogentos.ro", "name": "Stefan Cristian Brindusa"}], "source": [{"type": "git", "uri": "https://gitlab.com/argent/argent-main.git"}], "feed": ["https://gitlab.com/argent/argent-main/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2018-06-10 00:58:11 +0300\n", "x-openpgp-signed": "N", "x-masters": [], "x-ebuild-count": 2146}, "arx-libertatis": {"quality": "experimental", "status": "unofficial", "name": "arx-libertatis", "description": {"en": "Arx Libertatis Overlay"}, "homepage": "https://github.com/arx/ArxGentoo", "owner": [{"type": "person", "email": "daniel@constexpr.org", "name": "Daniel Scharrer"}], "source": [{"type": "git", "uri": "https://github.com/arx/ArxGentoo.git"}, {"type": "git", "uri": "git://github.com/arx/ArxGentoo.git"}], "x-state": "GOOD", "x-timestamp": "2020-08-11 21:12:11 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 7}, "atom": {"quality": "experimental", "status": "unofficial", "name": "atom", "description": {"en": "Atom Overlay"}, "homepage": "https://github.com/elprans/atom-overlay", "owner": [{"type": "person", "email": "elvis@magic.io", "name": "Elvis Pranskevichus"}], "source": [{"type": "git", "uri": "https://github.com/elprans/atom-overlay.git"}], "feed": ["https://github.com/elprans/atom-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-04 10:10:24 -0700\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "audio-overlay": {"quality": "experimental", "status": "unofficial", "name": "audio-overlay", "description": {"en": "Pro audio overlay. Please file bugs or package suggestions at https://github.com/gentoo-audio/audio-overlay/issues/new"}, "homepage": "https://github.com/gentoo-audio/audio-overlay", "owner": [{"type": "project", "email": "audio-overlay@googlegroups.com", "name": "Audio overlay"}], "source": [{"type": "git", "uri": "https://github.com/gentoo-audio/audio-overlay.git"}, {"type": "git", "uri": "git://github.com/gentoo-audio/audio-overlay.git"}, {"type": "git", "uri": "git@github.com:gentoo-audio/audio-overlay.git"}], "feed": ["https://github.com/gentoo-audio/audio-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-18 11:43:11 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 68}, "average": {"quality": "experimental", "status": "unofficial", "name": "average", "description": {"en": "Personal playground for some ebuilds not found elsewhere"}, "homepage": "https://github.com/AnAverageHuman/average", "owner": [{"type": "person", "email": "jeffrey@icurse.nl", "name": "Jeffrey Lin"}], "source": [{"type": "git", "uri": "https://github.com/AnAverageHuman/average.git"}, {"type": "git", "uri": "git+ssh://git@github.com/AnAverageHuman/average.git"}], "feed": ["https://github.com/AnAverageHuman/average/commits/master.atom"], "x-state": "INVALID_METADATA", "x-timestamp": "2020-06-29 16:12:16 -0400\n", "x-openpgp-signed": "E", "x-masters": ["gentoo", "graaff"]}, "awesome": {"quality": "experimental", "status": "unofficial", "name": "awesome", "description": {"en": "Awesome ebuilds"}, "homepage": "https://gitlab.awesome-it.de/overlays/awesome", "owner": [{"type": "person", "email": "info@awesome-it.de", "name": "Daniel Morlock"}], "source": [{"type": "git", "uri": "https://gitlab.awesome-it.de/overlays/awesome.git"}], "x-state": "GOOD", "x-timestamp": "2020-10-10 09:34:00 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 37}, "axs": {"quality": "experimental", "status": "official", "name": "axs", "description": {"en": "Developer overlay"}, "homepage": "https://cgit.gentoo.org/dev/axs.git/", "owner": [{"type": "person", "email": "axs@gentoo.org", "name": "Ian Stakenvicius"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/axs.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/axs.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/axs.git"}], "feed": ["https://cgit.gentoo.org/dev/axs.git/atom/"], "x-timestamp-command": ["git", "log", "--format=%ci", "-1"], "x-openpgp-signature-command": ["git", "show", "-q", "--pretty=format:%G?", "HEAD"], "x-state": "SYNC_FAIL"}, "barnowl": {"quality": "experimental", "status": "unofficial", "name": "barnowl", "description": {"en": "BarnOwl IM client"}, "homepage": "https://github.com/wthrowe/barnowl-overlay", "owner": [{"type": "person", "email": "wtt6@cornell.edu", "name": "William Throwe"}], "source": [{"type": "git", "uri": "https://github.com/wthrowe/barnowl-overlay.git"}, {"type": "git", "uri": "git://github.com/wthrowe/barnowl-overlay.git"}], "feed": ["https://github.com/wthrowe/barnowl-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-05-12 02:13:53 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 9}, "barzog-overlay": {"quality": "experimental", "status": "unofficial", "name": "barzog-overlay", "description": {"en": "Oleg Gawriloff's overlay"}, "homepage": "https://github.com/barzog/barzog-gentoo-overlay", "owner": [{"type": "person", "email": "barzog@telecom.by", "name": "Oleg Gawriloff"}], "source": [{"type": "git", "uri": "https://github.com/barzog/barzog-gentoo-overlay.git"}, {"type": "git", "uri": "git://github.com/barzog/barzog-gentoo-overlay.git"}, {"type": "git", "uri": "git@github.com:barzog/barzog-gentoo-overlay.git"}], "feed": ["https://github.com/barzog/barzog-gentoo-overlay/commits/master"], "x-state": "BAD_CACHE", "x-timestamp": "2019-12-02 16:52:17 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 203}, "beatussum-overlay": {"quality": "experimental", "status": "unofficial", "name": "beatussum-overlay", "description": {"en": "Beatussum's overlay", "fr": "Overlay de Beatussum"}, "longdescription": {"en": "\n        My Gentoo overlay aims to provide some packages that are not (yet) in the main Gentoo tree.\n    ", "fr": "\n        Mon overlay a pour but de fournir certains paquets qui ne sont pas (encore) disponibles dans l'arbre principal.\n    "}, "homepage": "https://github.com/beatussum/beatussum-overlay", "owner": [{"type": "person", "email": "beatussum@protonmail.com", "name": "Matt\u00e9o Rossillol--Laruelle"}], "source": [{"type": "git", "uri": "https://github.com/beatussum/beatussum-overlay.git"}, {"type": "git", "uri": "ssh://git@github.com/beatussum/beatussum-overlay.git"}], "feed": ["https://github.com/beatussum/beatussum-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-09-21 18:14:38 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 24}, "benzene-overlay": {"quality": "experimental", "status": "unofficial", "name": "benzene-overlay", "description": {"en": "Universebenzene's personal Gentoo overlay"}, "homepage": "https://github.com/Universebenzene/benzene-overlay", "owner": [{"type": "person", "email": "universebenzene@sina.com", "name": "Universebenzene"}], "source": [{"type": "git", "uri": "https://github.com/Universebenzene/benzene-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/Universebenzene/benzene-overlay.git"}], "feed": ["https://github.com/Universebenzene/benzene-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-23 16:01:33 +0800\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 64}, "bes": {"quality": "experimental", "status": "unofficial", "name": "bes", "description": {"en": "bes' personal overlay"}, "homepage": "https://github.com/bes-internal/gentoo-overlay-bes", "owner": [{"type": "person", "email": "bes.internal@gmail.com", "name": "Vladimir Varlamov"}], "source": [{"type": "git", "uri": "https://github.com/bes-internal/gentoo-overlay-bes.git"}, {"type": "git", "uri": "git://github.com/bes-internal/gentoo-overlay-bes.git"}, {"type": "git", "uri": "git@github.com:bes-internal/gentoo-overlay-bes.git"}], "feed": ["https://github.com/bes-internal/gentoo-overlay-bes/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-09-25 00:58:24 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 8}, "bezerker": {"quality": "experimental", "status": "unofficial", "name": "bezerker", "description": {"en": "Bezerker's Packages"}, "homepage": "https://github.com/bezerker/gentoo-overlay", "owner": [{"type": "person", "email": "bezerker@bezerker.org", "name": "Bezerker"}], "source": [{"type": "git", "uri": "https://github.com/bezerker/gentoo-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2015-09-04 06:56:43 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 3}, "bibletime": {"quality": "experimental", "status": "unofficial", "name": "bibletime", "description": {"en": "BibleTime overlay"}, "homepage": "https://cgit.gentoo.org/user/bibletime.git/", "owner": [{"type": "person", "email": "jaak@ristioja.ee", "name": "Jaak Ristioja"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/bibletime.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/bibletime.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/bibletime.git"}], "feed": ["https://cgit.gentoo.org/user/bibletime.git/atom/"], "x-timestamp-command": ["git", "log", "--format=%ci", "-1"], "x-openpgp-signature-command": ["git", "show", "-q", "--pretty=format:%G?", "HEAD"], "x-state": "SYNC_FAIL"}, "binaryden": {"quality": "experimental", "status": "unofficial", "name": "binaryden", "description": {"en": "Overlay for Cinnamon and other Gentoo packages"}, "homepage": "https://github.com/tkemmer/binaryden", "owner": [{"type": "person", "email": "thomas@binaryden.de", "name": "Thomas Kemmer"}], "source": [{"type": "git", "uri": "https://github.com/tkemmer/binaryden.git"}, {"type": "git", "uri": "git://github.com/tkemmer/binaryden.git"}, {"type": "git", "uri": "git+ssh://git@github.com/tkemmer/binaryden.git"}], "feed": ["https://github.com/tkemmer/binaryden/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-18 19:45:56 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 27}, "bircoph": {"quality": "experimental", "status": "official", "name": "bircoph", "description": {"en": "Developer overlay"}, "homepage": "https://cgit.gentoo.org/dev/bircoph.git/", "owner": [{"type": "person", "email": "bircoph@gentoo.org", "name": "Andrew Savchenko"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/bircoph.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/bircoph.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/bircoph.git"}], "feed": ["https://cgit.gentoo.org/dev/bircoph.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-09-25 11:52:20 +0300\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 30}, "bitcetera": {"quality": "experimental", "status": "unofficial", "name": "bitcetera", "description": {"en": "Miscellaneous Gentoo ebuilds"}, "homepage": "https://github.com/svoop/bitcetera-overlay", "owner": [{"type": "person", "email": "gentoo@bitcetera.com", "name": "Sven Schwyn"}], "source": [{"type": "git", "uri": "https://github.com/svoop/bitcetera-overlay.git"}, {"type": "git", "uri": "git://github.com/svoop/bitcetera-overlay.git"}, {"type": "git", "uri": "git@github.com:svoop/bitcetera-overlay.git"}], "feed": ["https://github.com/svoop/bitcetera-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-06-01 18:54:06 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 20}, "bitcoin": {"quality": "experimental", "status": "unofficial", "name": "bitcoin", "description": {"en": "Bitcoin and CPU/GPU mining related ebuilds"}, "homepage": "https://gitlab.com/bitcoin/gentoo.git", "owner": [{"type": "person", "email": "flo@geekplace.eu", "name": "Florian Schmaus"}], "source": [{"type": "git", "uri": "https://gitlab.com/bitcoin/gentoo.git"}], "x-state": "GOOD", "x-timestamp": "2020-10-22 16:17:02 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 162}, "bleeding-edge": {"quality": "experimental", "status": "unofficial", "name": "bleeding-edge", "description": {"en": "Gentoo ebuilds for \"bleeding edge\" versions of packages - newest, untested - running on ~amd64."}, "homepage": "https://cgit.gentoo.org/repo/user/bleeding-edge.git/", "owner": [{"type": "person", "email": "jasiupsota@gmail.com", "name": "Jan Psota"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/user/bleeding-edge.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/repo/user/bleeding-edge"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/user/bleeding-edge.git"}], "feed": ["https://cgit.gentoo.org/repo/user/bleeding-edge.git/atom/"], "x-state": "GOOD", "x-timestamp": "2018-09-26 10:53:10 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 11}, "blender-gentoo-logo": {"quality": "experimental", "status": "official", "name": "blender-gentoo-logo", "description": {"en": "Software needed to render the Blender-based gentoo Logo of 2003"}, "homepage": "https://gitweb.gentoo.org/repo/proj/blender-gentoo-logo.git/", "owner": [{"type": "person", "email": "sping@gentoo.org", "name": "Sebastian Pipping"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/proj/blender-gentoo-logo.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/proj/blender-gentoo-logo.git"}], "feed": ["https://gitweb.gentoo.org/repo/proj/blender-gentoo-logo.git/atom/?h=master"], "x-timestamp-command": ["git", "log", "--format=%ci", "-1"], "x-openpgp-signature-command": ["git", "show", "-q", "--pretty=format:%G?", "HEAD"], "x-state": "SYNC_FAIL"}, "bliss-overlay": {"quality": "experimental", "status": "unofficial", "name": "bliss-overlay", "description": {"en": "FearedBliss's Gentoo Overlay"}, "homepage": "https://github.com/fearedbliss", "owner": [{"type": "person", "email": "jvasquez1011@gmail.com"}], "source": [{"type": "git", "uri": "https://github.com/fearedbliss/bliss-overlay.git"}, {"type": "git", "uri": "git://github.com:fearedbliss/bliss-overlay.git"}, {"type": "git", "uri": "git@github.com:fearedbliss/bliss-overlay.git"}], "feed": ["https://github.com/fearedbliss/bliss-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-09-20 09:16:21 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 9}, "bloody": {"quality": "experimental", "status": "unofficial", "name": "bloody", "description": {"en": "krita bleeding edge and artists tools/resources"}, "homepage": "https://github.com/bloodywing/bloody", "owner": [{"type": "person", "email": "bloodywing@neocomy.net", "name": "Pierre Geier"}], "source": [{"type": "git", "uri": "https://github.com/bloodywing/bloody.git"}, {"type": "git", "uri": "git://github.com/bloodywing/bloody.git"}, {"type": "git", "uri": "git@github.com:bloodywing/bloody.git"}], "feed": ["https://github.com/bloodywing/bloody/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-04-17 17:18:04 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "bobwya": {"quality": "experimental", "status": "unofficial", "name": "bobwya", "description": {"en": "Miscellaneous Gentoo ebuilds"}, "homepage": "https://github.com/bobwya/miscellaneous_ebuilds", "owner": [{"type": "person", "email": "bob.mt.wya@gmail.com", "name": "Bob Wya"}], "source": [{"type": "git", "uri": "https://github.com/bobwya/miscellaneous_ebuilds.git"}, {"type": "git", "uri": "git://github.com/bobwya/miscellaneous_ebuilds.git"}, {"type": "git", "uri": "git@github.com:bobwya/miscellaneous_ebuilds.git"}], "feed": ["https://github.com/bobwya/miscellaneous_ebuilds/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-23 14:18:29 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 496}, "bombo82": {"quality": "experimental", "status": "unofficial", "name": "bombo82", "description": {"en": "Bombo82's own gentoo overlay"}, "homepage": "https://github.com/bombo82/bombo82-overlay", "owner": [{"type": "person", "email": "bombo82@giannibombelli.it", "name": "Gianni Bombelli (bombo82)"}], "source": [{"type": "git", "uri": "https://github.com/bombo82/bombo82-overlay.git"}, {"type": "git", "uri": "git@github.com:bombo82/bombo82-overlay.git"}], "feed": ["https://github.com/bombo82/bombo82-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-21 13:17:58 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 22}, "booboo": {"quality": "experimental", "status": "unofficial", "name": "booboo", "description": {"en": "L29Ah personal overlay"}, "homepage": "https://github.com/l29ah/booboo", "owner": [{"type": "person", "email": "zl29ah@gmail.com", "name": "Sergey Alirzaev"}], "source": [{"type": "git", "uri": "https://github.com/l29ah/booboo.git"}], "feed": ["https://github.com/l29ah/booboo/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-18 00:41:08 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 424}, "brave-overlay": {"quality": "experimental", "status": "unofficial", "name": "brave-overlay", "description": {"en": "Brave Overlay"}, "homepage": "https://gitlab.com/jason.oliveira/brave-overlay", "owner": [{"type": "person", "email": "jason.oliveira@medicalcannab.is", "name": "Jason Oliveira"}], "source": [{"type": "git", "uri": "https://gitlab.com/jason.oliveira/brave-overlay.git"}], "feed": ["https://gitlab.com/jason.oliveira/brave-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-22 17:03:24 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 6}, "bright": {"quality": "experimental", "status": "unofficial", "name": "bright", "description": {"en": "BrightOne's personal overlay"}, "homepage": "https://github.com/filalex77/bright", "owner": [{"type": "person", "email": "brightone@protonmail.com", "name": "Oleksii Filonenko"}], "source": [{"type": "git", "uri": "https://github.com/filalex77/bright.git"}], "feed": ["https://github.com/filalex77/bright/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2019-07-25 22:54:21 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 33}, "brother-overlay": {"quality": "experimental", "status": "unofficial", "name": "brother-overlay", "description": {"en": "Brother printer and scanner software"}, "homepage": "https://github.com/stefan-langenmaier/brother-overlay", "owner": [{"type": "person", "email": "stefan.langenmaier+gentoo@gmail.com", "name": "Stefan Langenmaier"}], "source": [{"type": "git", "uri": "https://github.com/stefan-langenmaier/brother-overlay.git"}, {"type": "git", "uri": "git://github.com/stefan-langenmaier/brother-overlay.git"}, {"type": "git", "uri": "git@github.com:stefan-langenmaier/brother-overlay.git"}], "feed": ["https://github.com/stefan-langenmaier/brother-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-09-06 15:09:21 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 569}, "bubba": {"quality": "experimental", "status": "unofficial", "name": "bubba", "description": {"en": "\"Bubba\" platform support for Excito B2|3"}, "homepage": "https://github.com/gordonb3/bubba-overlay", "owner": [{"type": "person", "email": "gordon@bosvangennip.nl", "name": "Gordon Bos"}], "source": [{"type": "git", "uri": "https://github.com/gordonb3/bubba-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2020-10-22 09:59:29 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 61}, "bumblebee": {"quality": "experimental", "status": "unofficial", "name": "bumblebee", "description": {"en": "Packages related to the bumblebee project"}, "homepage": "https://github.com/Bumblebee-Project/bumblebee-gentoo/", "owner": [{"type": "person", "email": "mva@gentoo.org", "name": "Vadim A. Misbakh-Soloviov"}], "source": [{"type": "git", "uri": "git://github.com/Bumblebee-Project/bumblebee-gentoo"}], "feed": ["https://github.com/Bumblebee-Project/bumblebee-gentoo/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-02-17 00:03:28 +0700\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 6}, "buzden": {"quality": "experimental", "status": "unofficial", "name": "buzden", "description": {"en": "Personal overlay of Denis Buzdalov"}, "homepage": "https://github.com/buzden/buzden-overlay", "owner": [{"type": "person", "email": "public@buzden.ru", "name": "Denis Buzdalov"}], "source": [{"type": "git", "uri": "https://github.com/buzden/buzden-overlay.git"}, {"type": "git", "uri": "git://github.com/buzden/buzden-overlay.git"}, {"type": "git", "uri": "git@github.com:buzden/buzden-overlay.git"}], "feed": ["https://github.com/buzden/buzden-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-06 13:44:08 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 17}, "c2p-overlay": {"quality": "experimental", "status": "unofficial", "name": "c2p-overlay", "description": {"en": "Personal overlay of Karol Grudzi\u0144ski"}, "homepage": "https://github.com/karolgrudzinski/c2p-overlay", "owner": [{"type": "person", "email": "krlgrudzinski+gentoo@gmail.com", "name": "Karol Grudzi\u0144ski"}], "source": [{"type": "git", "uri": "https://github.com/karolgrudzinski/c2p-overlay.git"}, {"type": "git", "uri": "git://github.com/karolgrudzinski/c2p-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com:karolgrudzinski/c2p-overlay.git"}], "feed": ["https://github.com/karolgrudzinski/c2p-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2019-01-02 13:21:57 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 33}, "calculate": {"quality": "experimental", "status": "unofficial", "name": "calculate", "description": {"en": "Calculate Overlay"}, "homepage": "http://www.calculate-linux.org", "owner": [{"type": "person", "email": "at@calculate.ru"}], "source": [{"type": "git", "uri": "git://git.calculate-linux.org/calculate/calculate-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2020-10-23 09:16:15 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 279}, "canutethegreat-overlay": {"quality": "experimental", "status": "unofficial", "name": "canutethegreat-overlay", "description": {"en": "Overlay for personal projects, forks, and customizations"}, "homepage": "http://gentoo.canutethegreat.com/", "owner": [{"type": "person", "email": "canutethegreat@gmail.com", "name": "Ronald Farrer"}], "source": [{"type": "git", "uri": "https://github.com/CanuteTheGreat/canutethegreat-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/CanuteTheGreat/canutethegreat-overlay.git"}], "feed": ["https://github.com/CanuteTheGreat/canutethegreat-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-15 10:25:45 -0700\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 6}, "causelay": {"quality": "experimental", "status": "unofficial", "name": "causelay", "description": {"en": "Ari Malinen's personal overlay"}, "homepage": "https://github.com/causes-/causelay", "owner": [{"type": "person", "email": "ari.malinen@gmail.com", "name": "Ari Malinen"}], "source": [{"type": "git", "uri": "https://github.com/causes-/causelay.git"}, {"type": "git", "uri": "git@github.com:causes-/causelay.git"}], "feed": ["https://github.com/causes-/causelay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2015-02-08 18:21:31 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 35}, "ceamac": {"quality": "experimental", "status": "unofficial", "name": "ceamac", "description": {"en": "This is a small Gentoo overlay with ebuilds that I could not find elsewhere or that I had to modify for some reason."}, "homepage": "https://github.com/ceamac/overlay", "owner": [{"type": "person", "email": "ceamac.paragon@gmail.com", "name": "Viorel Munteanu"}], "source": [{"type": "git", "uri": "https://github.com/ceamac/overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/ceamac/overlay.git"}], "feed": ["https://github.com/ceamac/overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-09 15:36:32 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 9}, "cg": {"quality": "experimental", "status": "unofficial", "name": "cg", "description": {"en": "Computer graphics ebuilds for gentoo"}, "homepage": "https://github.com/brothermechanic/cg", "owner": [{"type": "person", "email": "brothermechanic@gmail.com"}], "source": [{"type": "git", "uri": "https://github.com/brothermechanic/cg.git"}], "x-state": "BAD_CACHE", "x-timestamp": "2020-10-14 11:49:02 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 137}, "chrisadr": {"quality": "experimental", "status": "unofficial", "name": "chrisadr", "description": {"en": "ChrisADR's personal overlay"}, "homepage": "https://github.com/ChrisADR/chrisadr-overlay", "owner": [{"type": "person", "email": "chrisadr@gentoo.org", "name": "Christopher D\u00edaz Riveros"}], "source": [{"type": "git", "uri": "https://github.com/ChrisADR/chrisadr-overlay.git"}, {"type": "git", "uri": "git@github.com:ChrisADR/chrisadr-overlay.git"}], "feed": ["https://github.com/ChrisADR/chrisadr-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2018-05-17 20:48:42 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 1}, "chrytoo": {"quality": "experimental", "status": "unofficial", "name": "chrytoo", "description": {"en": "Personal overlay for packages that usually aren't in the official repository..."}, "homepage": "https://github.com/chrytoo/gentoo-overlay", "owner": [{"type": "person", "email": "chry7oo@gmail.com", "name": "Milo\u0161 \u0110. Omeragi\u0107"}], "source": [{"type": "git", "uri": "https://github.com/chrytoo/gentoo-overlay.git"}, {"type": "git", "uri": "git://github.com/chrytoo/gentoo-overlay.git"}, {"type": "git", "uri": "git@github.com:chrytoo/gentoo-overlay.git"}], "feed": ["https://github.com/chrytoo/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2019-08-19 00:07:33 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "chutzpah": {"quality": "experimental", "status": "official", "name": "chutzpah", "description": {"en": "Random stuff I am working on which isn't ready for the tree for some reason"}, "homepage": "https://cgit.gentoo.org/dev/chutzpah.git/", "owner": [{"type": "person", "email": "chutzpah@gentoo.org", "name": "Patrick McLean"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/chutzpah.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/chutzpah"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/chutzpah.git"}], "feed": ["https://cgit.gentoo.org/dev/chutzpah.git/atom/"], "x-timestamp-command": ["git", "log", "--format=%ci", "-1"], "x-openpgp-signature-command": ["git", "show", "-q", "--pretty=format:%G?", "HEAD"], "x-state": "SYNC_FAIL"}, "chymeric": {"quality": "experimental", "status": "unofficial", "name": "chymeric", "description": {"en": "Overlay for scientific software and other utilities"}, "homepage": "https://github.com/TheChymera/overlay", "owner": [{"type": "person", "email": "chr@chymera.eu", "name": "Horea Christian"}], "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"}], "feed": ["https://github.com/TheChymera/overlay/commits/master.atom"], "x-state": "INVALID_METADATA", "x-timestamp": "2020-10-21 12:12:25 -0400\n", "x-openpgp-signed": "E", "x-masters": ["gentoo", "science"]}, "cj-overlay": {"quality": "experimental", "status": "official", "name": "cj-overlay", "description": {"en": "Christoph's Overlay"}, "homepage": "https://github.com/junghans/cj-overlay", "owner": [{"type": "person", "email": "junghans@gentoo.org"}], "source": [{"type": "git", "uri": "git://github.com/junghans/cj-overlay"}], "feed": ["https://github.com/junghans/cj-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2017-11-08 11:12:00 -0700\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 7}, "concaveoverlay": {"quality": "experimental", "status": "unofficial", "name": "concaveoverlay", "description": {"en": "concavegit's overlay."}, "homepage": "https://gitlab.com/concavegit/concaveoverlay", "owner": [{"type": "person", "email": "concavemail@gmail.com"}], "source": [{"type": "git", "uri": "https://gitlab.com/concavegit/concaveoverlay.git"}], "feed": ["https://gitlab.com/concavegit/concaveoverlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2019-11-23 19:42:16 +0000\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 23}, "crocket-overlay": {"quality": "experimental", "status": "unofficial", "name": "crocket-overlay", "description": {"en": "crocket's personal overlay"}, "homepage": "https://github.com/crocket/crocket-overlay", "owner": [{"type": "person", "email": "crockabiscuit@gmail.com", "name": "crocket"}], "source": [{"type": "git", "uri": "https://github.com/crocket/crocket-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/crocket/crocket-overlay.git"}], "feed": ["https://github.com/crocket/crocket-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-12 15:21:00 +0900\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 63}, "crossdev": {"quality": "experimental", "status": "unofficial", "name": "crossdev", "description": {"en": "Ebuilds for embedded systems", "ru": "\u041f\u0430\u043a\u0435\u0442\u044b \u0434\u043b\u044f \u0432\u0441\u0442\u0440\u0430\u0438\u0432\u0430\u0435\u043c\u044b\u0445 \u0441\u0438\u0441\u0442\u0435\u043c"}, "homepage": "https://github.com/alphallc/crossdev/", "owner": [{"type": "person", "email": "mva@gentoo.org", "name": "Vadim A. Misbakh-Soloviov"}], "source": [{"type": "git", "uri": "git://github.com/alphallc/crossdev"}], "feed": ["https://github.com/alphallc/crossdev/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2019-06-18 14:39:51 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "cynede": {"quality": "experimental", "status": "unofficial", "name": "cynede", "description": {"en": "Gentoo user overlay"}, "homepage": "https://github.com/Heather/gentoo-cynede", "owner": [{"type": "person", "email": "cynede@gentoo.org", "name": "Mikhail Pukhlikov"}], "source": [{"type": "git", "uri": "https://github.com/Heather/gentoo-cynede.git"}, {"type": "git", "uri": "git://github.com/Heather/gentoo-cynede.git"}, {"type": "git", "uri": "git@github.com:Heather/gentoo-cynede.git"}], "feed": ["https://github.com/Heather/gentoo-cynede/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-08-31 11:44:41 +0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 122}, "dMaggot": {"quality": "experimental", "status": "unofficial", "name": "dMaggot", "description": {"en": "Overlay of David E. Narv\u00e1ez"}, "homepage": "https://cgit.gentoo.org/user/dMaggot.git/", "owner": [{"type": "person", "email": "david.narvaez@computer.org", "name": "David E. Narv\u00e1ez"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/dMaggot.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/dMaggot.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/dMaggot.git"}], "feed": ["https://cgit.gentoo.org/user/dMaggot.git/atom/"], "x-state": "GOOD", "x-timestamp": "2017-06-01 22:09:38 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 8}, "darkelf": {"quality": "experimental", "status": "unofficial", "name": "darkelf", "description": {"en": "Overlay focusing on improved user experience for working in darkness on Xfce or zsh (including vim)"}, "homepage": "https://cgit.gentoo.org/repo/user/darkelf.git", "owner": [{"type": "person", "email": "sur3@gmx.de", "name": "Simon"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/user/darkelf.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/user/darkelf.git"}], "feed": ["https://cgit.gentoo.org/repo/user/darkelf.git/atom/"], "x-timestamp-command": ["git", "log", "--format=%ci", "-1"], "x-openpgp-signature-command": ["git", "show", "-q", "--pretty=format:%G?", "HEAD"], "x-state": "SYNC_FAIL"}, "darthgandalf-overlay": {"quality": "experimental", "status": "unofficial", "name": "darthgandalf-overlay", "description": {"en": "Personal overlay"}, "homepage": "https://github.com/DarthGandalf/gentoo-overlay", "owner": [{"type": "person", "email": "alexey+gentoo@asokolov.org", "name": "Alexey Sokolov"}], "source": [{"type": "git", "uri": "https://github.com/DarthGandalf/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/DarthGandalf/gentoo-overlay.git"}], "feed": ["https://github.com/DarthGandalf/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-03 20:01:01 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "deadbeef-overlay": {"quality": "experimental", "status": "unofficial", "name": "deadbeef-overlay", "description": {"en": "DeaDBeeF player overlay for Gentoo Linux"}, "homepage": "https://github.com/damex/deadbeef-overlay", "owner": [{"type": "person", "email": "damex.pp@gmail.com", "name": "Roman Kuzmitsky"}], "source": [{"type": "git", "uri": "https://github.com/damex/deadbeef-overlay.git"}], "feed": ["https://github.com/damex/deadbeef-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2019-06-06 14:06:08 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 53}, "decent-im": {"quality": "experimental", "status": "unofficial", "name": "decent-im", "description": {"en": "XMPP software overlay maintained by decent.im"}, "homepage": "https://github.com/decent-im/gentoo-overlay", "owner": [{"type": "person", "email": "andrey_utkin@gentoo.org", "name": "Andrey Utkin"}], "source": [{"type": "git", "uri": "https://github.com/decent-im/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/decent-im/gentoo-overlay.git"}], "feed": ["https://github.com/decent-im/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2019-09-17 18:48:52 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 6}, "deepin": {"quality": "experimental", "status": "unofficial", "name": "deepin", "description": {"en": "Gentoo Overlay for Deepin Desktop Environment"}, "homepage": "https://github.com/zhtengw/deepin-overlay", "owner": [{"type": "person", "email": "atenzd@gmail.com", "name": "Aten Zhang"}], "source": [{"type": "git", "uri": "git://github.com/zhtengw/deepin-overlay.git"}], "feed": ["https://github.com/zhtengw/deepin-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-11 19:41:13 +0800\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 171}, "defiance": {"quality": "experimental", "status": "unofficial", "name": "defiance", "description": {"en": "packages for cloud development"}, "homepage": "https://github.com/d3fy/defiance-overlay.git", "owner": [{"type": "person", "email": "dan@d3fy.net", "name": "Dan Molik"}], "source": [{"type": "git", "uri": "https://github.com/d3fy/defiance-overlay.git"}, {"type": "git", "uri": "git://github.com/d3fy/defiance-overlay.git"}, {"type": "git", "uri": "git@github.com:d3fy/defiance-overlay.git"}], "feed": ["https://github.com/d3fy/defiance-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-08-20 11:50:33 -0400\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 74}, "delicious-absurdities": {"quality": "experimental", "status": "unofficial", "name": "delicious-absurdities", "description": {"en": "Personal overlay with delicious absurdities"}, "homepage": "https://github.com/paraenggu/delicious-absurdities-overlay", "owner": [{"type": "person", "email": "c.affolter@purplehaze.ch", "name": "Christian Affolter"}], "source": [{"type": "git", "uri": "https://github.com/paraenggu/delicious-absurdities-overlay.git"}, {"type": "git", "uri": "git://github.com/paraenggu/delicious-absurdities-overlay.git"}, {"type": "git", "uri": "git@github.com:paraenggu/delicious-absurdities-overlay.git"}], "feed": ["https://github.com/paraenggu/delicious-absurdities-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-05-03 12:55:52 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 15}, "deter": {"quality": "experimental", "status": "unofficial", "name": "deter", "description": {"en": "Custom stuff from deterenkelt."}, "homepage": "https://github.com/deterenkelt/deter", "owner": [{"type": "person", "email": "deterenkelt.github@gmail.com", "name": "Deter Enkelt"}], "source": [{"type": "git", "uri": "https://github.com/deterenkelt/deter.git"}, {"type": "git", "uri": "git://github.com/deterenkelt/deter.git"}, {"type": "git", "uri": "git@github.com:deterenkelt/deter.git"}], "feed": ["https://github.com/deterenkelt/deter/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2020-10-08 10:09:05 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 8}, "dev1990-overlay": {"quality": "experimental", "status": "unofficial", "name": "dev1990-overlay", "description": {"en": "Personal overlay focused on Qt application development and 3d-printing."}, "homepage": "https://github.com/dev-0x7C6/dev1990-overlay.git", "owner": [{"type": "person", "email": "dev.strikeu@gmail.com", "name": "Bartlomiej Burdukiewicz"}], "source": [{"type": "git", "uri": "https://github.com/dev-0x7C6/dev1990-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2020-10-15 11:01:17 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 223}, "devpump-gor": {"quality": "experimental", "status": "unofficial", "name": "devpump-gor", "description": {"en": "DevPump Gentoo Overlay"}, "homepage": "https://github.com/DevPump/gentoo-overlay", "owner": [{"type": "person", "email": "devpump@gmail.com", "name": "Matt Fleming"}], "source": [{"type": "git", "uri": "https://github.com/DevPump/gentoo-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2016-07-06 07:57:12 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 13}, "didactic-duck": {"quality": "experimental", "status": "unofficial", "name": "didactic-duck", "description": {"en": "Some ebuilds that might work"}, "homepage": "https://github.com/lucianposton/didactic-duck", "owner": [{"type": "person", "email": "lucianposton@pm.me", "name": "Lucian Poston"}], "source": [{"type": "git", "uri": "https://github.com/lucianposton/didactic-duck.git"}], "feed": ["https://github.com/lucianposton/didactic-duck/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-03-18 22:02:03 -0500\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 80}, "dilfridge": {"quality": "experimental", "status": "official", "name": "dilfridge", "description": {"en": "Dilfridge overlay: experimental ebuilds and lab software"}, "homepage": "https://cgit.gentoo.org/dev/dilfridge.git/", "owner": [{"type": "person", "email": "dilfridge@gentoo.org", "name": "Andreas K. Huettel (dilfridge)"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/dilfridge.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/dilfridge.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/dilfridge.git"}], "feed": ["https://cgit.gentoo.org/dev/dilfridge.git/atom/"], "x-timestamp-command": ["git", "log", "--format=%ci", "-1"], "x-openpgp-signature-command": ["git", "show", "-q", "--pretty=format:%G?", "HEAD"], "x-state": "SYNC_FAIL"}, "displacer": {"quality": "experimental", "status": "unofficial", "name": "displacer", "description": {"en": "Fixes and new unstable packages"}, "homepage": "https://cgit.gentoo.org/user/displacer.git/", "owner": [{"type": "person", "email": "disinbox@gmail.com", "name": "Igor Ulyanov"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/displacer.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/displacer.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/displacer.git"}], "feed": ["https://cgit.gentoo.org/user/displacer.git/atom/"], "x-timestamp-command": ["git", "log", "--format=%ci", "-1"], "x-openpgp-signature-command": ["git", "show", "-q", "--pretty=format:%G?", "HEAD"], "x-state": "SYNC_FAIL"}, "distros": {"quality": "experimental", "status": "unofficial", "name": "distros", "description": {"en": "Calculate Linux Profiles"}, "homepage": "http://www.calculate-linux.org", "owner": [{"type": "person", "email": "at@calculate.ru"}], "source": [{"type": "git", "uri": "git://git.calculate-linux.org/calculate/distros-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2020-08-05 14:24:19 +0300\n", "x-openpgp-signed": "N", "x-masters": ["calculate", "gentoo"], "x-ebuild-count": 0}, "djc": {"quality": "experimental", "status": "unofficial", "name": "djc", "description": {"en": "Personal overlay; testing and early development"}, "homepage": "https://github.com/djc/djc-overlay", "owner": [{"type": "person", "email": "djc@gentoo.org", "name": "Dirkjan Ochtman"}], "source": [{"type": "git", "uri": "https://github.com/djc/djc-overlay.git"}, {"type": "git", "uri": "git://github.com/djc/djc-overlay.git"}, {"type": "git", "uri": "git@github.com:djc/djc-overlay.git"}], "feed": ["https://github.com/djc/djc-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2017-12-01 14:24:16 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "dlang": {"quality": "experimental", "status": "unofficial", "name": "dlang", "description": {"en": "A collection of ebuilds related to the D programming\n    language."}, "homepage": "https://github.com/gentoo/dlang", "owner": [{"type": "person", "email": "Marco.Leise@gmx.de"}], "source": [{"type": "git", "uri": "https://github.com/gentoo/dlang.git"}, {"type": "git", "uri": "git@github.com:gentoo/dlang.git"}, {"type": "git", "uri": "git://github.com/gentoo/dlang.git"}], "feed": ["https://github.com/gentoo/dlang/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-08-15 19:55:36 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 85}, "dmchurch": {"quality": "experimental", "status": "unofficial", "name": "dmchurch", "description": {"en": "Danielle Church's Portage overlay"}, "homepage": "https://github.com/dmchurch/portage-overlay", "owner": [{"type": "person", "email": "dani.church@gmail.com", "name": "Danielle Church"}], "source": [{"type": "git", "uri": "https://github.com/dmchurch/portage-overlay.git"}, {"type": "git", "uri": "git://github.com/dmchurch/portage-overlay.git"}, {"type": "git", "uri": "git@github.com:dmchurch/portage-overlay.git"}], "feed": ["https://github.com/dmchurch/portage-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-16 15:30:39 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 3}, "docker": {"quality": "experimental", "status": "unofficial", "name": "docker", "description": {"en": "Overlay for docker by dotCloud"}, "homepage": "https://github.com/tianon/docker-overlay", "owner": [{"type": "person", "email": "admwiggin@gmail.com", "name": "Tianon Gravi"}], "source": [{"type": "git", "uri": "https://github.com/tianon/docker-overlay.git"}, {"type": "git", "uri": "git://github.com/tianon/docker-overlay.git"}, {"type": "git", "uri": "git@github.com:tianon/docker-overlay.git"}], "feed": ["https://github.com/tianon/docker-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2019-08-28 15:01:25 -0700\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 300}, "dotnet": {"quality": "experimental", "status": "official", "name": "dotnet", "description": {"en": "Experimental overlay for .NET packages."}, "homepage": "https://github.com/gentoo/dotnet", "owner": [{"type": "project", "email": "dotnet@gentoo.org", "name": "Dotnet team"}], "source": [{"type": "git", "uri": "https://github.com/gentoo/dotnet.git"}, {"type": "git", "uri": "git@github.com:gentoo/dotnet.git"}], "feed": ["https://github.com/gentoo/dotnet/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-15 21:37:41 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 170}, "drdim": {"quality": "experimental", "status": "unofficial", "name": "drdim", "description": {"en": "Gentoo Layman portage repository for Jetbrains Products"}, "homepage": "https://github.com/drdim/layman", "owner": [{"type": "person", "email": "dr.dim.pro@gmail.com", "name": "Dmitriy Bogatkin"}], "source": [{"type": "git", "uri": "https://github.com/drdim/layman.git"}, {"type": "git", "uri": "git://github.com/drdim/layman.git"}, {"type": "git", "uri": "git@github.com:drdim/layman.git"}], "feed": ["https://github.com/drdim/layman/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2016-04-14 05:51:00 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 44}, "dwfreed": {"quality": "experimental", "status": "unofficial", "name": "dwfreed", "description": {"en": "My random Gentoo packages"}, "homepage": "https://bitbucket.org/dwfreed/dwfreed.gentoo/", "owner": [{"type": "person", "email": "dwfreed@mtu.edu", "name": "Douglas Freed"}], "source": [{"type": "git", "uri": "https://bitbucket.org/dwfreed/dwfreed.gentoo"}], "feed": ["https://bitbucket.org/dwfreed/dwfreed.gentoo/rss"], "x-state": "GOOD", "x-timestamp": "2017-04-09 01:17:09 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "dwosky": {"quality": "experimental", "status": "unofficial", "name": "dwosky", "description": {"en": "Dwosky's personal overlay"}, "homepage": "https://github.com/Dwosky/Dwosky-overlay", "owner": [{"type": "person", "email": "dwosky@zoho.com", "name": "Pedro Arizmendi"}], "source": [{"type": "git", "uri": "https://github.com/Dwosky/Dwosky-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/Dwosky/Dwosky-overlay.git"}], "feed": ["https://github.com/Dwosky/Dwosky-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-03-10 18:31:17 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 14}, "earshark": {"quality": "experimental", "status": "unofficial", "name": "earshark", "description": {"en": "personal overlay, mostly games related"}, "homepage": "https://github.com/Chemrat/overlay", "owner": [{"type": "person", "email": "jazzvoid@gmail.com", "name": "Valeriy"}], "source": [{"type": "git", "uri": "https://github.com/Chemrat/overlay.git"}, {"type": "git", "uri": "git://github.com/Chemrat/overlay.git"}], "feed": ["https://github.com/Chemrat/overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-20 10:59:51 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 33}, "eclipse": {"quality": "experimental", "status": "official", "name": "eclipse", "description": {"en": "Community effort at packaging Eclipse Java SDK"}, "homepage": "https://github.com/gentoo/eclipse-overlay", "owner": [{"type": "project", "email": "eclipse@gentoo.org", "name": "Eclipse team"}], "source": [{"type": "git", "uri": "https://github.com/gentoo/eclipse-overlay.git"}, {"type": "git", "uri": "git://github.com/gentoo/eclipse-overlay.git"}, {"type": "git", "uri": "git@github.com:gentoo/eclipse-overlay.git"}], "feed": ["https://github.com/gentoo/eclipse-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2017-06-24 14:34:45 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 13}, "edgets": {"quality": "experimental", "status": "unofficial", "name": "edgets", "description": {"en": "Gentoo overlay that brings you the newest versions of modern software."}, "homepage": "https://github.com/BlueManCZ/edgets", "owner": [{"type": "person", "email": "ivo97@centrum.cz", "name": "Ivo \u0160merek"}], "source": [{"type": "git", "uri": "https://github.com/BlueManCZ/edgets.git"}, {"type": "git", "uri": "git+ssh://git@github.com/BlueManCZ/edgets.git"}], "feed": ["https://github.com/BlueManCZ/edgets/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-20 16:29:51 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 61}, "eigenlay": {"quality": "experimental", "status": "unofficial", "name": "eigenlay", "description": {"en": "Eigenlab Gentoo overlay"}, "homepage": "https://gitlab.com/eigennet/eigenlay", "owner": [{"type": "person", "email": "gio@eigenlab.org", "name": "Gioacchino Mazzurco"}], "source": [{"type": "git", "uri": "https://gitlab.com/eigennet/eigenlay.git"}], "x-state": "GOOD", "x-timestamp": "2020-04-01 16:18:39 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 16}, "einflay": {"quality": "experimental", "status": "unofficial", "name": "einflay", "description": {"en": "Personal overlay"}, "homepage": "https://github.com/EinstokFair/einflay", "owner": [{"type": "person", "email": "einfair@zoho.eu", "name": "Einstok Fair"}], "source": [{"type": "git", "uri": "https://github.com/EinstokFair/einflay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/EinstokFair/einflay.git"}], "feed": ["https://github.com/EinstokFair/einflay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-08-09 18:52:43 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 16}, "ejabberd": {"quality": "experimental", "status": "unofficial", "name": "ejabberd", "description": {"en": "Fresh ejabberd versions and dependencies"}, "homepage": "https://github.com/rion-overlay/ejabberd-overlay", "owner": [{"type": "person", "email": "rion4ik@gmail.com", "name": "Sergey Ilinykh"}], "source": [{"type": "git", "uri": "https://github.com/rion-overlay/ejabberd-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/rion-overlay/ejabberd-overlay.git"}], "feed": ["https://github.com/rion-overlay/ejabberd-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-04-30 13:18:01 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 0}, "elementary": {"quality": "experimental", "status": "unofficial", "name": "elementary", "description": {"en": "The elementary OS experience for Gentoo Linux. "}, "homepage": "https://github.com/pimvullers/elementary", "owner": [{"type": "person", "email": "gentoo.org@vullersmail.nl", "name": "Pim Vullers"}], "source": [{"type": "git", "uri": "https://github.com/pimvullers/elementary.git"}, {"type": "git", "uri": "git://github.com/pimvullers/elementary.git"}], "feed": ["https://github.com/pimvullers/elementary/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-08-03 22:01:16 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 136}, "elopez-r-overlay": {"quality": "experimental", "status": "unofficial", "name": "elopez-r-overlay", "description": {"en": "My Gentoo overlay for Ebuilds"}, "homepage": "https://gitlab.com/libre_hackerman/elopez-r-overlay", "owner": [{"type": "person", "email": "gnu_stallman@protonmail.ch", "name": "Esteban L\u00f3pez Rodr\u00edguez"}], "source": [{"type": "git", "uri": "https://gitlab.com/libre_hackerman/elopez-r-overlay.git"}, {"type": "git", "uri": "git+ssh://git@gitlab.com:libre_hackerman/elopez-r-overlay.git"}], "feed": ["https://gitlab.com/libre_hackerman/elopez-r-overlay/-/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-11 01:24:54 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 23}, "emacs": {"quality": "experimental", "status": "official", "name": "emacs", "description": {"en": "Provide Emacs and XEmacs related ebuilds which are\n    experimental or work-in-progress. Don't rely on them, but don't\n    hesitate to file bugs or write emails."}, "homepage": "https://wiki.gentoo.org/wiki/Project:Emacs/Overlay", "owner": [{"type": "project", "email": "emacs@gentoo.org", "name": "Gentoo Emacs team"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/proj/emacs.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/repo/proj/emacs.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/proj/emacs.git"}], "feed": ["https://cgit.gentoo.org/repo/proj/emacs.git/atom/"], "x-timestamp-command": ["git", "log", "--format=%ci", "-1"], "x-openpgp-signature-command": ["git", "show", "-q", "--pretty=format:%G?", "HEAD"], "x-state": "SYNC_FAIL"}, "enlightenment-live": {"quality": "experimental", "status": "unofficial", "name": "enlightenment-live", "description": {"en": "Enlightenment WM latest stable version and live ebuilds"}, "homepage": "https://github.com/rafspiny/enlightenment-live", "owner": [{"type": "person", "email": "rafspiny@gmail.com", "name": "Raffaele Spinelli"}], "source": [{"type": "git", "uri": "https://github.com/rafspiny/enlightenment-live.git"}], "feed": ["https://github.com/rafspiny/enlightenment-live/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-08-19 09:54:21 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 22}, "ennui": {"quality": "experimental", "status": "unofficial", "name": "ennui", "description": {"en": "Facilitate running hardened-desktop hybrid system"}, "homepage": "https://gitweb.gentoo.org/user/ennui.git/", "owner": [{"type": "person", "email": "gentoo@seaofdirac.net", "name": "Nicholas Fish"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/ennui.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/ennui.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/ennui.git"}], "feed": ["https://gitweb.gentoo.org/user/ennui.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-04-17 23:15:42 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 40}, "equaeghe": {"quality": "experimental", "status": "unofficial", "name": "equaeghe", "description": {"en": "Erik Quaeghebeur's personal Gentoo overlay"}, "homepage": "https://github.com/equaeghe/gentoo-overlay/", "owner": [{"type": "person", "email": "gentoo@e3q.eu", "name": "Erik Quaeghebeur"}], "source": [{"type": "git", "uri": "https://github.com/equaeghe/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/equaeghe/gentoo-overlay.git"}], "feed": ["https://github.com/equaeghe/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-11 22:11:17 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 9}, "erayd": {"quality": "experimental", "status": "unofficial", "name": "erayd", "description": {"en": "Various personal ebuilds"}, "homepage": "https://github.com/erayd/overlay", "owner": [{"type": "person", "email": "steve@erayd.net", "name": "Steve Gilberd"}], "source": [{"type": "git", "uri": "https://github.com/erayd/overlay.git"}, {"type": "git", "uri": "git://github.com/erayd/overlay.git"}, {"type": "git", "uri": "git@github.com:erayd/overlay.git"}], "feed": ["https://github.com/erayd/overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-07-20 17:20:54 +1200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 9}, "ethereum": {"quality": "experimental", "status": "unofficial", "name": "ethereum", "description": {"en": "The Ethereum blockchain-based distributed computing platform"}, "homepage": "https://github.com/coolparadox/ethereum-gentoo-overlay", "owner": [{"type": "person", "email": "coolparadox@gmail.com", "name": "Rafael Lorandi"}], "source": [{"type": "git", "uri": "https://github.com/coolparadox/ethereum-gentoo-overlay.git"}, {"type": "git", "uri": "git@github.com:coolparadox/ethereum-gentoo-overlay.git"}], "feed": ["https://github.com/coolparadox/ethereum-gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-01-27 18:18:54 -0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 6}, "eugene-bright": {"quality": "experimental", "status": "unofficial", "name": "eugene-bright", "description": {"en": "The personal overlay of Eugene Bright"}, "homepage": "https://github.com/eugene-bright/eugene-bright-overlay", "owner": [{"type": "person", "email": "eugene@bright.gdn", "name": "Eugene Bright"}], "source": [{"type": "git", "uri": "https://github.com/eugene-bright/eugene-bright-overlay.git"}, {"type": "git", "uri": "git@github.com:eugene-bright/eugene-bright-overlay.git"}], "feed": ["https://github.com/eugene-bright/eugene-bright-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-08-18 15:35:56 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "ext-devlibs": {"quality": "experimental", "status": "unofficial", "name": "ext-devlibs", "description": {"en": "Mostly c/c++ and python libraries"}, "homepage": "http://sidvind.com/wiki/Main_Page", "owner": [{"type": "person", "email": "ext@sidvind.com", "name": "David Sveningsson"}], "source": [{"type": "svn", "uri": "svn://sidvind.com/overlays/ext-devlibs"}], "x-state": "GOOD", "x-timestamp": "2020-02-11 17:20:29 +0000\n", "x-masters": ["gentoo"], "x-ebuild-count": 24}, "farmboy0": {"quality": "experimental", "status": "unofficial", "name": "farmboy0", "description": {"en": "Personal overlay of Enrico Horn"}, "homepage": "https://github.com/farmboy0/portage-overlay", "owner": [{"type": "person", "email": "farmboy0@googlemail.com", "name": "Enrico Horn"}], "source": [{"type": "git", "uri": "https://github.com/farmboy0/portage-overlay.git"}, {"type": "git", "uri": "git://github.com/farmboy0/portage-overlay.git"}, {"type": "git", "uri": "git@github.com:farmboy0/portage-overlay.git"}], "feed": ["https://github.com/farmboy0/portage-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-07-20 22:28:52 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 32}, "fem-overlay": {"quality": "experimental", "status": "unofficial", "name": "fem-overlay", "description": {"en": "FeM Gentoo Overlay"}, "homepage": "https://bitbucket.fem.tu-ilmenau.de/projects/GENTOO/repos/fem-overlay/", "owner": [{"type": "person", "email": "frainz@mailbox.org", "name": "Paul Michel"}], "source": [{"type": "git", "uri": "https://bitbucket.fem.tu-ilmenau.de/scm/gentoo/fem-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2020-10-16 20:51:28 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 121}, "ferki": {"quality": "experimental", "status": "unofficial", "name": "ferki", "description": {"en": "Ebuilds used and/or proxy maintained by FErki"}, "homepage": "https://github.com/ferki/gentoo-overlay", "owner": [{"type": "person", "email": "erkiferenc@gmail.com", "name": "Ferenc Erki"}], "source": [{"type": "git", "uri": "https://github.com/ferki/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/ferki/gentoo-overlay.git"}], "feed": ["https://github.com/ferki/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-12 16:04:53 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 22}, "fidonet": {"quality": "experimental", "status": "unofficial", "name": "fidonet", "description": {"en": "Overlay of Benny Pedersen"}, "owner": [{"type": "person", "email": "me@junc.org", "name": "Benny Pedersen"}], "source": [{"type": "rsync", "uri": "rsync://fidonet.overlay.junc.org/fidonet/"}], "x-state": "GOOD", "x-timestamp": "2020-08-14 10:28:43.000000000 +0000\n", "x-masters": ["gentoo"], "x-ebuild-count": 38}, "fkmclane": {"quality": "experimental", "status": "unofficial", "name": "fkmclane", "description": {"en": "Personal overlay of fkmclane containing patched ebuilds and new ebuilds"}, "homepage": "https://github.com/fkmclane/overlay", "owner": [{"type": "person", "email": "fkmclane@gmail.com", "name": "Foster McLane"}], "source": [{"type": "git", "uri": "https://github.com/fkmclane/overlay.git"}, {"type": "git", "uri": "git://github.com/fkmclane/overlay.git"}], "feed": ["https://github.com/fkmclane/overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2020-04-28 18:35:22 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 121}, "flammie": {"quality": "experimental", "status": "unofficial", "name": "flammie", "description": {"en": "An overlay for gentoo for things Flammie's worked on: Apertium, HFST, computational linguistics, spell-checking, obscure languages..."}, "homepage": "https://github.com/flammie/flammie-overlay", "owner": [{"type": "person", "email": "flammie@gentoo.org", "name": "Flammie Pirinen"}], "source": [{"type": "git", "uri": "https://github.com/flammie/flammie-overlay.git"}, {"type": "git", "uri": "git://github.com/flammie/flammie-overlay.git"}], "feed": ["https://github.com/flammie/flammie-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2019-01-22 15:18:57 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 31}, "flavour": {"quality": "experimental", "status": "unofficial", "name": "flavour", "description": {"en": "Personal overlay of Wim Muskee"}, "homepage": "https://github.com/wimmuskee/flavour", "owner": [{"type": "person", "email": "wimmuskee@gmail.com", "name": "Wim Muskee"}], "source": [{"type": "git", "uri": "https://github.com/wimmuskee/flavour.git"}, {"type": "git", "uri": "git://github.com/wimmuskee/flavour.git"}], "x-state": "GOOD", "x-timestamp": "2020-10-18 08:03:17 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 43}, "flewkey-overlay": {"quality": "experimental", "status": "unofficial", "name": "flewkey-overlay", "description": {"en": "Personal Gentoo overlay for flewkey"}, "homepage": "https://git.sdf.org/flewkey/flewkey-overlay", "owner": [{"type": "person", "email": "flewkey@2a03.party", "name": "Ryan Fox"}], "source": [{"type": "git", "uri": "https://git.sdf.org/flewkey/flewkey-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2020-10-05 03:31:01 +0000\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 59}, "flightsim": {"quality": "experimental", "status": "unofficial", "name": "flightsim", "description": {"en": "Overlay with packages for flight simulation, mainly related to X-Plane"}, "homepage": "https://github.com/rafaelmartins/flightsim-overlay", "owner": [{"type": "person", "email": "rafaelmartins@gentoo.org", "name": "Rafael G. Martins"}], "source": [{"type": "git", "uri": "https://github.com/rafaelmartins/flightsim-overlay.git"}, {"type": "git", "uri": "git://github.com/rafaelmartins/flightsim-overlay.git"}, {"type": "git", "uri": "git@github.com:rafaelmartins/flightsim-overlay.git"}], "feed": ["https://github.com/rafaelmartins/flightsim-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2017-05-07 01:00:51 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "floppym": {"quality": "experimental", "status": "unofficial", "name": "floppym", "description": {"en": "floppym's personal overlay"}, "homepage": "https://github.com/floppym/floppym", "owner": [{"type": "person", "email": "floppym@gentoo.org", "name": "Mike Gilbert"}], "source": [{"type": "git", "uri": "https://github.com/floppym/floppym"}], "x-state": "GOOD", "x-timestamp": "2020-06-08 23:59:27 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 8}, "flow": {"quality": "experimental", "status": "unofficial", "name": "flow", "description": {"en": "Ebuilds by Florian Schmaus"}, "homepage": "https://gitlab.com/Flow/flow-s-ebuilds", "owner": [{"type": "person", "email": "flo@geekplace.eu", "name": "Florian Schmaus"}], "source": [{"type": "git", "uri": "https://gitlab.com/Flow/flow-s-ebuilds.git"}], "x-state": "GOOD", "x-timestamp": "2020-09-30 22:27:54 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 108}, "flussence": {"quality": "experimental", "status": "unofficial", "name": "flussence", "description": {"en": "Ant P.'s personal overlay"}, "homepage": "https://repo.or.cz/flussence-overlay.git", "owner": [{"type": "person", "email": "ant+gentoo.bugs@flussence.eu", "name": "Anthony Parsons"}], "source": [{"type": "git", "uri": "https://repo.or.cz/flussence-overlay.git"}, {"type": "git", "uri": "git://repo.or.cz/flussence-overlay.git"}, {"type": "git", "uri": "ssh://git@repo.or.cz/flussence-overlay.git"}], "feed": ["https://repo.or.cz/flussence-overlay.git/atom"], "x-state": "GOOD", "x-timestamp": "2020-10-19 12:03:51 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 53}, "fol4": {"quality": "experimental", "status": "unofficial", "name": "fol4", "description": {"en": "fol4 overlay"}, "homepage": "https://gitlab.com/madsl/fol4", "owner": [{"type": "person", "email": "mads@ab3.no", "name": "Mads"}], "source": [{"type": "git", "uri": "https://gitlab.com/madsl/fol4"}, {"type": "git", "uri": "git+ssh://git@gitlab.com/madsl/fol4.git"}], "feed": ["https://gitlab.com/madsl/fol4/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-13 11:21:33 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 55}, "foo-overlay": {"quality": "experimental", "status": "unofficial", "name": "foo-overlay", "description": {"en": "Piotr's fixes and new packages"}, "homepage": "https://github.com/slashbeast/foo-overlay", "owner": [{"type": "person", "email": "slashbeast@gentoo.org", "name": "Piotr Karbowski"}], "source": [{"type": "git", "uri": "git://github.com/slashbeast/foo-overlay.git"}, {"type": "git", "uri": "https://github.com/slashbeast/foo-overlay.git"}], "feed": ["https://github.com/slashbeast/foo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-01-19 16:39:22 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 12}, "fordfrog": {"quality": "experimental", "status": "official", "name": "fordfrog", "description": {"en": "Developer overlay"}, "homepage": "https://cgit.gentoo.org/dev/fordfrog.git/", "owner": [{"type": "person", "email": "fordfrog@gentoo.org", "name": "Miroslav \u0160ulc"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/fordfrog.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/fordfrog.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/fordfrog.git"}], "feed": ["https://cgit.gentoo.org/dev/fordfrog.git/atom/"], "x-timestamp-command": ["git", "log", "--format=%ci", "-1"], "x-openpgp-signature-command": ["git", "show", "-q", "--pretty=format:%G?", "HEAD"], "x-state": "SYNC_FAIL"}, "fowlay": {"quality": "experimental", "status": "unofficial", "name": "fowlay", "description": {"en": "Collection of ebuilds"}, "homepage": "https://github.com/fowlay/fowlay-overlay", "owner": [{"type": "person", "email": "rabbe@bahnhof.se", "name": "Rabbe Fogelholm"}], "source": [{"type": "git", "uri": "https://github.com/fowlay/fowlay-overlay.git"}], "feed": ["https://github.com/fowlay/fowlay-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2018-04-07 14:41:09 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 1}, "foxiverlay": {"quality": "experimental", "status": "unofficial", "name": "foxiverlay", "description": {"en": "Personal overlay for unofficial ebuilds"}, "homepage": "https://github.com/Pekkari/foxiverlay", "owner": [{"type": "person", "email": "koalinux@gmail.com", "name": "Jos\u00e9 Pekkarinen"}], "source": [{"type": "git", "uri": "https://github.com/Pekkari/foxiverlay.git"}, {"type": "git", "uri": "git://github.com/Pekkari/foxiverlay.git"}, {"type": "git", "uri": "git@github.com:Pekkari/foxiverlay.git"}], "feed": ["https://github.com/Pekkari/foxiverlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2019-10-26 17:15:39 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 9}, "freeswitch": {"quality": "experimental", "status": "unofficial", "name": "freeswitch", "description": {"en": "Freeswitch Gentoo overlay"}, "homepage": "https://github.com/alphallc/freeswitch/", "owner": [{"type": "person", "email": "mva@gentoo.org", "name": "Vadim A. Misbakh-Soloviov"}], "source": [{"type": "git", "uri": "git://github.com/alphallc/freeswitch"}], "feed": ["https://github.com/alphallc/freeswitch/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2019-05-31 12:46:26 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 31}, "fritteli": {"quality": "experimental", "status": "unofficial", "name": "fritteli", "description": {"en": "fritteli's Gentoo Overlay"}, "homepage": "https://github.com/fritteli/gentoo-overlay", "owner": [{"type": "person", "email": "manuel@fritteli.ch", "name": "Manuel Friedli"}], "source": [{"type": "git", "uri": "https://github.com/fritteli/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/fritteli/gentoo-overlay.git"}], "feed": ["https://github.com/fritteli/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-21 17:25:27 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 36}, "frostyx": {"quality": "experimental", "status": "unofficial", "name": "frostyx", "description": {"en": "FrostyX's personal overlay"}, "homepage": "http://frostyx.cz/", "owner": [{"type": "person", "email": "frostyx@email.cz", "name": "FrostyX"}], "source": [{"type": "git", "uri": "https://github.com/FrostyX/gentoo-overlay.git"}, {"type": "git", "uri": "git://github.com/FrostyX/gentoo-overlay.git"}, {"type": "git", "uri": "git@github.com:FrostyX/gentoo-overlay.git"}], "feed": ["https://github.com/FrostyX/gentoo-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2015-02-09 02:17:56 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 1}, "frr-gentoo": {"quality": "stable", "status": "official", "name": "frr-gentoo", "description": {"en": "Free Range Routing Gentoo Overlay"}, "homepage": "https://frrouting.org/", "owner": [{"type": "person", "email": "f0o@devilcode.org", "name": "Daniel 'f0o' Preussker"}], "source": [{"type": "git", "uri": "https://github.com/FRRouting/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com:FRRouting/gentoo-overlay.git"}], "feed": ["https://github.com/FRRouting/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-09-16 11:18:22 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 46}, "fusion809": {"quality": "experimental", "status": "unofficial", "name": "fusion809", "description": {"en": "Brenton's Portage overlay"}, "homepage": "https://github.com/fusion809/fusion809-overlay", "owner": [{"type": "person", "email": "brentonhorne77@gmail.com", "name": "Brenton Horne"}], "source": [{"type": "git", "uri": "https://github.com/fusion809/fusion809-overlay.git"}, {"type": "git", "uri": "git://github.com/fusion809/fusion809-overlay.git"}], "feed": ["https://github.com/fusion809/fusion809-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-24 00:09:48 +1000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 16}, "fuverlay": {"quality": "experimental", "status": "unofficial", "name": "fuverlay", "description": {"en": "Funkill's overlay"}, "homepage": "https://github.com/funkill/fuverlay", "owner": [{"type": "person", "email": "funkill2@gmail.com", "name": "Funkill"}], "source": [{"type": "git", "uri": "https://github.com/funkill/fuverlay.git"}], "feed": ["https://github.com/funkill/fuverlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2019-02-03 01:49:12 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 7}, "gamarouns": {"quality": "experimental", "status": "unofficial", "name": "gamarouns", "description": {"en": "Bits and pieces missing in gentoo or layman repos I need"}, "homepage": "https://github.com/Amaroun/gamarouns", "owner": [{"type": "person", "email": "vit.kasal@gmail.com", "name": "amaroun"}], "source": [{"type": "git", "uri": "https://github.com/Amaroun/gamarouns.git"}], "x-state": "GOOD", "x-timestamp": "2020-10-16 15:52:12 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 61}, "gambas-overlay": {"quality": "experimental", "status": "unofficial", "name": "gambas-overlay", "description": {"en": "Gambas IDE overlay for Gentoo Linux"}, "homepage": "https://github.com/damex/gambas-overlay", "owner": [{"type": "person", "email": "damex.pp@gmail.com", "name": "Roman Kuzmitsky"}], "source": [{"type": "git", "uri": "https://github.com/damex/gambas-overlay.git"}], "feed": ["https://github.com/damex/gambas-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2016-02-10 01:31:50 +0700\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "gamerlay": {"quality": "experimental", "status": "unofficial", "name": "gamerlay", "description": {"en": "\n      Gamers overlay for all various games. Not related with games team.\n    "}, "homepage": "https://cgit.gentoo.org/proj/gamerlay.git", "owner": [{"type": "person", "email": "mva@gentoo.org", "name": "Vadim A. Misbakh-Soloviov"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/gamerlay.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/gamerlay.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/gamerlay.git"}], "feed": ["https://cgit.gentoo.org/proj/gamerlay.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-06-23 11:32:19 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 105}, "gcarq": {"quality": "experimental", "status": "unofficial", "name": "gcarq", "description": {"en": "Personal overlay"}, "homepage": "https://github.com/gcarq/gcarq-overlay", "owner": [{"type": "person", "email": "michael.egger@tsn.at", "name": "Michael Egger"}], "source": [{"type": "git", "uri": "https://github.com/gcarq/gcarq-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/gcarq/gcarq-overlay.git"}], "feed": ["https://github.com/gcarq/gcarq-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-02 03:28:03 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 8}, "genthree": {"quality": "experimental", "status": "unofficial", "name": "genthree", "description": {"en": "Gentoo overlay from the genthree project"}, "homepage": "https://genthree.io/overlay", "owner": [{"type": "person", "email": "nyronium@genthree.io", "name": "nyronium"}], "source": [{"type": "git", "uri": "https://gitlab.com/genthree/overlay.git"}], "feed": ["https://gitlab.com/genthree/overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-04-18 16:27:50 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 49}, "gentoo": {"quality": "core", "status": "official", "name": "gentoo", "description": {"en": "Official Gentoo ebuild repository"}, "homepage": "https://gentoo.org/", "owner": [{"type": "project", "email": "bug-wranglers@gentoo.org"}], "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"}], "feed": ["https://cgit.gentoo.org/repo/gentoo.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-10-23 14:46:48 +0200\n", "x-openpgp-signed": "U", "x-masters": [], "x-ebuild-count": 30772}, "gentoo-clang": {"quality": "experimental", "status": "unofficial", "name": "gentoo-clang", "description": {"en": "Gentoo overlay providing patches to build entire system with clang"}, "homepage": "https://github.com/BilyakA/gentoo-clang", "owner": [{"type": "person", "email": "bilyak.alexander@gmail.com", "name": "Alexander Bilyak"}], "source": [{"type": "git", "uri": "https://github.com/BilyakA/gentoo-clang.git"}, {"type": "git", "uri": "git://github.com/BilyakA/gentoo-clang.git"}, {"type": "git", "uri": "git@github.com:BilyakA/gentoo-clang.git"}], "feed": ["https://github.com/BilyakA/gentoo-clang/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-05-29 09:13:01 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 12}, "gentoo-mate": {"quality": "experimental", "status": "official", "name": "gentoo-mate", "description": {"en": "Gentoo MATE Desktop Project Repo"}, "homepage": "https://wiki.gentoo.org/wiki/Project:MATE", "owner": [{"type": "project", "email": "mate@gentoo.org", "name": "MATE Desktop Project"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/gentoo-mate.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/gentoo-mate.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/gentoo-mate.git"}], "feed": ["https://cgit.gentoo.org/proj/gentoo-mate.git/atom/"], "x-timestamp-command": ["git", "log", "--format=%ci", "-1"], "x-openpgp-signature-command": ["git", "show", "-q", "--pretty=format:%G?", "HEAD"], "x-state": "SYNC_FAIL"}, "gentoo-playground": {"quality": "experimental", "status": "unofficial", "name": "gentoo-playground", "description": {"en": "zeq's Playground for experimental ebuilds and eclasses"}, "homepage": "https://github.com/sjnewbury/gentoo-playground", "owner": [{"type": "person", "email": "steve@snewbury.org.uk", "name": "Steven Newbury"}], "source": [{"type": "git", "uri": "https://github.com/sjnewbury/gentoo-playground.git"}, {"type": "git", "uri": "git://github.com/sjnewbury/gentoo-playground.git"}, {"type": "git", "uri": "git@github.com:sjnewbury/gentoo-playground.git"}], "feed": ["https://github.com/sjnewbury/gentoo-playground/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2019-05-24 17:39:11 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 32}, "gentoo-zh": {"quality": "experimental", "status": "unofficial", "name": "gentoo-zh", "description": {"en": "To provide programs useful to Chinese speaking users (merged\n      from gentoo-china and gentoo-taiwan)."}, "homepage": "https://github.com/microcai/gentoo-zh", "owner": [{"type": "person", "email": "microcai@fedoraproject.org"}], "source": [{"type": "git", "uri": "git://github.com/microcai/gentoo-zh.git"}], "feed": ["https://github.com/microcai/gentoo-zh/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-12 11:50:26 +0800\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 503}, "gerislay": {"quality": "experimental", "status": "unofficial", "name": "gerislay", "description": {"en": "A personal overlay with no specific focus (mainly to\n      test ebuilds). Highly experimental. It is meant as a playground for me,\n      but others might be interested."}, "homepage": "https://cgit.gentoo.org/repo/user/gerislay.git", "owner": [{"type": "person", "email": "gerion.entrup@flump.de", "name": "gerion"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/user/gerislay.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/user/gerislay.git"}], "feed": ["https://cgit.gentoo.org/repo/user/gerislay.git/atom/"], "x-timestamp-command": ["git", "log", "--format=%ci", "-1"], "x-openpgp-signature-command": ["git", "show", "-q", "--pretty=format:%G?", "HEAD"], "x-state": "SYNC_FAIL"}, "gig": {"quality": "experimental", "status": "unofficial", "name": "gig", "description": {"en": "Gig OS's Overlay"}, "homepage": "https://github.com/Gig-OS/gig", "owner": [{"type": "person", "email": "yangmame@i2pmail.org"}], "source": [{"type": "git", "uri": "https://github.com/Gig-OS/gig.git"}], "feed": ["https://github.com/Gig-OS/gig/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-08 12:58:57 +0800\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 39}, "gitlab": {"quality": "experimental", "status": "unofficial", "name": "gitlab", "description": {"en": "Unofficial ebuilds for Gitlab"}, "homepage": "https://gitlab.awesome-it.de/overlays/gitlab", "owner": [{"type": "person", "email": "info@awesome-it.de", "name": "Daniel Morlock"}], "source": [{"type": "git", "uri": "https://gitlab.awesome-it.de/overlays/gitlab.git"}], "x-state": "GOOD", "x-timestamp": "2020-10-22 09:38:38 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 13}, "glarbs-overlay": {"quality": "experimental", "status": "unofficial", "name": "glarbs-overlay", "description": {"en": "A Gentoo overlay used by GLARBS.", "sv": "Ett Gentoo \u00f6verl\u00e4gg som anv\u00e4nds av GLARBS."}, "homepage": "https://wiki.gentoo.org/wiki/User:Et-8/GLARBS", "owner": [{"type": "person", "email": "et-8@emiliatrollros.se", "name": "Emilia Trollros"}], "source": [{"type": "git", "uri": "https://gitlab.com/et-8/glarbs-overlay.git"}], "feed": ["https://gitlab.com/et-8/glarbs-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-08-21 20:35:29 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 22}, "glicOne": {"quality": "experimental", "status": "unofficial", "name": "glicOne", "description": {"en": "glicOne Overlay with non existing in layman utils"}, "homepage": "https://gitlab.com/glicOne/glicOne-overlay", "owner": [{"type": "person", "email": "romaniuk.cv@gmail.com", "name": "Vadim Romaniuk"}], "source": [{"type": "git", "uri": "https://gitlab.com/glicOne/glicOne-overlay.git"}, {"type": "git", "uri": "git@gitlab.com:glicOne/glicOne-overlay.git"}], "feed": ["http://github.com/RomaniukVadim/glicOne-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2019-12-26 12:40:44 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 172}, "gnome": {"quality": "experimental", "status": "official", "name": "gnome", "description": {"en": "experimental gnome ebuilds"}, "homepage": "https://cgit.gentoo.org/proj/gnome.git/", "owner": [{"type": "project", "email": "gnome@gentoo.org", "name": "GNOME team"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/gnome.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/gnome.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/gnome.git"}], "feed": ["https://cgit.gentoo.org/proj/gnome.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-07-03 14:43:46 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 124}, "gnome-next": {"quality": "experimental", "status": "unofficial", "name": "gnome-next", "description": {"en": "experimental newer gnome ebuilds"}, "homepage": "https://github.com/Heather/gentoo-gnome", "owner": [{"type": "person", "email": "cynede@gentoo.org", "name": "Mikhail Pukhlikov"}], "source": [{"type": "git", "uri": "https://github.com/Heather/gentoo-gnome.git"}, {"type": "git", "uri": "git@github.com:Heather/gentoo-gnome.git"}], "feed": ["https://github.com/Heather/gentoo-gnome/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-09-21 15:28:48 +0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 194}, "gnuradio": {"quality": "experimental", "status": "unofficial", "name": "gnuradio", "description": {"en": "A repository for GNURadio packages/addons"}, "homepage": "https://github.com/hololeap/gentoo-gnuradio", "owner": [{"type": "person", "email": "hololeap@gmail.com"}], "source": [{"type": "git", "uri": "https://github.com/hololeap/gentoo-gnuradio"}], "feed": ["https://github.com/hololeap/gentoo-gnuradio/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2019-04-01 15:09:34 -0600\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 126}, "gnustep": {"quality": "experimental", "status": "official", "name": "gnustep", "description": {"en": "Experimental ebuilds for GNUstep packages in Gentoo. Comments and bugreports are welcome!"}, "homepage": "https://cgit.gentoo.org/proj/gnustep.git/", "owner": [{"type": "project", "email": "gnustep@gentoo.org"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/gnustep.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/gnustep.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/gnustep.git"}], "feed": ["https://cgit.gentoo.org/proj/gnustep.git/atom/"], "x-timestamp-command": ["git", "log", "--format=%ci", "-1"], "x-openpgp-signature-command": ["git", "show", "-q", "--pretty=format:%G?", "HEAD"], "x-state": "SYNC_FAIL"}, "gnux32": {"quality": "experimental", "status": "unofficial", "name": "gnux32", "description": {"en": "A personal overlay with ebuilds for the x32 ABI"}, "homepage": "https://github.com/1camper/gnux32", "owner": [{"type": "person", "email": "theonetruecamper@gmx.de", "name": "Matthias R\u00e4ncker"}], "source": [{"type": "git", "uri": "https://github.com/1camper/gnux32.git"}, {"type": "git", "uri": "git://github.com/1camper/gnux32.git"}], "feed": ["https://github.com/1camper/gnux32/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-05-24 11:36:38 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 94}, "go-overlay": {"quality": "experimental", "status": "unofficial", "name": "go-overlay", "description": {"en": "Golang related ebuilds"}, "homepage": "https://github.com/Dr-Terrible/go-overlay", "owner": [{"type": "person", "email": "toffanin.mauro@gmail.com", "name": "Mauro Toffanin"}], "source": [{"type": "git", "uri": "https://github.com/Dr-Terrible/go-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2020-10-22 03:07:34 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 244}, "godin": {"quality": "experimental", "status": "unofficial", "name": "godin", "description": {"en": "Godin's Gentoo Overlay"}, "homepage": "https://github.com/Godin/gentoo-overlay", "owner": [{"type": "person", "email": "mandrikov@gmail.com", "name": "Evgeny Mandrikov"}], "source": [{"type": "git", "uri": "https://github.com/Godin/gentoo-overlay.git"}, {"type": "git", "uri": "git://github.com/Godin/gentoo-overlay.git"}], "feed": ["https://github.com/Godin/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-02-20 12:08:54 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 14}, "goris": {"quality": "experimental", "status": "unofficial", "name": "goris", "description": {"en": "Goris overlay"}, "homepage": "https://cgit.gentoo.org/repo/user/goris.git/", "owner": [{"type": "person", "email": "norayr.am@gmail.com", "name": "Norayr Mirakyan"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/user/goris.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/repo/user/goris.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/user/goris.git"}], "feed": ["https://cgit.gentoo.org/repo/user/goris.git/atom/"], "x-timestamp-command": ["git", "log", "--format=%ci", "-1"], "x-openpgp-signature-command": ["git", "show", "-q", "--pretty=format:%G?", "HEAD"], "x-state": "SYNC_FAIL"}, "graaff": {"quality": "experimental", "status": "official", "name": "graaff", "description": {"en": "Developer overlay of Hans de Graaff with mostly ruby and\n    xemacs ebuilds, and a few assorted other goodies."}, "homepage": "http://moving-innovations.com/blog/", "owner": [{"type": "person", "email": "graaff@gentoo.org", "name": "Hans de Graaff"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/graaff.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/graaff.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/graaff.git"}], "feed": ["https://cgit.gentoo.org/dev/graaff.git/atom/"], "x-timestamp-command": ["git", "log", "--format=%ci", "-1"], "x-openpgp-signature-command": ["git", "show", "-q", "--pretty=format:%G?", "HEAD"], "x-state": "SYNC_FAIL"}, "grub2-themes": {"quality": "experimental", "status": "official", "name": "grub2-themes", "description": {"en": "Overlay dedicated to Grub2 themes (of any distribution)"}, "homepage": "https://gitweb.gentoo.org/repo/proj/grub2-themes.git/", "owner": [{"type": "person", "email": "sping@gentoo.org", "name": "Sebastian Pipping"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/proj/grub2-themes.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/proj/grub2-themes.git"}], "feed": ["https://gitweb.gentoo.org/repo/proj/grub2-themes.git/atom/?h=master"], "x-state": "GOOD", "x-timestamp": "2015-07-19 17:38:24 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 24}, "gsview-overlay": {"quality": "experimental", "status": "unofficial", "name": "gsview-overlay", "description": {"en": "Overlay for the gsview and some other plotting/scientific soft"}, "homepage": "https://github.com/uleysky/gsview-overlay", "owner": [{"type": "person", "email": "uleysky@gmail.com", "name": "Michael Uleysky"}], "source": [{"type": "git", "uri": "https://github.com/uleysky/gsview-overlay.git"}, {"type": "git", "uri": "git://github.com/uleysky/gsview-overlay.git"}, {"type": "git", "uri": "git@github.com:uleysky/gsview-overlay.git"}], "feed": ["https://github.com/uleysky/gsview-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-21 12:19:15 +1000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 12}, "guru": {"quality": "experimental", "status": "official", "name": "guru", "description": {"en": "GURU: Ebuild repository entirely maintained by Gentoo users"}, "homepage": "https://wiki.gentoo.org/wiki/Project:GURU", "owner": [{"type": "project", "email": "guru@gentoo.org", "name": "GURU"}], "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"}], "feed": ["https://cgit.gentoo.org/repo/proj/guru.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-10-23 11:26:03 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 615}, "haarp": {"quality": "experimental", "status": "unofficial", "name": "haarp", "description": {"en": "misc ebuilds that aren't in the main tree"}, "homepage": "https://cgit.gentoo.org/user/haarp.git/", "owner": [{"type": "person", "email": "main.haarp@gmail.com", "name": "haarp"}], "source": [{"type": "git", "uri": "git://anongit.gentoo.org/user/haarp.git"}], "x-state": "GOOD", "x-timestamp": "2020-10-19 23:13:58 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 48}, "hamper-overlay": {"quality": "experimental", "status": "unofficial", "name": "hamper-overlay", "description": {"en": "User overlay"}, "homepage": "https://github.com/hamper/hamper-overlay", "owner": [{"type": "person", "email": "hamper.nhs@gmail.com", "name": "Alexander Pilipenko"}], "source": [{"type": "git", "uri": "https://github.com/Hamper/hamper-overlay.git"}, {"type": "git", "uri": "git://github.com/hamper/hamper-overlay.git"}], "feed": ["https://github.com/hamper/hamper-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-16 19:48:27 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 19}, "han": {"quality": "experimental", "status": "unofficial", "name": "han", "description": {"en": "Han's personal ebuild repository"}, "homepage": "https://github.com/hanmertens/han-overlay", "owner": [{"type": "person", "email": "hanmertens@outlook.com", "name": "Han Mertens"}], "source": [{"type": "git", "uri": "https://github.com/hanmertens/han-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/hanmertens/han-overlay.git"}], "feed": ["https://github.com/hanmertens/han-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-14 19:26:48 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 8}, "hangul-typing": {"quality": "experimental", "status": "unofficial", "name": "hangul-typing", "description": {"en": "It contains hangul-typing tutors."}, "homepage": "https://gitlab.com/espresso.tiger/hangul-typing", "owner": [{"type": "person", "email": "espresso.tiger@gmail.com", "name": "espresso tiger"}], "source": [{"type": "git", "uri": "https://gitlab.com/espresso.tiger/hangul-typing.git"}, {"type": "git", "uri": "git+ssh://git@gitlab.com/espresso.tiger/hangul-typing.git"}], "feed": ["https://gitlab.com/espresso.tiger/hangul-typing/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2018-12-23 22:47:42 +0900\n", "x-openpgp-signed": "N", "x-masters": ["gentoo", "haskell"], "x-ebuild-count": 3}, "haskell": {"quality": "experimental", "status": "official", "name": "haskell", "description": {"en": "The Official Gentoo Haskell overlay."}, "homepage": "https://github.com/gentoo-haskell", "owner": [{"type": "project", "email": "haskell@gentoo.org"}], "source": [{"type": "git", "uri": "https://github.com/gentoo-haskell/gentoo-haskell.git"}, {"type": "git", "uri": "git://github.com/gentoo-haskell/gentoo-haskell.git"}, {"type": "git", "uri": "https://github.com/gentoo-haskell/gentoo-haskell.git"}], "feed": ["https://github.com/gentoo-haskell/gentoo-haskell/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-23 16:44:09 +1100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 2630}, "heindsight": {"quality": "experimental", "status": "unofficial", "name": "heindsight", "description": {"en": "heindsight's personal overlay"}, "homepage": "https://github.com/heindsight/gentoo_overlay", "owner": [{"type": "person", "email": "heindsight@kruger.dev", "name": "Heinrich Kruger"}], "source": [{"type": "git", "uri": "https://github.com/heindsight/gentoo_overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/heindsight/gentoo_overlay.git"}], "feed": ["https://github.com/heindsight/gentoo_overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-06-27 14:51:21 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "hering-overlay": {"quality": "experimental", "status": "unofficial", "name": "hering-overlay", "description": {"en": "Richard Hering's gentoo overlay"}, "homepage": "https://github.com/internethering/hering-overlay", "owner": [{"type": "person", "email": "richard@internethering.de", "name": "Richard Hering"}], "source": [{"type": "git", "uri": "https://github.com/internethering/hering-overlay.git"}], "feed": ["https://github.com/internethering/hering-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-07-02 12:40:16 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 45}, "hexedit-overlay": {"quality": "experimental", "status": "unofficial", "name": "hexedit-overlay", "description": {"en": "Ebuilds for infrastructure-related packages and my own projects"}, "homepage": "http://hexedit.me/gentoo/", "owner": [{"type": "person", "email": "hexedit@ifproject.ru", "name": "Timofey Negrebetsky"}], "source": [{"type": "git", "uri": "https://git.ifproject.ru/hexedit/gentoo-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2020-02-27 10:06:44 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 18}, "hhvm": {"quality": "experimental", "status": "unofficial", "name": "hhvm", "description": {"en": "hhvm gentoo overlay"}, "homepage": "https://github.com/reanimus/hhvm-overlay", "owner": [{"type": "person", "email": "alex@guzman.io", "name": "Alex Guzman"}], "source": [{"type": "git", "uri": "https://github.com/reanimus/hhvm-overlay.git"}, {"type": "git", "uri": "git://github.com/reanimus/hhvm-overlay.git"}], "feed": ["https://github.com/reanimus/hhvm-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2016-08-10 00:36:19 -0700\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 3}, "hibiscus": {"quality": "experimental", "status": "unofficial", "name": "hibiscus", "description": {"en": "Hibiscus homebanking overlay"}, "homepage": "https://cgit.gentoo.org/user/hibiscus.git/", "owner": [{"type": "person", "email": "gentoo@posteo.de", "name": "Fabian K\u00f6ster"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/hibiscus.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/hibiscus.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/hibiscus.git"}], "feed": ["https://cgit.gentoo.org/user/hibiscus.git/atom/"], "x-timestamp-command": ["git", "log", "--format=%ci", "-1"], "x-openpgp-signature-command": ["git", "show", "-q", "--pretty=format:%G?", "HEAD"], "x-state": "SYNC_FAIL"}, "holgersson-overlay": {"quality": "experimental", "status": "unofficial", "name": "holgersson-overlay", "description": {"en": "Nils \"holgersson\" Freydank's personal overlay"}, "homepage": "https://git.holgersson.xyz", "owner": [{"type": "person", "email": "holgersson@posteo.de", "name": "Nils Freydank"}], "source": [{"type": "git", "uri": "https://git.holgersson.xyz/foss/holgersson-overlay"}], "x-state": "GOOD", "x-timestamp": "2020-10-23 10:47:50 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 26}, "hossie": {"quality": "experimental", "status": "unofficial", "name": "hossie", "description": {"en": "gentoo-overlay from hossie"}, "homepage": "https://git.hossie.de/projects/GEN/repos/gentoo-overlay/browse", "owner": [{"type": "person", "email": "hossie@hossie.de"}], "source": [{"type": "git", "uri": "https://git.hossie.de/scm/gen/gentoo-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2020-08-24 14:56:19 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 84}, "ikelos": {"quality": "experimental", "status": "unofficial", "name": "ikelos", "description": {"en": "Ikelos's hospice for broken and damaged ebuilds."}, "homepage": "https://cgit.gentoo.org/dev/ikelos.git/", "owner": [{"type": "person", "email": "ikelos@gentoo.org", "name": "Mike Auty"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/ikelos.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/ikelos.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/ikelos.git"}], "feed": ["https://cgit.gentoo.org/dev/ikelos.git/atom/"], "x-timestamp-command": ["git", "log", "--format=%ci", "-1"], "x-openpgp-signature-command": ["git", "show", "-q", "--pretty=format:%G?", "HEAD"], "x-state": "SYNC_FAIL"}, "imaging": {"quality": "experimental", "status": "unofficial", "name": "imaging", "description": {"en": "Gentoo overlay for image processing and visualization"}, "homepage": "https://github.com/gerddie/gentoo-imaging", "owner": [{"type": "person", "email": "gw.fossdev@gmail.com"}], "source": [{"type": "git", "uri": "https://github.com/gerddie/gentoo-imaging.git"}], "x-state": "GOOD", "x-timestamp": "2020-02-13 19:29:18 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 44}, "interactive-fiction": {"quality": "experimental", "status": "unofficial", "name": "interactive-fiction", "description": {"en": "Packages for players and authors of interactive\n    fiction"}, "owner": [{"type": "person", "email": "levertond@googlemail.com"}], "source": [{"type": "git", "uri": "git://repo.or.cz/gentoo-interactive-fiction.git"}], "feed": ["http://repo.or.cz/w/gentoo-interactive-fiction.git?a=rss"], "x-state": "GOOD", "x-timestamp": "2020-02-22 15:48:44 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 30}, "ixit": {"quality": "experimental", "status": "unofficial", "name": "ixit", "description": {"en": "iXit overlay"}, "homepage": "https://github.com/okias/ixit", "owner": [{"type": "person", "email": "david@ixit.cz", "name": "David Heidelberger"}], "source": [{"type": "git", "uri": "https://github.com/okias/ixit.git"}, {"type": "git", "uri": "git://github.com/okias/ixit.git"}, {"type": "git", "uri": "git@github.com:okias/ixit.git"}], "feed": ["https://github.com/okias/ixit/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-09-11 15:08:56 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 7}, "jacendi-overlay": {"quality": "experimental", "status": "unofficial", "name": "jacendi-overlay", "description": {"en": "id Software games overlay"}, "homepage": "https://bitbucket.org/jacendi/jacendi-overlay", "owner": [{"type": "person", "email": "jacendi@protonmail.com", "name": "Vladimir Gavrilov"}], "source": [{"type": "git", "uri": "https://bitbucket.org/jacendi/jacendi-overlay"}], "feed": ["https://bitbucket.org/jacendi/jacendi-overlay/atom"], "x-state": "GOOD", "x-timestamp": "2019-07-09 12:35:42 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 14}, "jamesbroadhead": {"quality": "experimental", "status": "unofficial", "name": "jamesbroadhead", "description": {"en": "James Broadhead's personal overlay and pre-sunrise testing ground"}, "homepage": "https://cgit.gentoo.org/user/jamesbroadhead.git/", "owner": [{"type": "person", "email": "jamesbroadhead@gmail.com", "name": "James Broadhead"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/jamesbroadhead.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/jamesbroadhead.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/jamesbroadhead.git"}], "feed": ["https://cgit.gentoo.org/user/jamesbroadhead.git/atom/"], "x-timestamp-command": ["git", "log", "--format=%ci", "-1"], "x-openpgp-signature-command": ["git", "show", "-q", "--pretty=format:%G?", "HEAD"], "x-state": "SYNC_FAIL"}, "java": {"quality": "experimental", "status": "official", "name": "java", "description": {"en": "Java overlay"}, "homepage": "https://cgit.gentoo.org/proj/java.git/", "owner": [{"type": "project", "email": "java@gentoo.org", "name": "Gentoo Java team"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/java.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/java.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/java.git"}], "feed": ["https://cgit.gentoo.org/proj/java.git/atom/"], "x-timestamp-command": ["git", "log", "--format=%ci", "-1"], "x-openpgp-signature-command": ["git", "show", "-q", "--pretty=format:%G?", "HEAD"], "x-state": "SYNC_FAIL"}, "jboro-overlay": {"quality": "experimental", "status": "unofficial", "name": "jboro-overlay", "description": {"en": "personal experimental ebuilds"}, "homepage": "https://github.com/JBoro/portage", "owner": [{"type": "person", "email": "justin.borodinsky@gmail.com", "name": "justin borodinsky"}], "source": [{"type": "git", "uri": "https://github.com/JBoro/portage.git"}], "x-state": "GOOD", "x-timestamp": "2015-08-08 11:25:17 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "jkolo": {"quality": "experimental", "status": "unofficial", "name": "jkolo", "description": {"en": "Jerzy Kolosowski's Gentoo overlay"}, "homepage": "https://git.kolosowscy.pl/jurek/gentoo-overlay", "owner": [{"type": "person", "email": "jerzy@kolosowscy.pl", "name": "Jerzy Kolosowski"}], "source": [{"type": "git", "uri": "https://git.kolosowscy.pl/jurek/gentoo-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2020-07-18 01:05:16 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 29}, "jm-overlay": {"quality": "experimental", "status": "unofficial", "name": "jm-overlay", "description": {"en": "Personal overlay with more or less random ebuilds"}, "homepage": "https://github.com/Jannis234/jm-overlay", "owner": [{"type": "person", "email": "jannis@ctrl-c.xyz", "name": "Jannis234"}], "source": [{"type": "git", "uri": "https://github.com/Jannis234/jm-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2020-10-11 23:47:11 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 888}, "jmbsvicetto": {"quality": "experimental", "status": "official", "name": "jmbsvicetto", "description": {"en": "Jorge Manuel B. S. Vicetto developer overlay"}, "homepage": "https://cgit.gentoo.org/dev/jmbsvicetto.git", "owner": [{"type": "person", "email": "jmbsvicetto@gentoo.org", "name": "Jorge Manuel B. S. Vicetto"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/jmbsvicetto.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/jmbsvicetto.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/jmbsvicetto.git"}], "feed": ["https://cgit.gentoo.org/dev/jmbsvicetto.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-10-14 16:01:24 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 79}, "jmesmon": {"quality": "experimental", "status": "unofficial", "name": "jmesmon", "description": {"en": "miscellanious fixes, modifications, and newer versions of ebuilds"}, "homepage": "https://github.com/jmesmon/overlay", "owner": [{"type": "person", "email": "jmesmon@gmail.com", "name": "Cody Schafer"}], "source": [{"type": "git", "uri": "git://github.com/jmesmon/overlay.git"}], "x-state": "BAD_CACHE", "x-timestamp": "2019-02-01 17:27:57 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 28}, "johnmh": {"quality": "experimental", "status": "unofficial", "name": "johnmh", "description": {"en": "Personal overlay of johnmh"}, "homepage": "https://cgit.gentoo.org/repo/user/johnmh.git/", "owner": [{"type": "person", "email": "johnmh@openblox.org", "name": "John Harris"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/user/johnmh.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/repo/user/johnmh"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/user/johnmh.git"}], "feed": ["https://cgit.gentoo.org/repo/user/johnmh.git/atom/"], "x-state": "GOOD", "x-timestamp": "2016-10-15 23:51:35 -0400\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "johu": {"quality": "experimental", "status": "official", "name": "johu", "description": {"en": "Johannes Huber developer overlay"}, "homepage": "https://cgit.gentoo.org/dev/johu.git", "owner": [{"type": "person", "email": "johu@gentoo.org", "name": "Johannes Huber"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/johu.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/johu.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/johu.git"}], "feed": ["https://cgit.gentoo.org/dev/johu.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-04-18 11:42:18 +0200\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "jollheef-overlay": {"quality": "experimental", "status": "unofficial", "name": "jollheef-overlay", "description": {"en": "Collection of various ebuilds"}, "homepage": "https://github.com/jollheef/jollheef-overlay", "owner": [{"type": "person", "email": "jollheef@riseup.net", "name": "Mikhail Klementyev"}], "source": [{"type": "git", "uri": "https://github.com/jollheef/jollheef-overlay.git"}, {"type": "git", "uri": "git://github.com/jollheef/jollheef-overlay.git"}, {"type": "git", "uri": "git@github.com:jollheef/jollheef-overlay.git"}], "feed": ["https://github.com/jollheef/jollheef-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2018-12-24 18:49:16 +0000\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 17}, "jorgicio": {"quality": "experimental", "status": "unofficial", "name": "jorgicio", "description": {"en": "Gentoo repository made by Jorgicio."}, "homepage": "https://github.com/jorgicio/jorgicio-gentoo", "owner": [{"type": "person", "email": "jpizarrocallejas@gmail.com", "name": "Jorge Pizarro Callejas"}], "source": [{"type": "git", "uri": "https://github.com/jorgicio/jorgicio-gentoo.git"}, {"type": "git", "uri": "git://github.com/jorgicio/jorgicio-gentoo.git"}, {"type": "git", "uri": "git@github.com:jorgicio/jorgicio-gentoo.git"}], "feed": ["https://github.com/jorgicio/jorgicio-gentoo/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-22 17:33:44 -0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 537}, "jsteward": {"quality": "experimental", "status": "unofficial", "name": "jsteward", "description": {"en": "jsteward's personal overlay"}, "homepage": "https://github.com/KireinaHoro/jsteward", "owner": [{"type": "person", "email": "i@jsteward.moe", "name": "KireinaHoro"}], "source": [{"type": "git", "uri": "https://github.com/KireinaHoro/jsteward.git"}, {"type": "git", "uri": "git://github.com/KireinaHoro/jsteward.git"}, {"type": "git", "uri": "git@github.com:KireinaHoro/jsteward.git"}], "feed": ["https://github.com/KireinaHoro/jsteward/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-01-25 14:30:10 +0800\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 20}, "junkdrawer": {"quality": "experimental", "status": "unofficial", "name": "junkdrawer", "description": {"en": "Various development tools, libraries, and patches not in Gentoo (yet)"}, "homepage": "https://github.com/doctaweeks/junkdrawer-overlay", "owner": [{"type": "person", "email": "dan@danweeks.net", "name": "Daniel M. Weeks"}], "source": [{"type": "git", "uri": "https://github.com/doctaweeks/junkdrawer-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2020-08-26 11:49:21 -0400\n", "x-openpgp-signed": "N", "x-masters": ["dlang", "gentoo"], "x-ebuild-count": 466}, "k_f": {"quality": "experimental", "status": "unofficial", "name": "k_f", "description": {"en": "K_F's personal overlay"}, "homepage": "http://git.sumptuouscapital.com/?p=portage-overlay.git;a=summary", "owner": [{"type": "person", "email": "k_f@gentoo.org", "name": "Kristian Fiskerstrand"}], "source": [{"type": "git", "uri": "git://git.sumptuouscapital.com/portage-overlay.git"}], "feed": ["http://git.sumptuouscapital.com/?p=portage-overlay.git;a=atom"], "x-state": "BAD_CACHE", "x-timestamp": "2018-10-15 22:19:22 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 47}, "kaa": {"quality": "experimental", "status": "unofficial", "name": "kaa", "description": {"en": "Kaa's experimental overlay"}, "homepage": "http://www.kaa.org.ua", "owner": [{"type": "person", "email": "oleg@kaa.org.ua", "name": "Oleg Kravchenko"}], "source": [{"type": "git", "uri": "https://github.com/Oleh-Kravchenko/kaa-layman.git"}], "x-state": "GOOD", "x-timestamp": "2020-10-22 22:38:40 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 25}, "kde": {"quality": "experimental", "status": "official", "name": "kde", "description": {"en": "Official KDE team's testing overlay."}, "homepage": "https://kde.gentoo.org", "owner": [{"type": "project", "email": "kde@gentoo.org", "name": "KDE Team"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/kde.git"}, {"type": "git", "uri": "https://github.com/gentoo/kde.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/kde.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/kde.git"}], "feed": ["https://cgit.gentoo.org/proj/kde.git/atom/"], "x-timestamp-command": ["git", "log", "--format=%ci", "-1"], "x-openpgp-signature-command": ["git", "show", "-q", "--pretty=format:%G?", "HEAD"], "x-state": "SYNC_FAIL"}, "keepbot-overlay": {"quality": "experimental", "status": "unofficial", "name": "keepbot-overlay", "description": {"en": "keepbot's personal ebuild repository"}, "homepage": "https://github.com/d-k-ivanov/gentoo-overlay.git", "owner": [{"type": "person", "email": "d.k.ivanov@live.com", "name": "Dmitry Ivanov"}], "source": [{"type": "git", "uri": "https://github.com/d-k-ivanov/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/d-k-ivanov/gentoo-overlay.git"}], "feed": ["https://github.com/d-k-ivanov/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-07-03 15:17:56 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 7}, "khoverlay": {"quality": "experimental", "status": "unofficial", "name": "khoverlay", "description": {"en": "Khumba's overlay, mainly Haskell packages"}, "homepage": "https://gitlab.com/khumba/khoverlay", "owner": [{"type": "person", "email": "bog@khumba.net", "name": "Bryan Gardiner"}], "source": [{"type": "git", "uri": "https://gitlab.com/khumba/khoverlay.git"}, {"type": "git", "uri": "git+ssh://git@gitlab.com/khumba/khoverlay.git"}], "feed": ["https://gitlab.com/khumba/khoverlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-12 14:44:52 -0700\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 93}, "klondike": {"quality": "experimental", "status": "unofficial", "name": "klondike", "description": {"en": "Ebuilds made and modified by klondike, mainly sound and virtualization"}, "homepage": "https://cgit.gentoo.org/user/klondike.git/", "owner": [{"type": "person", "email": "klondike@gentoo.org", "name": "Francisco Blas Izquierdo Riera"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/klondike.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/klondike.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/klondike.git"}], "feed": ["https://cgit.gentoo.org/user/klondike.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-08-22 16:55:03 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 26}, "konsolebox": {"quality": "experimental", "status": "unofficial", "name": "konsolebox", "description": {"en": "konsolebox's overlay"}, "homepage": "https://github.com/konsolebox/overlay", "owner": [{"type": "person", "email": "konsolebox@gmail.com", "name": "konsolebox"}], "source": [{"type": "git", "uri": "https://github.com/konsolebox/overlay.git"}], "feed": ["https://github.com/konsolebox/overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-06-20 01:31:57 +0800\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 36}, "lacimarsik-overlay": {"quality": "experimental", "status": "unofficial", "name": "lacimarsik-overlay", "description": {"en": "Various patches and improvements on Gentoo Linux ebuilds"}, "homepage": "https://github.com/lacimarsik/lacimarsik-overlay", "owner": [{"type": "person", "email": "laci.marsik@gmail.com", "name": "Ladislav Marsik"}], "source": [{"type": "git", "uri": "https://github.com/lacimarsik/lacimarsik-overlay.git"}], "feed": ["https://github.com/lacimarsik/lacimarsik-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2017-05-25 13:39:59 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 1}, "lanodanOverlay": {"quality": "experimental", "status": "unofficial", "name": "lanodanOverlay", "description": {"en": "Additionnal goals; experiments, necromancy, portability, diversity, \u2026", "fr": "Buts additionnels; Exp\u00e9rimentations, n\u00e9cromancie, portabilit\u00e9e, diversit\u00e9e, \u2026"}, "homepage": "https://hacktivis.me/git/overlay", "owner": [{"type": "person", "email": "contact@hacktivis.me", "name": "Haelwenn (lanodan) Monnier"}], "source": [{"type": "git", "uri": "https://hacktivis.me/git/overlay.git"}, {"type": "git", "uri": "https://gitlab.com/lanodan/overlay.git"}, {"type": "git", "uri": "git://hacktivis.me/git/overlay.git"}, {"type": "git", "uri": "git://gitlab.com/lanodan/overlay.git"}], "feed": ["https://hacktivis.me/git/overlay/atom.xml"], "x-state": "GOOD", "x-timestamp": "2020-10-21 20:53:05 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo", "lua"], "x-ebuild-count": 255}, "laurentb": {"quality": "experimental", "status": "unofficial", "name": "laurentb", "description": {"en": "Various packages"}, "homepage": "https://github.com/laurentb/gentoo-overlay", "owner": [{"type": "person", "email": "laurent@bachelier.name", "name": "Laurent Bachelier"}], "source": [{"type": "git", "uri": "git://github.com/laurentb/gentoo-overlay.git"}, {"type": "git", "uri": "https://github.com/laurentb/gentoo-overlay.git"}], "feed": ["https://github.com/feeds/laurentb/commits/gentoo-overlay/master"], "x-state": "GOOD", "x-timestamp": "2020-03-27 20:38:31 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 71}, "leechcraft": {"quality": "experimental", "status": "unofficial", "name": "leechcraft", "description": {"en": "Overlay with LeechCraft ebuilds"}, "homepage": "https://github.com/0xd34df00d/leechcraft-overlay", "owner": [{"type": "person", "email": "0xd34df00d@gmail.com", "name": "Georg Rudoy"}], "source": [{"type": "git", "uri": "https://github.com/0xd34df00d/leechcraft-overlay.git"}, {"type": "git", "uri": "git://github.com/0xd34df00d/leechcraft-overlay.git"}], "feed": ["https://github.com/0xd34df00d/leechcraft-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-10 10:48:51 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 18}, "leio": {"quality": "experimental", "status": "official", "name": "leio", "description": {"en": "Mart Raudsepp developer overlay"}, "homepage": "https://cgit.gentoo.org/dev/leio.git", "owner": [{"type": "person", "email": "leio@gentoo.org", "name": "Mart Raudsepp"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/leio.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/leio.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/leio.git"}], "feed": ["https://cgit.gentoo.org/dev/leio.git/atom/"], "x-timestamp-command": ["git", "log", "--format=%ci", "-1"], "x-openpgp-signature-command": ["git", "show", "-q", "--pretty=format:%G?", "HEAD"], "x-state": "SYNC_FAIL"}, "leonardohn": {"quality": "experimental", "status": "unofficial", "name": "leonardohn", "description": {"en": "leonardohn personal overlay"}, "homepage": "https://github.com/leonardohn/gentoo-overlay", "owner": [{"type": "person", "email": "leonardohn@null.net", "name": "Leonardo Neumann"}], "source": [{"type": "git", "uri": "https://github.com/leonardohn/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/leonardohn/gentoo-overlay.git"}], "feed": ["https://github.com/leonardohn/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-20 00:26:30 -0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 6}, "levenkov": {"quality": "experimental", "status": "unofficial", "name": "levenkov", "description": {"en": "levenkov personal overlay"}, "homepage": "https://cgit.gentoo.org/user/levenkov.git", "owner": [{"type": "person", "email": "artem@levenkov.org", "name": "Artem Levenkov"}], "source": [{"type": "git", "uri": "git://anongit.gentoo.org/user/levenkov.git"}, {"type": "git", "uri": "http://cgit.gentooexperimental.org/user/levenkov.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/levenkov.git"}], "x-state": "GOOD", "x-timestamp": "2015-02-20 13:13:52 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 3}, "librepilot": {"quality": "experimental", "status": "unofficial", "name": "librepilot", "description": {"en": "Librepilot flight control software overlay"}, "homepage": "https://github.com/paul-jewell/librepilot-overlay", "owner": [{"type": "person", "email": "paul@teulu.org", "name": "Paul Jewell"}], "source": [{"type": "git", "uri": "https://github.com/paul-jewell/librepilot-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/paul-jewell/librepilot-overlay.git"}], "feed": ["https://github.com/paul-jewell/librepilot-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-08-04 06:46:55 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 7}, "libressl": {"quality": "experimental", "status": "official", "name": "libressl", "description": {"en": "LibreSSL ebuilds testing repository"}, "homepage": "https://wiki.gentoo.org/wiki/Project:LibreSSL", "owner": [{"type": "project", "email": "libressl@gentoo.org"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/proj/libressl.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/proj/libressl.git"}], "feed": ["https://cgit.gentoo.org/repo/proj/libressl.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-07-16 10:53:29 +0300\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 11}, "linux-be": {"quality": "experimental", "status": "unofficial", "name": "linux-be", "description": {"en": "Port of Boot Environments for GNU/Linux"}, "homepage": "https://gitlab.com/linux-be", "owner": [{"type": "person", "email": "vitaut.bayaryn@gmail.com", "name": "Witaut Bajaryn"}, {"type": "person", "email": "a.mistewicz@gmail.com", "name": "Aleksander Mistewicz"}], "source": [{"type": "git", "uri": "https://gitlab.com/linux-be/overlay.git"}, {"type": "git", "uri": "git+ssh://git@gitlab.com/linux-be/overlay.git"}], "feed": ["https://gitlab.com/linux-be/overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-01-31 22:55:30 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 8}, "linuxunderground-overlay": {"quality": "experimental", "status": "unofficial", "name": "linuxunderground-overlay", "description": {"en": "experimental ebuilds from linuxunderground.be"}, "homepage": "https://github.com/linuxunderground/gentoo.overlay", "owner": [{"type": "person", "email": "vincent.hardy.be@gmail.com", "name": "linuxunderground"}], "source": [{"type": "git", "uri": "git://github.com/linuxunderground/gentoo.overlay.git"}, {"type": "git", "uri": "https://github.com/linuxunderground/gentoo.overlay.git"}], "x-state": "GOOD", "x-timestamp": "2020-10-17 20:56:12 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 154}, "linxon": {"quality": "experimental", "status": "unofficial", "name": "linxon", "description": {"en": "linxon personal overlay"}, "homepage": "https://github.com/linxon/gentoo-overlay", "owner": [{"type": "person", "email": "email@linxon.ru", "name": "linxon"}], "source": [{"type": "git", "uri": "https://github.com/linxon/gentoo-overlay.git"}], "feed": ["https://github.com/linxon/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-09-24 16:43:15 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 222}, "lisp": {"quality": "experimental", "status": "official", "name": "lisp", "description": {"en": "Common Lisp/Scheme development, recruitment and live overlay.\n    Support and feedback in `#gentoo-lisp' and via\n    `gentoo-lisp@lists.gentoo.org'."}, "homepage": "https://cgit.gentoo.org/proj/lisp.git", "owner": [{"type": "project", "email": "lisp@gentoo.org"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/lisp.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/lisp.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/lisp.git"}], "feed": ["https://cgit.gentoo.org/proj/lisp.git/atom/"], "x-timestamp-command": ["git", "log", "--format=%ci", "-1"], "x-openpgp-signature-command": ["git", "show", "-q", "--pretty=format:%G?", "HEAD"], "x-state": "SYNC_FAIL"}, "lmiphay": {"quality": "experimental", "status": "unofficial", "name": "lmiphay", "description": {"en": "Personal overlay of Paul Healy"}, "homepage": "https://cgit.gentoo.org/user/lmiphay.git/", "owner": [{"type": "person", "email": "lmiphay@gmail.com", "name": "Paul Healy"}], "source": [{"type": "git", "uri": "git://anongit.gentoo.org/user/lmiphay.git"}], "x-state": "GOOD", "x-timestamp": "2020-10-14 10:31:22 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 279}, "lordvan": {"quality": "experimental", "status": "unofficial", "name": "lordvan", "description": {"en": "LordVan's Developer overlay"}, "homepage": "https://cgit.gentoo.org/dev/lordvan.git", "owner": [{"type": "person", "email": "lordvan@gentoo.org", "name": "Thomas Raschbacher"}], "source": [{"type": "git", "uri": "git://anongit.gentoo.org/dev/lordvan.git"}, {"type": "git", "uri": "https://anongit.gentoo.org/git/dev/lordvan.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/lordvan.git"}], "feed": ["https://cgit.gentoo.org/dev/lordvan.git/atom/"], "x-state": "BAD_CACHE", "x-timestamp": "2018-05-08 08:47:52 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 12}, "lto-overlay": {"quality": "experimental", "status": "unofficial", "name": "lto-overlay", "description": {"en": "A Portage configuration for O3, Graphite, and LTO system-wide"}, "homepage": "https://github.com/InBetweenNames/gentooLTO", "owner": [{"type": "person", "email": "lookatyouhacker@gmail.com", "name": "Shane Peelar"}], "source": [{"type": "git", "uri": "https://github.com/InBetweenNames/gentooLTO.git"}, {"type": "git", "uri": "git+ssh://git@github.com:InBetweenNames/gentooLTO.git"}], "feed": ["https://github.com/InBetweenNames/gentooLTO/commits/master"], "x-state": "GOOD", "x-timestamp": "2020-10-21 13:34:43 -0400\n", "x-openpgp-signed": "E", "x-masters": ["gentoo", "mv"], "x-ebuild-count": 10}, "lua": {"quality": "experimental", "status": "official", "name": "lua", "description": {"en": "Lua development overlay"}, "homepage": "https://cgit.gentoo.org/proj/lua.git/", "owner": [{"type": "person", "email": "rafaelmartins@gentoo.org", "name": "Rafael G. Martins"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/lua.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/lua.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/lua.git"}], "feed": ["https://cgit.gentoo.org/proj/lua.git/atom/"], "x-state": "GOOD", "x-timestamp": "2019-07-14 18:49:25 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 165}, "luke-jr": {"quality": "experimental", "status": "unofficial", "name": "luke-jr", "description": {"en": "Misc ebuilds by Luke-Jr"}, "homepage": "http://luke.dashjr.org", "owner": [{"type": "person", "email": "luke-jr+gentoobugs@utopios.org"}], "source": [{"type": "git", "uri": "https://scm.dashjr.org/scmroot/git/portage-overlays/luke-jr"}], "x-state": "GOOD", "x-timestamp": "2020-10-19 00:40:04 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 155}, "luxifer": {"quality": "experimental", "status": "unofficial", "name": "luxifer", "description": {"en": "Personal Overlay, contains stoken ebuilds"}, "homepage": "https://github.com/luxifr/olgentoo", "owner": [{"type": "person", "email": "dhertel@gmail.com", "name": "Dominik Keil"}], "source": [{"type": "git", "uri": "https://github.com/luxifr/olgentoo.git"}], "feed": ["https://github.com/luxifr/olgentoo/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2016-04-04 07:38:43 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "lxde-gtk3": {"quality": "experimental", "status": "unofficial", "name": "lxde-gtk3", "description": {"en": "lxde-gtk3 overlay"}, "homepage": "https://github.com/rilian-la-te/lxde-gtk3-overlay", "owner": [{"type": "person", "email": "ria.freelander@gmail.com", "name": "Konstantin"}], "source": [{"type": "git", "uri": "https://github.com/rilian-la-te/lxde-gtk3-overlay.git"}, {"type": "git", "uri": "git://github.com/rilian-la-te/lxde-gtk3-overlay.git"}, {"type": "git", "uri": "git@github.com:rilian-la-te/lxde-gtk3-overlay.git"}], "feed": ["https://github.com/rilian-la-te/lxde-gtk3-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2020-02-12 16:03:52 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 25}, "maekke": {"quality": "experimental", "status": "official", "name": "maekke", "description": {"en": "Markus Meier developer overlay"}, "homepage": "https://cgit.gentoo.org/dev/maekke.git", "owner": [{"type": "person", "email": "maekke@gentoo.org", "name": "Markus Meier"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/maekke.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/maekke.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/maekke.git"}], "feed": ["https://cgit.gentoo.org/dev/maekke.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-08-10 19:49:27 +0200\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 20}, "maggu2810-overlay": {"quality": "experimental", "status": "unofficial", "name": "maggu2810-overlay", "description": {"en": "maggu2810's Gentoo portage overlay."}, "homepage": "https://github.com/maggu2810/maggu2810-overlay", "owner": [{"type": "person", "email": "maggu2810@gmail.com", "name": "Markus Rathgeb"}], "source": [{"type": "git", "uri": "git://github.com/maggu2810/maggu2810-overlay.git"}, {"type": "git", "uri": "https://github.com/maggu2810/maggu2810-overlay.git"}], "feed": ["https://github.com/feeds/maggu2810/commits/maggu2810-overlay/master"], "x-state": "GOOD", "x-timestamp": "2020-08-29 18:09:14 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 38}, "mate-de-gentoo": {"quality": "experimental", "status": "unofficial", "name": "mate-de-gentoo", "description": {"en": "Updated ebuilds for mate-desktop environment"}, "homepage": "https://github.com/oz123/mate-de-gentoo", "owner": [{"type": "person", "email": "oz.tiram@gmail.com", "name": "OzTiram"}], "source": [{"type": "git", "uri": "https://github.com/oz123/mate-de-gentoo.git"}], "x-state": "GOOD", "x-timestamp": "2020-09-24 15:34:40 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 265}, "matrix": {"quality": "experimental", "status": "official", "name": "matrix", "description": {"en": "Overlay containing clients, servers and services for the Matrix protocol", "nl": "Overlay met clients, servers en services voor het Matrix protocol"}, "homepage": "https://github.com/gentoo/matrix", "owner": [{"type": "person", "email": "steils@gentoo.org", "name": "Stefan Strogin"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/proj/matrix.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/proj/matrix.git"}], "feed": ["https://cgit.gentoo.org/repo/proj/matrix.git/atom/"], "x-timestamp-command": ["git", "log", "--format=%ci", "-1"], "x-openpgp-signature-command": ["git", "show", "-q", "--pretty=format:%G?", "HEAD"], "x-state": "SYNC_FAIL"}, "megacoffee": {"quality": "experimental", "status": "unofficial", "name": "megacoffee", "description": {"en": "Mixed ebuilds from various sources: self-written missing ebuilds, more current ebuilds, ebuilds that just needed a slight update from official portage, ebuilds others posted on Gentoo Bugzilla, ebuilds with added patches, old ebuilds that were removed from official portage etc.", "de": "Verschiedene ebuilds aus verschiedenen Quellen: selbsterstellte ebuilds, ebuilds mit geringf\u00fcgigen \u00c4nderungen, gegen\u00fcber dem aktuellen Baum, ebuilds aus Gentoos Bugzilla, ebuilds mit erweiterten patches, alte ebuilds die nicht mehr im offiziellen Baum existieren, etc."}, "homepage": "http://gentoo-overlay.megacoffee.net", "owner": [{"type": "person", "email": "gentoo-overlay@megacoffee.net", "name": "MegaCoffee"}], "source": [{"type": "git", "uri": "https://gitlab.megacoffee.net/gentoo-overlay/megacoffee-overlay.git"}], "feed": ["https://gitlab.megacoffee.net/gentoo-overlay/megacoffee-overlay/-/commits/master?format=atom"], "x-state": "GOOD", "x-timestamp": "2020-08-08 14:26:11 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo", "go-overlay"], "x-ebuild-count": 41}, "menelkir": {"quality": "experimental", "status": "unofficial", "name": "menelkir", "description": {"en": "Various ebuilds from different sources"}, "homepage": "https://gitlab.com/menelkir/gentoo-overlay", "owner": [{"type": "person", "email": "menelkir@itroll.org", "name": "Daniel Menelkir"}], "source": [{"type": "git", "uri": "https://gitlab.com/menelkir/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@gitlab.com/menelkir/gentoo-overlay.git"}], "feed": ["https://gitlab.com/menelkir/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-14 09:42:36 -0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 418}, "metahax": {"quality": "experimental", "status": "unofficial", "name": "metahax", "description": {"en": "Some ebuilds that didn't seem to exist yet."}, "homepage": "https://github.com/metafarion/metahax", "owner": [{"type": "person", "email": "miles@ctrl-shift.net", "name": "Miles V."}], "source": [{"type": "git", "uri": "https://github.com/metafarion/metahax.git"}], "feed": ["https://github.com/metafarion/metahax/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-09-06 14:32:04 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 16}, "mgorny": {"quality": "experimental", "status": "official", "name": "mgorny", "description": {"en": "Micha\u0142 G\u00f3rny developer overlay"}, "homepage": "https://cgit.gentoo.org/repo/dev/mgorny.git", "owner": [{"type": "person", "email": "mgorny@gentoo.org", "name": "Micha\u0142 G\u00f3rny"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/dev/mgorny.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/repo/dev/mgorny.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/dev/mgorny.git"}], "feed": ["https://cgit.gentoo.org/repo/dev/mgorny.git/atom/"], "x-state": "GOOD", "x-timestamp": "2019-12-15 05:36:44 +0100\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "milos-rs": {"quality": "experimental", "status": "unofficial", "name": "milos-rs", "description": {"en": "A pocket repository for few unavailable packages"}, "homepage": "https://github.com/milos-rs/gentoo-overlay", "owner": [{"type": "person", "email": "milos.om.dj@gmail.com", "name": "Milo\u0161 E. \u0110ur\u0111evi\u0107"}], "source": [{"type": "git", "uri": "https://github.com/milos-rs/gentoo-overlay.git"}], "feed": ["https://github.com/milos-rs/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-09-09 04:50:35 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "miramir": {"quality": "experimental", "status": "unofficial", "name": "miramir", "description": {"en": "Miramir repository"}, "homepage": "https://github.com/miramir/miramir-layman", "owner": [{"type": "person", "email": "gmiramir@gmail.com"}], "source": [{"type": "git", "uri": "https://github.com/miramir/miramir-layman.git"}], "feed": ["https://github.com/miramir/miramir-layman/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-15 16:35:57 +0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 47}, "mkeyoverlay": {"quality": "experimental", "status": "unofficial", "name": "mkeyoverlay", "description": {"en": "Overlay of Markus Knetschke"}, "homepage": "https://bitbucket.org/mknjc/mkeyoverlay", "owner": [{"type": "person", "email": "markus.knetschke@gmail.com", "name": "Markus Knetschke"}], "source": [{"type": "mercurial", "uri": "https://bitbucket.org/mknjc/mkeyoverlay"}, {"type": "mercurial", "uri": "ssh://hg@bitbucket.org/mknjc/mkeyoverlay"}], "feed": ["https://bitbucket.org/mknjc/mkeyoverlay/atom", "https://bitbucket.org/mknjc/mkeyoverlay/rss"], "x-timestamp-command": ["hg", "log", "-l", "1", "--template={date|isodatesec}"], "x-state": "SYNC_FAIL"}, "mklich": {"quality": "experimental", "status": "unofficial", "name": "mklich", "description": {"en": "For learning purposes."}, "homepage": "https://cgit.gentoo.org/user/mklich.git/", "owner": [{"type": "person", "email": "michal@michalklich.com", "name": "Micha\u0142 Klich"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/mklich.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/mklich.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/mklich.git"}], "feed": ["https://cgit.gentoo.org/user/mklich.git/atom/"], "x-state": "GOOD", "x-timestamp": "2015-09-24 07:21:41 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "mkr-overlay": {"quality": "experimental", "status": "unofficial", "name": "mkr-overlay", "description": {"en": "MalakymR's overlay"}, "homepage": "https://github.com/MalakymR/mkr-overlay", "owner": [{"type": "person", "email": "MalakymR@esdf.uk"}], "source": [{"type": "git", "uri": "https://github.com/MalakymR/mkr-overlay.git"}, {"type": "git", "uri": "git://github.com/MalakymR/mkr-overlay.git"}, {"type": "git", "uri": "git@github.com:MalakymR/mkr-overlay.git"}], "feed": ["https://github.com/MalakymR/mkr-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2019-03-12 11:24:30 +0000\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "moaxcp": {"quality": "experimental", "status": "unofficial", "name": "moaxcp", "description": {"en": "gentoo overlay for packages"}, "homepage": "https://github.com/moaxcp/moaxcp-gentoo-overlay", "owner": [{"type": "person", "email": "moaxcp@gmail.com", "name": "John Mercier"}], "source": [{"type": "git", "uri": "https://github.com/moaxcp/moaxcp-gentoo-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2015-08-11 18:15:55 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 1}, "moexiami": {"quality": "testing", "status": "unofficial", "name": "moexiami", "description": {"en": "Contains updated ebuilds (w/ more feature/control)\n      for packages in the Gentoo tree, latest version ebuilds and newpackages\n      not yet in the tree. Targeting high-quality for production use."}, "homepage": "https://github.com/Xiami2012/moexiami-ovl-dev", "owner": [{"type": "person", "email": "i@f2light.com", "name": "Xiami"}], "source": [{"type": "git", "uri": "https://github.com/Xiami2012/moexiami-ovl-sync.git"}, {"type": "git", "uri": "git+ssh://git@github.com/Xiami2012/moexiami-ovl-sync.git"}], "x-state": "GOOD", "x-timestamp": "2019-02-07 11:48:24 +0800\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 8}, "moltonel": {"quality": "experimental", "status": "unofficial", "name": "moltonel", "description": {"en": "Vincent de Phily's private overlay"}, "homepage": "https://github.com/vincentdephily/moltonel-ebuilds/", "owner": [{"type": "person", "email": "moltonel@gmail.com", "name": "Vincent de Phily"}], "source": [{"type": "git", "uri": "git://github.com/vincentdephily/moltonel-ebuilds.git"}], "x-state": "GOOD", "x-timestamp": "2020-10-19 22:18:57 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 12}, "monero": {"quality": "experimental", "status": "unofficial", "name": "monero", "description": {"en": "Ebuilds for the Monero cryptocurrency and\n      related software."}, "homepage": "https://github.com/gentoo-monero/gentoo-monero", "owner": [{"type": "person", "email": "matt@offtopica.uk", "name": "Matt Smith"}], "source": [{"type": "git", "uri": "https://github.com/gentoo-monero/gentoo-monero.git"}, {"type": "git", "uri": "git+ssh://git@github.com/gentoo-monero/gentoo-monero.git"}], "feed": ["https://github.com/gentoo-monero/gentoo-monero/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-19 09:21:08 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 14}, "mozilla": {"quality": "experimental", "status": "official", "name": "mozilla", "description": {"en": "New mozilla development that is not yet in tree"}, "homepage": "https://cgit.gentoo.org/proj/mozilla.git", "owner": [{"type": "project", "email": "mozilla@gentoo.org"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/mozilla.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/mozilla.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/mozilla.git"}], "feed": ["https://cgit.gentoo.org/proj/mozilla.git/atom/"], "x-state": "BAD_CACHE", "x-timestamp": "2020-05-03 19:48:39 +0200\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 6}, "mschiff": {"quality": "experimental", "status": "official", "name": "mschiff", "description": {"en": "Developer overlay"}, "homepage": "https://cgit.gentoo.org/dev/mschiff.git/", "owner": [{"type": "person", "email": "mschiff@gentoo.org", "name": "Marc Schiffbauer"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/mschiff.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/mschiff.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/mschiff.git"}], "feed": ["https://cgit.gentoo.org/dev/mschiff.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-09-08 01:02:40 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 9}, "multilib-portage": {"quality": "experimental", "status": "official", "name": "multilib-portage", "description": {"en": "multilib-overlay: emul-linux-x86 must die ;)"}, "homepage": "https://cgit.gentoo.org/proj/multilib-portage.git/", "owner": [{"type": "person", "email": "tommy@gentoo.org", "name": "Thomas Sachau"}], "source": [{"type": "git", "uri": "git://anongit.gentoo.org/proj/multilib-portage.git"}], "x-state": "GOOD", "x-timestamp": "2020-08-23 14:27:50 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 35}, "musl": {"quality": "experimental", "status": "official", "name": "musl", "description": {"en": "musl development overlay"}, "homepage": "https://cgit.gentoo.org/proj/musl.git/", "owner": [{"type": "project", "email": "musl@gentoo.org", "name": "Gentoo musl team"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/musl.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/musl.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/musl.git"}], "feed": ["https://cgit.gentoo.org/proj/musl.git/atom/"], "x-timestamp-command": ["git", "log", "--format=%ci", "-1"], "x-openpgp-signature-command": ["git", "show", "-q", "--pretty=format:%G?", "HEAD"], "x-state": "SYNC_FAIL"}, "musl-clang": {"quality": "experimental", "status": "unofficial", "name": "musl-clang", "description": {"en": "musl clang/libc++ overlay"}, "homepage": "https://github.com/karlguy/musl-clang/", "owner": [{"type": "person", "email": "bjornpagen@gmail.com", "name": "Bjorn Pagen"}], "source": [{"type": "git", "uri": "https://github.com/karlguy/musl-clang"}, {"type": "git", "uri": "git://github.com/karlguy/musl-clang"}], "feed": ["https://github.com/karlguy/musl-clang/commits/master.atom"], "x-state": "INVALID_METADATA", "x-timestamp": "2018-03-01 16:56:29 -0500\n", "x-openpgp-signed": "E", "x-masters": ["musl", "gentoo"]}, "mv": {"quality": "experimental", "status": "unofficial", "name": "mv", "description": {"en": "Ebuilds for packages not in the Gentoo tree\n        (lack of maintainer or too experimental) and live ebuilds\n        or extensions/bugfixes for packages in the tree"}, "homepage": "https://cgit.gentoo.org/user/mv.git", "owner": [{"type": "person", "email": "martin@mvath.de", "name": "Martin V\u00e4th"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/mv.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/mv.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/mv.git"}], "feed": ["https://cgit.gentoo.org/user/mv.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-10-17 18:03:14 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 162}, "mva": {"quality": "experimental", "status": "unofficial", "name": "mva", "description": {"en": "mva's sandbox overlay"}, "homepage": "https://github.com/msva/mva-overlay/", "owner": [{"type": "person", "email": "mva@gentoo.org", "name": "Vadim A. Misbakh-Soloviov"}], "source": [{"type": "git", "uri": "https://github.com/msva/mva-overlay"}, {"type": "git", "uri": "git://github.com/msva/mva-overlay"}], "feed": ["https://github.com/msva/mva-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2020-10-17 13:21:04 +0700\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 554}, "myov": {"quality": "experimental", "status": "unofficial", "name": "myov", "description": {"en": "My Overlay - custom Gentoo overlay from XGQT"}, "homepage": "https://gitlab.com/xgqt/myov.git", "owner": [{"type": "person", "name": "XGQT", "email": "xgqt@protonmail.com"}], "source": [{"type": "git", "uri": "https://gitlab.com/xgqt/myov.git"}, {"type": "git", "uri": "git+ssh://git@gitlab.com/xgqt/myov.git"}], "feed": ["https://gitlab.com/xgqt/myov/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-21 14:25:15 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 19}, "mysql": {"quality": "experimental", "status": "official", "name": "mysql", "description": {"en": "Gentoo MySQL overlay"}, "homepage": "https://cgit.gentoo.org/proj/mysql.git/", "owner": [{"type": "project", "email": "mysql-bugs@gentoo.org", "name": "MySQL Team"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/mysql.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/mysql.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/mysql.git"}], "feed": ["https://cgit.gentoo.org/proj/mysql.git/atom/"], "x-state": "GOOD", "x-timestamp": "2019-08-26 10:13:26 -0400\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 39}, "nelson-graca": {"quality": "experimental", "status": "unofficial", "name": "nelson-graca", "description": {"en": "Nelson Gra\u00e7a personal Overlay"}, "homepage": "https://github.com/nelsongraca/gentoo-overlay", "owner": [{"type": "person", "email": "graca.nelson@gmail.com", "name": "Nelson Gra\u00e7a"}], "source": [{"type": "git", "uri": "https://github.com/nelsongraca/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/nelsongraca/gentoo-overlay.git"}], "feed": ["https://github.com/nelsongraca/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-01 13:55:44 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 31}, "nest": {"quality": "experimental", "status": "unofficial", "name": "nest", "description": {"en": "Personal Gentoo overlay"}, "homepage": "https://github.com/SpiderX/portage-overlay", "owner": [{"type": "person", "email": "spiderx@spiderx.dp.ua", "name": "Vladimir Pavljuchenkov"}], "source": [{"type": "git", "uri": "https://github.com/SpiderX/portage-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/SpiderX/portage-overlay.git"}], "feed": ["https://github.com/SpiderX/portage-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-20 00:13:04 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 913}, "nextoo": {"quality": "experimental", "status": "unofficial", "name": "nextoo", "description": {"en": "Nextoo (\"Next Gentoo\") overlay"}, "homepage": "https://github.com/nextoo/portage-overlay", "owner": [{"type": "person", "email": "gentoo-bugzilla@aarontc.com", "name": "Aaron Ten Clay"}], "source": [{"type": "git", "uri": "https://github.com/nextoo/portage-overlay.git"}, {"type": "git", "uri": "git://github.com/nextoo/portage-overlay.git"}, {"type": "git", "uri": "git@github.com:nextoo/portage-overlay.git"}], "feed": ["https://github.com/nextoo/portage-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2017-02-20 15:50:13 -0800\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 21}, "nico": {"quality": "experimental", "status": "unofficial", "name": "nico", "description": {"en": "various ebuilds"}, "homepage": "https://cgit.gentoo.org/user/nico.git/", "owner": [{"type": "person", "email": "nico@overninethousand.de", "name": "Nico Suhl"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/nico.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/nico.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/nico.git"}], "feed": ["https://cgit.gentoo.org/user/nico.git/atom/"], "x-timestamp-command": ["git", "log", "--format=%ci", "-1"], "x-openpgp-signature-command": ["git", "show", "-q", "--pretty=format:%G?", "HEAD"], "x-state": "SYNC_FAIL"}, "nix-guix": {"quality": "experimental", "status": "official", "name": "nix-guix", "description": {"en": "Overlay for nix anf guix functional package managers"}, "homepage": "https://github.com/trofi/nix-guix-gentoo", "owner": [{"type": "person", "email": "slyfox@gentoo.org", "name": "Sergei Trofimovich"}], "source": [{"type": "git", "uri": "https://github.com/trofi/nix-guix-gentoo.git"}], "feed": ["https://github.com/trofi/nix-guix-gentoo/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-07-08 21:39:25 +0100\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 9}, "np-hardass-overlay": {"quality": "experimental", "status": "unofficial", "name": "np-hardass-overlay", "description": {"en": "NP-Hardass's Personal Overlay"}, "homepage": "https://github.com/np-hardass/np-hardass-overlay", "owner": [{"type": "person", "email": "NP-Hardass@gentoo.org", "name": "NP-Hardass"}], "source": [{"type": "git", "uri": "https://github.com/np-hardass/np-hardass-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2020-02-03 17:47:49 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 38}, "nx": {"quality": "experimental", "status": "official", "name": "nx", "description": {"en": "Overlay for the NX/FreeNX packages for Gentoo."}, "homepage": "https://cgit.gentoo.org/proj/nx.git/", "owner": [{"type": "project", "email": "nx@gentoo.org"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/nx.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/nx.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/nx.git"}], "feed": ["https://cgit.gentoo.org/proj/nx.git/atom/"], "x-state": "GOOD", "x-timestamp": "2018-08-08 21:48:58 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "oboeverlay": {"quality": "experimental", "status": "unofficial", "name": "oboeverlay", "description": {"en": "ChrisOboe's overlay"}, "homepage": "https://github.com/ChrisOboe/oboeverlay", "owner": [{"type": "person", "email": "ChrisOboe@eml.cc", "name": "Chris Oboe"}], "source": [{"type": "git", "uri": "https://github.com/ChrisOboe/oboeverlay.git"}, {"type": "git", "uri": "git://github.com/ChrisOboe/oboeverlay.git"}, {"type": "git", "uri": "git@github.com:ChrisOboe/oboeverlay.git"}], "feed": ["https://github.com/ChrisOboe/oboeverlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2020-04-14 16:50:35 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 64}, "observer": {"quality": "experimental", "status": "unofficial", "name": "observer", "description": {"en": "Contains ebuilds I need, but not in Gentoo portage tree yet."}, "homepage": "https://github.com/meng89/observer", "owner": [{"type": "person", "email": "ObserverChan@gmail.com", "name": "Chen Meng"}], "source": [{"type": "git", "uri": "https://github.com/meng89/observer.git"}], "x-state": "GOOD", "x-timestamp": "2020-03-16 07:19:25 +0800\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 21}, "octave": {"quality": "experimental", "status": "unofficial", "name": "octave", "description": {"en": "octave-forge packages"}, "homepage": "https://github.com/rafaelmartins/octave-overlay", "owner": [{"type": "person", "email": "rafaelmartins@gentoo.org", "name": "Rafael G. Martins"}], "source": [{"type": "git", "uri": "https://github.com/rafaelmartins/octave-overlay.git"}, {"type": "git", "uri": "git://github.com/rafaelmartins/octave-overlay.git"}], "feed": ["https://github.com/rafaelmartins/octave-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2015-02-16 12:10:26 -0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 278}, "octopus": {"quality": "experimental", "status": "unofficial", "name": "octopus", "description": {"en": "Own and claimed ebuilds"}, "homepage": "https://github.com/Bfgeshka/octopus", "owner": [{"type": "person", "email": "bfg@derpy.ru", "name": "Bfgeshka"}], "source": [{"type": "git", "uri": "https://github.com/Bfgeshka/octopus.git"}], "feed": ["https://github.com/Bfgeshka/octopus/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-03-19 00:19:32 +0900\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 32}, "oddlama": {"quality": "experimental", "status": "unofficial", "name": "oddlama", "description": {"en": "oddlama's gentoo overlay"}, "homepage": "https://github.com/oddlama/overlay", "owner": [{"type": "person", "email": "overlay@oddlama.org", "name": "oddlama"}], "source": [{"type": "git", "uri": "https://github.com/oddlama/overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/oddlama/overlay.git"}], "feed": ["https://github.com/oddlama/overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-23 18:04:27 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 6}, "olifre": {"quality": "experimental", "status": "unofficial", "name": "olifre", "description": {"en": "Personal overlay of Oliver Freyermuth."}, "homepage": "https://github.com/olifre/olifre-portage", "owner": [{"type": "person", "email": "o.freyermuth@googlemail.com", "name": "Oliver Freyermuth"}], "source": [{"type": "git", "uri": "https://github.com/olifre/olifre-portage.git"}, {"type": "git", "uri": "git://github.com/olifre/olifre-portage.git"}, {"type": "git", "uri": "git@github.com:olifre/olifre-portage.git"}], "feed": ["https://github.com/olifre/olifre-portage/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-09-08 00:01:29 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 9}, "openclonk": {"quality": "experimental", "status": "unofficial", "name": "openclonk", "description": {"en": "Overlay for the game OpenClonk"}, "homepage": "http://www.openclonk.org/", "owner": [{"type": "person", "email": "gentoobug@liftm.de", "name": "Julius Michaelis"}], "source": [{"type": "git", "uri": "https://github.com/jcaesar/openclonk-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/jcaesar/openclonk-overlay.git"}], "feed": ["https://github.com/jcaesar/openclonk-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-07-30 23:29:47 +0900\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "openwrt": {"quality": "experimental", "status": "unofficial", "name": "openwrt", "description": {"en": "Overlay for network configuration packages found in OpenWRT"}, "homepage": "https://github.com/pavlix/gentoo-openwrt", "owner": [{"type": "person", "email": "pavlix@pavlix.net", "name": "Pavel \u0160imerda"}], "source": [{"type": "git", "uri": "https://github.com/pavlix/gentoo-openwrt"}], "x-state": "GOOD", "x-timestamp": "2016-09-14 11:46:36 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 8}, "optmzr": {"quality": "experimental", "status": "unofficial", "name": "optmzr", "description": {"en": "Overlay with some goodies not found elsewhere"}, "homepage": "https://github.com/optmzr/gentoo-overlay", "owner": [{"type": "person", "email": "william@optmzr.se", "name": "William Wennerstr\u00f6m"}], "source": [{"type": "git", "uri": "https://github.com/optmzr/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/optmzr/gentoo-overlay.git"}], "feed": ["https://github.com/optmzr/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-03-19 12:26:26 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 7}, "oubliette": {"quality": "experimental", "status": "unofficial", "name": "oubliette", "description": {"en": "personal overlay of forgotten ebuilds"}, "homepage": "https://github.com/nabbi/oubliette-overlay", "owner": [{"type": "person", "email": "nic@boet.cc", "name": "nic"}], "source": [{"type": "git", "uri": "https://github.com/nabbi/oubliette-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/nabbi/oubliette-overlay.git"}], "feed": ["https://github.com/nabbi/oubliette-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-20 22:54:34 -0500\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 48}, "palemoon": {"quality": "experimental", "status": "unofficial", "name": "palemoon", "description": {"en": "Unofficial Gentoo overlay for the Pale Moon (http://www.palemoon.org/) web browser."}, "homepage": "https://github.com/deu/palemoon-overlay", "owner": [{"type": "person", "email": "de@uio.re", "name": "deu"}], "source": [{"type": "git", "uri": "https://github.com/deu/palemoon-overlay.git"}, {"type": "git", "uri": "git://github.com/deu/palemoon-overlay.git"}, {"type": "git", "uri": "git@github.com:deu/palemoon-overlay.git"}], "feed": ["https://github.com/deu/palemoon-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-06 16:15:47 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 7}, "palmer": {"quality": "experimental", "status": "unofficial", "name": "palmer", "description": {"en": "User overlay"}, "homepage": "https://cgit.gentoo.org/user/palmer.git/", "owner": [{"type": "person", "email": "palmer@dabbelt.com", "name": "Palmer Dabbelt"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/palmer.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/palmer.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/palmer.git"}], "feed": ["https://cgit.gentoo.org/user/palmer.git/atom/"], "x-state": "BAD_CACHE", "x-timestamp": "2019-09-03 17:07:10 -0700\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 65}, "panther": {"quality": "experimental", "status": "unofficial", "name": "panther", "description": {"en": "Fun useful packages not found elsewhere"}, "homepage": "https://github.com/orangeturtle739/panther", "owner": [{"type": "person", "email": "swimgiraffe435@gmail.com", "name": "Jacob Glueck"}], "source": [{"type": "git", "uri": "https://github.com/orangeturtle739/panther.git"}, {"type": "git", "uri": "git+ssh://git@github.com/orangeturtle739/panther.git"}], "feed": ["https://github.com/orangeturtle739/panther/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-09-11 16:52:39 -0400\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 26}, "pdilung": {"quality": "experimental", "status": "unofficial", "name": "pdilung", "description": {"en": "Personal Gentoo overlay of Pavol Dilung"}, "homepage": "https://github.com/pdilung/gentoo-overlay/", "owner": [{"type": "person", "email": "pavol.dilung@gmail.com", "name": "Pavol Dilung"}], "source": [{"type": "git", "uri": "https://github.com/pdilung/gentoo-overlay.git"}, {"type": "git", "uri": "git://github.com/pdilung/gentoo-overlay.git"}, {"type": "git", "uri": "git@github.com:pdilung/gentoo-overlay.git"}], "feed": ["https://github.com/pdilung/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2016-09-25 19:28:59 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 1}, "pentoo": {"quality": "experimental", "status": "official", "name": "pentoo", "description": {"en": "The overlay contains new or updated security tools."}, "homepage": "http://www.pentoo.ch", "owner": [{"type": "person", "email": "zerochaos@gentoo.org"}], "source": [{"type": "git", "uri": "https://github.com/pentoo/pentoo-overlay.git"}, {"type": "git", "uri": "git://github.com/pentoo/pentoo-overlay.git"}, {"type": "git", "uri": "git@github.com:pentoo/pentoo-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2020-10-22 12:41:30 -0400\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 1249}, "perl-experimental": {"quality": "experimental", "status": "official", "name": "perl-experimental", "description": {"en": "Experimental ebuilds for Perl packages in Gentoo. Comments and\n    bugreports are welcome!"}, "homepage": "https://cgit.gentoo.org/proj/perl-overlay.git/", "owner": [{"type": "project", "email": "perl@gentoo.org", "name": "Perl Team"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/perl-overlay.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/perl-overlay.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/perl-overlay.git"}], "feed": ["https://cgit.gentoo.org/proj/perl-overlay.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-08-26 10:49:03 +1200\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 761}, "perl-experimental-snapshots": {"quality": "experimental", "status": "unofficial", "name": "perl-experimental-snapshots", "description": {"en": "Unofficial mirror of overlay \"perl-experimental\" with metadata cache"}, "homepage": "https://github.com/gentoo-perl/perl-experimental-snapshots", "owner": [{"type": "person", "email": "kentnl@gentoo.org", "name": "Kent Fredric"}], "source": [{"type": "git", "uri": "https://github.com/gentoo-perl/perl-experimental-snapshots.git"}, {"type": "git", "uri": "git://github.com/gentoo-perl/perl-experimental-snapshots.git"}], "feed": ["https://github.com/gentoo-perl/perl-experimental-snapshots/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-08-26 11:01:24 +1200\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 761}, "petkovich": {"quality": "experimental", "status": "unofficial", "name": "petkovich", "description": {"en": "Personal overlay of Jean-Christophe Petkovich"}, "homepage": "https://github.com/jcpetkovich/overlay-petkovich", "owner": [{"type": "person", "email": "jcpetkovich@gmail.com", "name": "Jean-Christophe Petkovich"}], "source": [{"type": "git", "uri": "https://github.com/jcpetkovich/overlay-petkovich.git"}, {"type": "git", "uri": "git://github.com/jcpetkovich/overlay-petkovich.git"}, {"type": "git", "uri": "git@github.com:jcpetkovich/overlay-petkovich.git"}], "feed": ["https://github.com/jcpetkovich/overlay-petkovich/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-09-07 20:32:33 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 58}, "pf4public": {"quality": "experimental", "status": "unofficial", "name": "pf4public", "description": {"en": "Personal overlay"}, "homepage": "https://github.com/PF4Public/gentoo-overlay", "owner": [{"type": "person", "email": "PF4Public@mail.ru", "name": "PF4Public"}], "source": [{"type": "git", "uri": "https://github.com/PF4Public/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/PF4Public/gentoo-overlay.git"}], "feed": ["https://github.com/PF4Public/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-22 10:59:22 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 56}, "pg_overlay": {"quality": "experimental", "status": "unofficial", "name": "pg_overlay", "description": {"en": "User overlay"}, "homepage": "https://gitlab.com/Perfect_Gentleman/PG_Overlay", "owner": [{"type": "person", "email": "perfect007gentleman@gmail.com", "name": "Perfect Gentleman"}], "source": [{"type": "git", "uri": "https://gitlab.com/Perfect_Gentleman/PG_Overlay.git"}], "feed": ["https://gitlab.com/Perfect_Gentleman/PG_Overlay/-/commits/master?format=atom"], "x-state": "GOOD", "x-timestamp": "2020-10-23 20:15:14 +0700\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 275}, "phackerlay": {"quality": "experimental", "status": "unofficial", "name": "phackerlay", "description": {"en": "Overlay for phackers"}, "homepage": "https://gitlab.phys-el.ru/ustinov/phackerlay", "owner": [{"type": "person", "email": "ustinov@phys-el.ru", "name": "Alexander B. Ustinov"}], "source": [{"type": "git", "uri": "https://gitlab.phys-el.ru/ustinov/phackerlay.git"}], "feed": ["https://gitlab.phys-el.ru/ustinov/phackerlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-08-05 19:18:50 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 50}, "pholthaus-overlay": {"quality": "experimental", "status": "unofficial", "name": "pholthaus-overlay", "description": {"en": "pholthaus' personal overlay"}, "homepage": "https://github.com/pholthau/pholthaus-overlay", "owner": [{"type": "person", "email": "patrick.holthaus@googlemail.com", "name": "Patrick Holthaus"}], "source": [{"type": "git", "uri": "https://github.com/pholthau/pholthaus-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/pholthau/pholthaus-overlay.git"}], "feed": ["https://github.com//pholthau/pholthaus-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2018-12-06 08:32:49 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 6}, "pica-pica": {"quality": "experimental", "status": "unofficial", "name": "pica-pica", "description": {"en": "Pica Pica ebuilds"}, "homepage": "https://github.com/antonsviridenko/pica-pica-gentoo-overlay", "owner": [{"type": "person", "email": "anton@picapica.im", "name": "Anton Sviridenko"}], "source": [{"type": "git", "uri": "https://github.com/antonsviridenko/pica-pica-gentoo-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2020-02-12 19:28:26 +0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "picarica-overlay": {"quality": "experimental", "status": "unofficial", "name": "picarica-overlay", "description": {"en": "Gentoo overlay for apps that dont exist or are unmaintaned"}, "homepage": "https://gitlab.com/picarica/picarica-overlay", "owner": [{"type": "person", "email": "dohaje@azet.sk", "name": "George Bucek"}], "source": [{"type": "git", "uri": "https://gitlab.com/picarica/picarica-overlay.git"}, {"type": "git", "uri": "git+ssh://git@gitlab.com/picarica/picarica-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2020-03-21 15:52:44 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 14}, "pigfoot": {"quality": "experimental", "status": "unofficial", "name": "pigfoot", "description": {"en": "Ebuilds for experimental packages and chinese patches"}, "homepage": "https://cgit.gentoo.org/user/pigfoot.git/", "owner": [{"type": "person", "email": "pigfoot@gmail.com", "name": "pigfoot"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/pigfoot.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/pigfoot.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/pigfoot.git"}], "feed": ["https://cgit.gentoo.org/user/pigfoot.git/atom/"], "x-timestamp-command": ["git", "log", "--format=%ci", "-1"], "x-openpgp-signature-command": ["git", "show", "-q", "--pretty=format:%G?", "HEAD"], "x-state": "SYNC_FAIL"}, "piniverlay": {"quality": "experimental", "status": "unofficial", "name": "piniverlay", "description": {"en": "Various packages and patches for developers"}, "homepage": "https://github.com/pinicarus/gentoo-overlay", "owner": [{"type": "person", "email": "pini@tuxfamily.org", "name": "Pierre-Nicolas Clauss"}], "source": [{"type": "git", "uri": "https://github.com/pinicarus/gentoo-overlay.git"}, {"type": "git", "uri": "git://github.com/pinicarus/gentoo-overlay.git"}, {"type": "git", "uri": "git@github.com:pinicarus/gentoo-overlay.git"}], "feed": ["https://github.com/pinicarus/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-09-30 20:06:18 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "pinkbyte": {"quality": "experimental", "status": "official", "name": "pinkbyte", "description": {"en": "Pinkbyte's developer overlay"}, "homepage": "https://github.com/Pinkbyte/pinkbyte-overlay", "owner": [{"type": "person", "email": "pinkbyte@gentoo.org", "name": "Sergey Popov"}], "source": [{"type": "git", "uri": "https://github.com/Pinkbyte/pinkbyte-overlay.git"}, {"type": "git", "uri": "git://github.com/Pinkbyte/pinkbyte-overlay.git"}], "feed": ["https://github.com/Pinkbyte/pinkbyte-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-07-13 12:49:15 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 32}, "pixlra": {"quality": "experimental", "status": "unofficial", "name": "pixlra", "description": {"en": "Pixlra collaborative overlay"}, "homepage": "https://cgit.gentoo.org/user/carreira.git/", "owner": [{"type": "person", "email": "jfmcarreira@gmail.com", "name": "Joao Carreira"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/carreira.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/carreira.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/carreira.git"}, {"type": "git", "uri": "https://github.com/pixlra/pixlra-gentoo-overlay.git"}], "feed": ["https://cgit.gentoo.org/user/carreira.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-04-27 02:04:11 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 19}, "pkalin": {"quality": "experimental", "status": "unofficial", "name": "pkalin", "description": {"en": "My Gentoo overlay, somewhat regularly maintained"}, "homepage": "https://github.com/thinrope/pkalin", "owner": [{"type": "person", "email": "kalin@ThinRope.net", "name": "Kalin KOZHUHAROV"}], "source": [{"type": "git", "uri": "https://github.com/thinrope/pkalin.git"}, {"type": "git", "uri": "git+ssh://git@github.com/thinrope/pkalin.git"}], "feed": ["https://github.com/thinrope/pkalin/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-09-24 01:20:19 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 97}, "plex-overlay": {"quality": "experimental", "status": "unofficial", "name": "plex-overlay", "description": {"en": "Personal overlay of comio containing Plex related ebuilds"}, "homepage": "https://github.com/comio/plex-overlay", "owner": [{"type": "person", "email": "luigi.mantellini@gmail.com", "name": "Luigi Mantellini"}], "source": [{"type": "git", "uri": "https://github.com/comio/plex-overlay.git"}], "feed": ["https://github.com/comio/plex-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-14 17:44:57 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 12}, "poly-c": {"quality": "experimental", "status": "official", "name": "poly-c", "description": {"en": "Polynomial-C's overlay"}, "homepage": "http://www.gentoofan.org/gentoo/", "owner": [{"type": "person", "email": "polynomial-c@gentoo.org", "name": "Lars Wendler"}], "source": [{"type": "rsync", "uri": "rsync://rsync.gentoofan.org/poly-c"}], "x-state": "GOOD", "x-timestamp": "2020-09-20 19:47:04.000000000 +0000\n", "x-masters": ["gentoo"], "x-ebuild-count": 294}, "posativ": {"quality": "experimental", "status": "unofficial", "name": "posativ", "description": {"en": "Overlay of Martin Zimmermann"}, "homepage": "https://github.com/posativ/overlay", "owner": [{"type": "person", "email": "info@posativ.org", "name": "Martin Zimmermann"}], "source": [{"type": "git", "uri": "https://github.com/posativ/overlay.git"}, {"type": "git", "uri": "git://github.com/posativ/overlay.git"}, {"type": "git", "uri": "git@github.com:posativ/overlay.git"}], "feed": ["https://github.com/posativ/overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2017-12-14 22:17:44 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 20}, "powerman": {"quality": "experimental", "status": "unofficial", "name": "powerman", "description": {"en": "Overlay of Alex Efros"}, "homepage": "https://github.com/powerman/powerman-overlay", "owner": [{"type": "person", "email": "powerman-asdf@yandex.ru", "name": "Alex Efros"}], "source": [{"type": "git", "uri": "https://github.com/powerman/powerman-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2020-09-27 22:54:30 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 125}, "ppfeufer-gentoo-overlay": {"quality": "experimental", "status": "unofficial", "name": "ppfeufer-gentoo-overlay", "description": {"en": "ppfeufer's personal overlay."}, "homepage": "https://github.com/ppfeufer/gentoo-overlay", "owner": [{"type": "person", "email": "info@ppfeufer.de", "name": "Peter Pfeufer"}], "source": [{"type": "git", "uri": "https://github.com/ppfeufer/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/ppfeufer/gentoo-overlay.git"}], "feed": ["https://github.com/ppfeufer/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-21 17:39:22 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 37}, "pross": {"quality": "experimental", "status": "unofficial", "name": "pross", "description": {"en": "Up to date ck-sources"}, "homepage": "https://github.com/Pross/pross-overlay", "owner": [{"type": "person", "email": "pross@pross.org.uk", "name": "Simon Prosser"}], "source": [{"type": "git", "uri": "https://github.com/Pross/pross-overlay.git"}], "feed": ["https://github.com/Pross/pross-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2020-10-21 17:25:35 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 10}, "pyfa": {"quality": "experimental", "status": "unofficial", "name": "pyfa", "description": {"en": "Newest versions of Pyfa (Python fitting assistant for EVE Online)"}, "homepage": "https://github.com/ZeroPointEnergy/gentoo-pyfa-overlay", "owner": [{"type": "person", "email": "a.zuber@gmx.ch", "name": "Andreas Zuber"}], "source": [{"type": "git", "uri": "https://github.com/ZeroPointEnergy/gentoo-pyfa-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/ZeroPointEnergy/gentoo-pyfa-overlay.git"}], "feed": ["https://github.com/ZeroPointEnergy/gentoo-pyfa-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-13 22:55:07 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 6}, "python": {"quality": "experimental", "status": "official", "name": "python", "description": {"en": "Python project repository"}, "homepage": "https://cgit.gentoo.org/proj/python.git/", "owner": [{"type": "project", "email": "python@gentoo.org", "name": "Gentoo Python project"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/python.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/python.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/python.git"}], "feed": ["https://cgit.gentoo.org/proj/python.git/atom/"], "x-timestamp-command": ["git", "log", "--format=%ci", "-1"], "x-openpgp-signature-command": ["git", "show", "-q", "--pretty=format:%G?", "HEAD"], "x-state": "SYNC_FAIL"}, "qemu-init": {"quality": "experimental", "status": "official", "name": "qemu-init", "description": {"en": "qemu init script and tools"}, "homepage": "https://cgit.gentoo.org/dev/qiaomuf.git/", "owner": [{"type": "person", "email": "dolsen@gentoo.org", "name": "Brian Dolbec"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/kvm-tools.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/kvm-tools.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/kvm-tools.git"}], "feed": ["https://cgit.gentoo.org/proj/kvm-tools.git/atom/"], "x-state": "GOOD", "x-timestamp": "2016-03-23 10:53:56 -0700\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 1}, "qgp": {"quality": "experimental", "status": "unofficial", "name": "qgp", "description": {"en": "qgp overlay (mostly computing and HEP)"}, "homepage": "https://github.com/qgp/gentoo-qgp", "owner": [{"type": "person", "email": "qgp1024@gmail.com", "name": "Jochen Klein"}], "source": [{"type": "git", "uri": "https://github.com/qgp/gentoo-qgp.git"}, {"type": "git", "uri": "git://github.com/qgp/gentoo-qgp.git"}, {"type": "git", "uri": "git+ssh://git@github.com:qgp/gentoo-qgp.git"}], "feed": ["https://github.com/qgp/gentoo-qgp/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-08-11 19:51:33 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 14}, "qownnotes-overlay": {"quality": "experimental", "status": "unofficial", "name": "qownnotes-overlay", "description": {"en": "QOwnNotes overlay"}, "homepage": "http://www.qownnotes.org", "owner": [{"type": "person", "email": "patrizio@bekerle.com", "name": "Patrizio Bekerle"}], "source": [{"type": "git", "uri": "https://github.com/qownnotes/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/qownnotes/gentoo-overlay.git"}], "feed": ["https://github.com/qownnotes/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-22 18:04:52 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 512}, "qsx": {"quality": "experimental", "status": "unofficial", "name": "qsx", "description": {"en": "qsx\u2019 ebuilds"}, "homepage": "https://github.com/qsuscs/gentoo-overlay", "owner": [{"type": "person", "email": "qsx@chaotikum.eu", "name": "Thomas Schneider"}], "source": [{"type": "git", "uri": "https://github.com/qsuscs/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/qsuscs/gentoo-overlay.git"}], "feed": ["https://github.com/qsuscs/gentoo-overlay/commits/main.atom"], "x-state": "GOOD", "x-timestamp": "2020-07-18 15:15:16 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 17}, "qt": {"quality": "experimental", "status": "official", "name": "qt", "description": {"en": "Official testing overlay for Qt and related packages, provided\n    by Gentoo's Qt team. Contains ebuilds for Qt4 and Qt5 prereleases and live ebuilds,\n    plus various (non-KDE) applications and utilities that use Qt."}, "homepage": "https://github.com/gentoo/qt", "owner": [{"type": "project", "email": "qt@gentoo.org", "name": "Qt Team"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/qt.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/qt.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/qt.git"}], "feed": ["https://cgit.gentoo.org/proj/qt.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-10-18 22:44:21 +0200\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 86}, "quarks": {"quality": "experimental", "status": "unofficial", "name": "quarks", "description": {"en": "Quarks's overlay; needful things around Security, Penetration Testing and gaming"}, "homepage": "https://git.zero-downtime.net/quark", "owner": [{"type": "person", "email": "it@startux.de", "name": "Stefan Reimer"}], "source": [{"type": "git", "uri": "https://git.zero-downtime.net/quark/quarks.git"}], "x-state": "GOOD", "x-timestamp": "2020-09-26 10:33:21 -0700\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 41}, "qwin-overlay": {"quality": "experimental", "status": "unofficial", "name": "qwin-overlay", "description": {"en": "Gentoo overlay with some patched packages."}, "homepage": "https://github.com/Flex1911/", "owner": [{"type": "person", "email": "dedsa2002@gmail.com"}], "source": [{"type": "git", "uri": "git://github.com/Flex1911/qwin-overlay.git"}], "x-state": "BAD_CACHE", "x-timestamp": "2017-10-21 16:11:32 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 6}, "rafaelmartins": {"quality": "experimental", "status": "official", "name": "rafaelmartins", "description": {"en": "Rafael Martins' Gentoo overlay"}, "homepage": "https://github.com/rafaelmartins/gentoo-overlay", "owner": [{"type": "person", "email": "rafaelmartins@gentoo.org", "name": "Rafael G. Martins"}], "source": [{"type": "git", "uri": "https://github.com/rafaelmartins/gentoo-overlay.git"}, {"type": "git", "uri": "git://github.com/rafaelmartins/gentoo-overlay.git"}], "feed": ["https://github.com/rafaelmartins/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2015-10-19 20:09:06 -0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 27}, "rage": {"quality": "experimental", "status": "unofficial", "name": "rage", "description": {"en": "rage's personal overlay"}, "homepage": "https://gitlab.com/oxr463/overlay", "owner": [{"type": "person", "email": "ramage.lucas@protonmail.com", "name": "Lucas Ramage"}], "source": [{"type": "git", "uri": "https://gitlab.com/oxr463/overlay.git"}, {"type": "git", "uri": "git+ssh://git@gitlab.com/oxr463/overlay.git"}], "feed": ["https://gitlab.com/oxr463/overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-06-24 07:51:33 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 48}, "raiagent": {"quality": "experimental", "status": "unofficial", "name": "raiagent", "description": {"en": "Well-documented ebuilds en-route to a bandersnatch near you"}, "homepage": "https://github.com/leycec/raiagent", "owner": [{"type": "person", "email": "leycec@gmail.com", "name": "Cecil Curry"}], "source": [{"type": "git", "uri": "https://github.com/leycec/raiagent"}, {"type": "git", "uri": "git://github.com/leycec/raiagent.git"}], "x-state": "GOOD", "x-timestamp": "2020-10-10 22:37:43 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 114}, "rasdark": {"quality": "experimental", "status": "unofficial", "name": "rasdark", "description": {"en": "rasdark personal overlay"}, "homepage": "https://github.com/rasdark/overlay", "owner": [{"type": "person", "email": "andrew.senik@gmail.com", "name": "Andrey Senik"}], "source": [{"type": "git", "uri": "https://github.com/rasdark/overlay"}, {"type": "git", "uri": "git://github.com/rasdark/overlay.git"}], "x-state": "GOOD", "x-timestamp": "2020-08-20 13:33:03 +0300\n", "x-openpgp-signed": "N", "x-masters": ["calculate", "gentoo"], "x-ebuild-count": 71}, "raw": {"quality": "experimental", "status": "unofficial", "name": "raw", "description": {"en": "some raw stuff"}, "homepage": "https://github.com/mahatma-kaganovich/raw", "owner": [{"type": "person", "email": "mahatma@eu.by", "name": "Denis Kaganovich (aka Dzianis Kahanovich)"}], "source": [{"type": "git", "uri": "https://github.com/mahatma-kaganovich/raw.git"}], "feed": ["https://github.com/mahatma-kaganovich/raw/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2020-10-23 06:12:17 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 57}, "rdnetto-overlay": {"quality": "experimental", "status": "unofficial", "name": "rdnetto-overlay", "description": {"en": "Personal Overlay"}, "homepage": "https://github.com/rdnetto/rdnetto-overlay", "owner": [{"type": "person", "email": "rdnetto@gmail.com", "name": "Reuben D'Netto"}], "source": [{"type": "git", "uri": "https://github.com/rdnetto/rdnetto-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com:rdnetto/rdnetto-overlay.git"}], "feed": ["https://github.com/rdnetto/rdnetto-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-09 17:40:49 +1100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 94}, "reagentoo": {"quality": "experimental", "status": "unofficial", "name": "reagentoo", "description": {"en": "reagentoo's overlay"}, "homepage": "https://github.com/reagentoo/gentoo-overlay", "owner": [{"type": "person", "email": "reagentoo@gmail.com"}], "source": [{"type": "git", "uri": "https://github.com/reagentoo/gentoo-overlay.git"}, {"type": "git", "uri": "git://github.com/reagentoo/gentoo-overlay.git"}, {"type": "git", "uri": "git@github.com:reagentoo/gentoo-overlay.git"}], "feed": ["https://github.com/reagentoo/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-07 19:00:25 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 80}, "rebutia": {"quality": "experimental", "status": "unofficial", "name": "rebutia", "description": {"en": "Rebutia overlay"}, "homepage": "https://cgit.gentoo.org/user/rebutia.git/", "owner": [{"type": "person", "email": "ps@twin.jikos.cz", "name": "Pavel Sanda"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/rebutia.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/rebutia.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/rebutia.git"}], "feed": ["https://cgit.gentoo.org/user/rebutia.git/atom/"], "x-timestamp-command": ["git", "log", "--format=%ci", "-1"], "x-openpgp-signature-command": ["git", "show", "-q", "--pretty=format:%G?", "HEAD"], "x-state": "SYNC_FAIL"}, "regina-gentoo": {"quality": "experimental", "status": "unofficial", "name": "regina-gentoo", "description": {"en": "Regina packages for Gentoo"}, "homepage": "https://github.com/WPettersson/regina-gentoo/", "owner": [{"type": "person", "email": "william@ewpettersson.se", "name": "William Pettersson"}], "source": [{"type": "git", "uri": "git://github.com/WPettersson/regina-gentoo.git"}], "feed": ["https://github.com/WPettersson/regina-gentoo/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-01-19 11:59:50 +0000\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 3}, "ricerlay": {"quality": "experimental", "status": "unofficial", "name": "ricerlay", "description": {"en": "Overlay for ricing enthusiasts"}, "homepage": "https://github.com/azahi/ricerlay", "owner": [{"type": "person", "email": "azahi@teknik.io", "name": "azahi"}], "source": [{"type": "git", "uri": "https://github.com/azahi/ricerlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/azahi/ricerlay.git"}], "feed": ["https://github.com/azahi/ricerlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-10 13:24:39 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 82}, "rich0": {"quality": "experimental", "status": "official", "name": "rich0", "description": {"en": "Rich0's developer overlay"}, "homepage": "https://github.com/rich0/rich0-overlay", "owner": [{"type": "person", "email": "rich0@gentoo.org", "name": "Richard Freeman"}], "source": [{"type": "git", "uri": "git://github.com/rich0/rich0-overlay.git"}], "feed": ["https://github.com/rich0/rich0-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-08-24 09:39:37 -0400\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 56}, "ring-overlay": {"quality": "experimental", "status": "unofficial", "name": "ring-overlay", "description": {"en": "Ring is free software for universal communication which respects freedoms and privacy of its users."}, "homepage": "https://github.com/stefan-langenmaier/ring-overlay", "owner": [{"type": "person", "email": "stefan.langenmaier+gentoo@gmail.com", "name": "Stefan Langenmaier"}], "source": [{"type": "git", "uri": "https://github.com/stefan-langenmaier/ring-overlay.git"}, {"type": "git", "uri": "git://github.com/stefan-langenmaier/ring-overlay.git"}, {"type": "git", "uri": "git@github.com:stefan-langenmaier/ring-overlay.git"}], "feed": ["https://github.com/stefan-langenmaier/ring-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-04-17 10:23:59 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 55}, "rion": {"quality": "experimental", "status": "unofficial", "name": "rion", "description": {"en": "Russian overlay with a some patched and specific\n    software"}, "homepage": "https://github.com/rion-overlay", "owner": [{"type": "person", "email": "rion4ik@gmail.com", "name": "Sergey Ilinykh"}], "source": [{"type": "git", "uri": "https://github.com/rion-overlay/rion-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/rion-overlay/rion-overlay.git"}], "feed": ["https://github.com/rion-overlay/rion-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-21 10:37:12 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 113}, "riru": {"quality": "experimental", "status": "unofficial", "name": "riru", "description": {"en": "Home overlay for development, patches and live ebuilds", "ru": "\u0414\u043e\u043c\u0430\u0448\u043d\u0438\u0439 \u043e\u0432\u0435\u0440\u043b\u0435\u0439 \u0434\u043b\u044f \u0440\u0430\u0437\u0440\u0430\u0431\u043e\u0442\u043a\u0438, \u043f\u0430\u0442\u0447\u0435\u0439 \u0438 \u043b\u0430\u0439\u0432 \u0435\u0431\u0438\u043b\u0434\u043e\u0432"}, "homepage": "https://github.com/pkulev/riru", "owner": [{"type": "person", "email": "kulyov.pavel@gmail.com", "name": "Pavel Kulyov"}], "source": [{"type": "git", "uri": "https://github.com/pkulev/riru.git"}, {"type": "git", "uri": "git://github.com/pkulev/riru.git"}, {"type": "git", "uri": "git@github.com:pkulev/riru.git"}], "feed": ["https://github.com/pkulev/riru/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-02-11 13:37:10 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 23}, "robert7k": {"quality": "experimental", "status": "unofficial", "name": "robert7k", "description": {"en": "personal overlay of robert7k"}, "homepage": "https://github.com/robert7k/gentoo-overlay", "owner": [{"type": "person", "email": "gentoo.2019@r123.de"}], "source": [{"type": "git", "uri": "https://github.com/robert7k/gentoo-overlay.git"}], "feed": ["https://github.com/robert7k/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-22 23:42:07 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 40}, "ros-overlay": {"quality": "experimental", "status": "unofficial", "name": "ros-overlay", "description": {"en": "Ebuilds for the Robot Operating System (ROS)."}, "homepage": "https://github.com/ros/ros-overlay", "owner": [{"type": "person", "email": "wayne@neverfear.org"}], "source": [{"type": "git", "uri": "git://github.com/ros/ros-overlay.git"}], "feed": ["https://github.com/ros/ros-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-07-19 10:32:45 -0400\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 7439}, "roslin": {"quality": "experimental", "status": "unofficial", "name": "roslin", "description": {"en": "This is roslin, my small overlay. Enjoy! (:"}, "homepage": "https://gitlab.com/roslin-uberlay/roslin", "owner": [{"type": "person", "email": "szarpaj@grubelek.pl", "name": "Piotr Szymaniak"}, {"type": "person", "email": "mziab@o2.pl", "name": "Micha\u0142 Zi\u0105bkowski"}], "source": [{"type": "git", "uri": "https://gitlab.com/roslin-uberlay/roslin.git"}], "x-state": "GOOD", "x-timestamp": "2020-02-10 23:34:19 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 206}, "rpm": {"quality": "experimental", "status": "unofficial", "name": "rpm", "description": {"en": "Overlay for RPM packagers targeting Fedora, EPEL, CentOS and similar distros"}, "homepage": "https://github.com/pavlix/gentoo-rpm", "owner": [{"type": "person", "email": "pavlix@pavlix.net", "name": "Pavel \u0160imerda"}], "source": [{"type": "git", "uri": "https://github.com/pavlix/gentoo-rpm.git"}], "x-state": "GOOD", "x-timestamp": "2017-02-16 11:49:24 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 37}, "ruby": {"quality": "experimental", "status": "official", "name": "ruby", "description": {"en": "Experimental ebuilds from the Ruby edge."}, "homepage": "https://cgit.gentoo.org/proj/ruby", "owner": [{"type": "project", "email": "ruby@gentoo.org", "name": "Ruby Team"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/ruby-overlay.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/ruby-overlay.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/ruby-overlay.git"}], "feed": ["https://cgit.gentoo.org/proj/ruby-overlay.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-09-15 09:39:31 +0200\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 7}, "rukruk": {"quality": "experimental", "status": "unofficial", "name": "rukruk", "description": {"en": "some packages not found in other overlays, for issues create ticket in github"}, "homepage": "https://github.com/Atoms/rukruk", "owner": [{"type": "person", "email": "atoms@tups.lv", "name": "Aivars Sterns"}], "source": [{"type": "git", "uri": "https://github.com/Atoms/rukruk.git"}, {"type": "git", "uri": "git://github.com/Atoms/rukruk.git"}, {"type": "git", "uri": "git@github.com:Atoms/rukruk.git"}], "feed": ["https://github.com/Atoms/rukruk/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2019-04-05 10:07:56 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 20}, "rust": {"quality": "experimental", "status": "unofficial", "name": "rust", "description": {"en": "rust modules and tools"}, "homepage": "https://github.com/gentoo/gentoo-rust", "owner": [{"type": "project", "email": "rust@gentoo.org", "name": "Rust Team"}], "source": [{"type": "git", "uri": "https://github.com/gentoo/gentoo-rust.git"}, {"type": "git", "uri": "git://github.com/gentoo/gentoo-rust.git"}, {"type": "git", "uri": "git@github.com:gentoo/gentoo-rust.git"}], "feed": ["https://github.com/gentoo/gentoo-rust/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-09 15:21:38 +0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 55}, "sabayon": {"quality": "experimental", "status": "unofficial", "name": "sabayon", "description": {"en": "Sabayon ebuilds that could be upstreamed to\n    Gentoo (or just being useful for Gentoo users as well):\n    hot fixes, ebuild updates, etc.\n    For Sabayon-only ebuilds, please use the sabayon-distro overlay.\n    Bugs to http://bugs.sabayon.org"}, "homepage": "http://sabayon.org", "owner": [{"type": "person", "email": "joost.ruis@sabayonlinux.org"}], "source": [{"type": "git", "uri": "git://github.com/Sabayon/for-gentoo.git"}], "feed": ["https://github.com/feeds/Sabayon/commits/for-gentoo/master"], "x-state": "GOOD", "x-timestamp": "2020-10-20 22:52:15 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 211}, "sabayon-distro": {"quality": "experimental", "status": "unofficial", "name": "sabayon-distro", "description": {"en": "Sabayon related ebuilds such as artwork, kernel binaries,\n    split packages, etc.\n    Bugs to http://bugs.sabayon.org"}, "homepage": "http://sabayon.org", "owner": [{"type": "person", "email": "joost.ruis@sabayonlinux.org"}], "source": [{"type": "git", "uri": "git://github.com/Sabayon/sabayon-distro.git"}], "feed": ["https://github.com/feeds/Sabayon/commits/sabayon-distro/master"], "x-state": "GOOD", "x-timestamp": "2020-10-21 19:55:41 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 663}, "sage-on-gentoo": {"quality": "experimental", "status": "unofficial", "name": "sage-on-gentoo", "description": {"en": "Split ebuilds for the Sage computer algebra system"}, "homepage": "https://github.com/cschwan/sage-on-gentoo", "owner": [{"type": "person", "email": "frp.bissey@gmail.com", "name": "Francois Bissey"}], "source": [{"type": "git", "uri": "git://github.com/cschwan/sage-on-gentoo.git"}, {"type": "git", "uri": "https://github.com/cschwan/sage-on-gentoo.git"}], "feed": ["https://github.com/feeds/cschwan/commits/sage-on-gentoo/master"], "x-state": "GOOD", "x-timestamp": "2020-10-21 14:26:00 +1300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 252}, "salfter": {"quality": "experimental", "status": "unofficial", "name": "salfter", "description": {"en": "Scott Alfter's ebuilds"}, "homepage": "https://gitlab.com/salfter/portage", "owner": [{"type": "person", "email": "scott@alfter.us", "name": "Scott Alfter"}], "source": [{"type": "git", "uri": "https://gitlab.com/salfter/portage.git"}], "x-state": "BAD_CACHE", "x-timestamp": "2020-10-06 13:00:29 -0700\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 187}, "sam_c": {"quality": "experimental", "status": "unofficial", "name": "sam_c", "description": {"en": "sam_c's personal overlay"}, "homepage": "https://github.com/thesamesam/overlay", "owner": [{"type": "person", "email": "sam@cmpct.info", "name": "Sam James"}], "source": [{"type": "git", "uri": "https://github.com/thesamesam/overlay"}, {"type": "git", "uri": "git+ssh://git@github.com/thesamesam/overlay.git"}], "feed": ["https://github.com/thesamesam/overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-08-21 14:41:15 +0000\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 8}, "sarnex-overlay": {"quality": "experimental", "status": "unofficial", "name": "sarnex-overlay", "description": {"en": "Sarnex's personal overlay"}, "homepage": "https://github.com/sarnex/sarnex-overlay.git", "owner": [{"type": "person", "email": "commendsarnex@gmail.com", "name": "Nick Sarnie"}], "source": [{"type": "git", "uri": "https://github.com/sarnex/sarnex-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/sarnex/sarnex-overlay.git"}], "feed": ["https://github.com/sarnex/sarnex-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2017-10-01 00:04:35 -0400\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "sattvik": {"quality": "experimental", "status": "unofficial", "name": "sattvik", "description": {"en": "sattvik's overlay with personalized bug fixes and tweaks"}, "homepage": "https://cgit.gentoo.org/user/sattvik.git/", "owner": [{"type": "person", "email": "gentoo@sattvik.com", "name": "Daniel Solano Gomez"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/sattvik.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/sattvik.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/sattvik.git"}], "feed": ["https://cgit.gentoo.org/user/sattvik.git/atom/"], "x-timestamp-command": ["git", "log", "--format=%ci", "-1"], "x-openpgp-signature-command": ["git", "show", "-q", "--pretty=format:%G?", "HEAD"], "x-state": "SYNC_FAIL"}, "science": {"quality": "experimental", "status": "official", "name": "science", "description": {"en": "The Gentoo Science Overlay is intended as a place to work\n    outside of the main portage tree on experimental ebuilds. Our aim is to\n    increase the rate of development of scientific packages for Gentoo, but\n    ebuilds in this repository are by their very nature more experimental. If\n    you wish to use them you should be willing to help test and report\n    bugs. For contribution read https://wiki.gentoo.org/wiki/Project:Science/Contributing\n    "}, "homepage": "https://wiki.gentoo.org/wiki/Project:Science", "owner": [{"type": "project", "email": "sci@gentoo.org", "name": "sci"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/sci.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/sci.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/sci.git"}, {"type": "git", "uri": "https://github.com/gentoo-science/sci.git"}, {"type": "git", "uri": "git://github.com/gentoo-science/sci.git"}, {"type": "git", "uri": "git@github.com:gentoo-science/sci.git"}], "feed": ["https://cgit.gentoo.org/proj/sci.git/atom/", "https://github.com/gentoo-science/sci/commits/master.atom"], "x-timestamp-command": ["git", "log", "--format=%ci", "-1"], "x-openpgp-signature-command": ["git", "show", "-q", "--pretty=format:%G?", "HEAD"], "x-state": "SYNC_FAIL"}, "scrill": {"quality": "experimental", "status": "unofficial", "name": "scrill", "description": {"en": "Some admin tools"}, "homepage": "https://github.com/scrill/scrill-overlay", "owner": [{"type": "person", "email": "sergey.zhuga@gmail.com", "name": "Sergey Zhuga"}], "source": [{"type": "git", "uri": "git://github.com/scrill/scrill-overlay.git"}], "feed": ["https://github.com/scrill/scrill-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-06-26 15:18:11 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 25}, "seadep": {"quality": "experimental", "status": "unofficial", "name": "seadep", "description": {"en": "just a few ebuilds, I couldn't find elsewhere"}, "homepage": "https://github.com/Keepco/gentoo-overlay-seadep", "owner": [{"type": "person", "email": "Rasmus.thomsen@live.de", "name": "Rasmus Thomsen"}], "source": [{"type": "git", "uri": "https://github.com/Keepco/gentoo-overlay-seadep.git"}, {"type": "git", "uri": "git://github.com/Keepco/gentoo-overlay-seadep.git"}, {"type": "git", "uri": "git@github.com:Keepco/gentoo-overlay-seadep.git"}], "feed": ["https://github.com/Keepco/gentoo-overlay-seadep/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2017-11-25 19:15:52 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 6}, "seden": {"quality": "experimental", "status": "unofficial", "name": "seden", "description": {"en": "Experimental ebuilds that are still unmaintained"}, "homepage": "https://cgit.gentoo.org/user/seden.git/", "owner": [{"type": "person", "email": "yamakuzure@gmx.net", "name": "Sven Eden"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/seden.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/seden.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/seden.git"}], "feed": ["https://cgit.gentoo.org/user/seden.git/atom/"], "x-timestamp-command": ["git", "log", "--format=%ci", "-1"], "x-openpgp-signature-command": ["git", "show", "-q", "--pretty=format:%G?", "HEAD"], "x-state": "SYNC_FAIL"}, "seeds": {"quality": "experimental", "status": "unofficial", "name": "seeds", "description": {"en": "Overlay for Gentoo from vonavi"}, "homepage": "https://github.com/vonavi/", "owner": [{"type": "person", "email": "ivvl82@gmail.com", "name": "Vladimir Ivanov"}], "source": [{"type": "git", "uri": "git://github.com/vonavi/seeds.git"}], "feed": ["ttps://github.com/vonavi/seeds/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2019-03-23 08:55:45 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 25}, "setkeh": {"quality": "experimental", "status": "unofficial", "name": "setkeh", "description": {"en": "setkeh maintained ebuilds"}, "homepage": "https://github.com/setkeh/Portage-Overlay", "owner": [{"type": "person", "email": "setkeh@gmail.com", "name": "James (setkeh) Griffis"}], "source": [{"type": "git", "uri": "https://github.com/setkeh/Portage-Overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com:setkeh/Portage-Overlay.git"}], "feed": ["https://github.com/setkeh/Portage-Overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-05-19 14:57:04 +1000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "sevcsik": {"quality": "experimental", "status": "unofficial", "name": "sevcsik", "description": {"en": "Mainly cryptocurrency/blockchain related ebuilds"}, "homepage": "https://github.com/sevcsik/overlay", "owner": [{"type": "person", "email": "sevcsik@sevdev.hu", "name": "Andras Sevcsik"}], "source": [{"type": "git", "uri": "https://github.com/sevcsik/overlay.git"}, {"type": "git", "uri": "git://github.com/sevcsik/overlay.git"}, {"type": "git", "uri": "git@github.com:sevcsik/overlay.git"}], "feed": ["https://github.com/sevcsik/overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2017-08-29 00:43:36 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 8}, "sft": {"quality": "experimental", "status": "unofficial", "name": "sft", "description": {"en": "SFT Technologies gentoo overlay"}, "homepage": "https://github.com/SFTtech/gentoo-overlay", "owner": [{"type": "person", "email": "jj@stusta.net", "name": "Jonas Jelten"}], "source": [{"type": "git", "uri": "https://github.com/SFTtech/gentoo-overlay.git"}], "feed": ["https://github.com/SFTtech/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-21 15:39:54 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 30}, "sgs": {"quality": "experimental", "status": "unofficial", "name": "sgs", "description": {"en": "Simeon Simeonov's personal Gentoo overlay"}, "homepage": "https://github.com/blackm0re/sgs-overlay", "owner": [{"type": "person", "email": "sgs@pichove.org", "name": "Simeon Simeonov"}], "source": [{"type": "git", "uri": "https://github.com/blackm0re/sgs-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com:blackm0re/sgs-overlay.git"}], "feed": ["https://github.com/blackm0re/sgs-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-07 10:10:58 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "shnurise": {"quality": "experimental", "status": "unofficial", "name": "shnurise", "description": {"en": "packages for mono environment and other", "ru": "\u043f\u0430\u043a\u0435\u0442\u044b \u0434\u043b\u044f \u043c\u043e\u043d\u043e \u0438 \u0440\u0430\u0437\u043d\u043e\u0435 \u043f\u0440\u043e\u0447\u0435\u0435"}, "homepage": "https://github.com/ArsenShnurkov/shnurise", "owner": [{"type": "person", "email": "Arsen.Shnurkov@gmail.com", "name": "Arsen Shnurkov"}], "source": [{"type": "git", "uri": "https://github.com/ArsenShnurkov/shnurise.git"}, {"type": "git", "uri": "git://github.com/ArsenShnurkov/shnurise.git"}, {"type": "git", "uri": "git@github.com:ArsenShnurkov/shnurise.git"}], "feed": ["https://github.com/ArsenShnurkov/shnurise/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2020-10-23 16:35:29 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 39}, "sihnon": {"quality": "experimental", "status": "unofficial", "name": "sihnon", "description": {"en": "optiz0r's sihnon overlay"}, "homepage": "https://github.com/optiz0r/gentoo-overlay", "owner": [{"type": "person", "email": "optiz0r@gmail.com", "name": "optiz0r"}], "source": [{"type": "git", "uri": "https://github.com/optiz0r/gentoo-overlay.git"}, {"type": "git", "uri": "git://github.com/optiz0r/gentoo-overlay.git"}, {"type": "git", "uri": "git@github.com:optiz0r/gentoo-overlay.git"}], "feed": ["https://github.com/optiz0r/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-09-21 21:47:58 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 10}, "simonvanderveldt": {"quality": "experimental", "status": "unofficial", "name": "simonvanderveldt", "description": {"en": "Personal Gentoo overlay focused on music production and engineering applications"}, "homepage": "https://github.com/simonvanderveldt/simonvanderveldt-overlay", "owner": [{"type": "person", "email": "simon.vanderveldt@gmail.com", "name": "Simon van der Veldt"}], "source": [{"type": "git", "uri": "https://github.com/simonvanderveldt/simonvanderveldt-overlay.git"}, {"type": "git", "uri": "git://github.com/simonvanderveldt/simonvanderveldt-overlay.git"}, {"type": "git", "uri": "git@github.com:simonvanderveldt/simonvanderveldt-overlay.git"}], "feed": ["https://github.com/simonvanderveldt/simonvanderveldt-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-03-20 18:00:48 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 10}, "sinustrom": {"quality": "experimental", "status": "unofficial", "name": "sinustrom", "description": {"en": "Sinustrom Gentoo Overlay"}, "homepage": "https://github.com/zpuskas/sinustrom-gentoo-overlay", "owner": [{"type": "person", "email": "zoltan@sinustrom.info", "name": "Zoltan Puskas"}], "source": [{"type": "git", "uri": "https://github.com/zpuskas/sinustrom-gentoo-overlay.git"}, {"type": "git", "uri": "git://github.com/zpuskas/sinustrom-gentoo-overlay.git"}, {"type": "git", "uri": "git@github.com:zpuskas/sinustrom-gentoo-overlay.git"}], "feed": ["https://github.com/zpuskas/sinustrom-gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-11 18:42:56 -0700\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 15}, "sk-overlay": {"quality": "experimental", "status": "unofficial", "name": "sk-overlay", "description": {"en": "The Scriptkitties overlay for additional ebuilds"}, "homepage": "https://github.com/scriptkitties/overlay", "owner": [{"type": "person", "email": "p.spek@tyil.work", "name": "Patrick Spek"}], "source": [{"type": "git", "uri": "https://github.com/scriptkitties/overlay.git"}, {"type": "git", "uri": "git://github.com/scriptkitties/overlay.git"}, {"type": "git", "uri": "git@github.com:scriptkitties/overlay.git"}], "feed": ["https://github.com/scriptkitties/overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-07-23 10:01:16 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 51}, "slonko": {"quality": "experimental", "status": "unofficial", "name": "slonko", "description": {"en": "Personal portage overlay"}, "homepage": "https://slonko.net/portage", "owner": [{"type": "person", "email": "marcin.deranek@slonko.net", "name": "Marcin Deranek"}], "source": [{"type": "git", "uri": "https://slonko.net/git/portage"}], "feed": ["https://slonko.net/git/portage/atom/"], "x-state": "GOOD", "x-timestamp": "2020-10-17 17:10:05 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 22}, "slyfox": {"quality": "experimental", "status": "official", "name": "slyfox", "description": {"en": "slyfox's ebuild den"}, "homepage": "https://github.com/trofi/slyfox-gentoo", "owner": [{"type": "person", "email": "slyfox@gentoo.org", "name": "Sergei Trofimovich"}], "source": [{"type": "git", "uri": "https://github.com/trofi/slyfox-gentoo"}], "feed": ["https://github.com/trofi/slyfox-gentoo/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-03 21:54:55 +0100\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 22}, "snapd": {"quality": "experimental", "status": "unofficial", "name": "snapd", "description": {"en": "ebuilds for canaonicals snapd"}, "homepage": "https://github.com/zigford/snapd", "owner": [{"type": "person", "email": "zigford@gmail.com", "name": "Jesse Harris"}], "source": [{"type": "git", "uri": "https://github.com/zigford/snapd.git"}], "feed": ["https://github.com/zigford/snapd/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-19 21:12:07 +1000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 3}, "soft": {"quality": "experimental", "status": "unofficial", "name": "soft", "description": {"en": "Soft's personal overlay for miscellaneous ebuilds"}, "homepage": "https://bitbucket.org/Soft/overlay", "owner": [{"type": "person", "email": "samuel.lauren@iki.fi", "name": "Samuel Laur\u00e9n"}], "source": [{"type": "mercurial", "uri": "https://bitbucket.org/Soft/overlay"}], "x-timestamp-command": ["hg", "log", "-l", "1", "--template={date|isodatesec}"], "x-state": "SYNC_FAIL"}, "sogo-connector": {"quality": "experimental", "status": "unofficial", "name": "sogo-connector", "description": {"en": "SOGO connector overlay"}, "homepage": "https://cgit.gentoo.org/repo/user/sogo-connector.git/", "owner": [{"type": "person", "email": "gentoo@posteo.de", "name": "Fabian K\u00f6ster"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/user/sogo-connector.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/repo/user/sogo-connector.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/user/sogo-connector.git"}], "feed": ["https://cgit.gentoo.org/repo/user/sogo-connector.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-04-02 11:14:25 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 1}, "soltys": {"quality": "experimental", "status": "unofficial", "name": "soltys", "description": {"en": "tools usefull on CTFs and things that aren't in the portage tristelune"}, "homepage": "https://github.com/soltysek/soltys-overlay", "owner": [{"type": "person", "email": "bgo@soltys.info", "name": "Krzysztof Koro\u015bcik"}], "source": [{"type": "git", "uri": "https://github.com/soltysek/soltys-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/soltysek/soltys-overlay.git"}], "feed": ["https://github.com/soltysek/soltys-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-09-14 10:47:46 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 31}, "sorinp": {"quality": "experimental", "status": "unofficial", "name": "sorinp", "description": {"en": "A collection of ebuilds that are missing or outdated or incomplete on the Gentoo portage official repository.."}, "homepage": "https://github.com/psihozefir/sorinp-gentoo-overlay", "owner": [{"type": "person", "email": "sorin.panca@gmail.com", "name": "Sorin Panca"}], "source": [{"type": "git", "uri": "https://github.com/psihozefir/sorinp-gentoo-overlay"}], "x-state": "GOOD", "x-timestamp": "2016-11-20 14:11:02 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "sorrow": {"quality": "experimental", "status": "unofficial", "name": "sorrow", "description": {"en": "Ebuilds for some wayland-related software and some other stuff"}, "homepage": "https://gitlab.com/eternal-sorrow/gentoo-local", "owner": [{"type": "person", "email": "sergamena@inbox.ru", "name": "sorrow"}], "source": [{"type": "git", "uri": "https://gitlab.com/eternal-sorrow/gentoo-local.git"}, {"type": "git", "uri": "git+ssh://git@gitlab.com:eternal-sorrow/gentoo-local.git"}], "feed": ["https://gitlab.com/eternal-sorrow/gentoo-local/commits/master?format=atom"], "x-state": "GOOD", "x-timestamp": "2020-10-22 13:50:44 +1000\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 17}, "sortsmill": {"quality": "experimental", "status": "unofficial", "name": "sortsmill", "description": {"en": "Personal overlay of Barry Schwartz for font projects"}, "homepage": "https://bitbucket.org/sortsmill/sortsmill-gentoo-overlay", "owner": [{"type": "person", "email": "chemoelectric@chemoelectric.org", "name": "Barry Schwartz"}], "source": [{"type": "mercurial", "uri": "https://bitbucket.org/sortsmill/sortsmill-gentoo-overlay"}, {"type": "mercurial", "uri": "ssh://hg@bitbucket.org/sortsmill/sortsmill-gentoo-overlay"}], "feed": ["https://bitbucket.org/sortsmill/sortsmill-gentoo-overlay/atom", "https://bitbucket.org/sortsmill/sortsmill-gentoo-overlay/rss"], "x-timestamp-command": ["hg", "log", "-l", "1", "--template={date|isodatesec}"], "x-state": "SYNC_FAIL"}, "spikyatlinux": {"quality": "experimental", "status": "unofficial", "name": "spikyatlinux", "description": {"en": "Here are some of my own or modified ebuilds. Also some of them I've found in the web."}, "homepage": "https://github.com/spikyatlinux/ebuilds_for_gentoo", "owner": [{"type": "person", "email": "spikyatlinux@gmail.com", "name": "SpikyAtLinux"}], "source": [{"type": "git", "uri": "https://github.com/spikyatlinux/ebuilds_for_gentoo.git"}], "x-state": "GOOD", "x-timestamp": "2020-10-21 20:39:57 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 34}, "sping": {"quality": "experimental", "status": "official", "name": "sping", "description": {"en": "Overlay of Gentoo developer Sebastian Pipping; for issues, please open tickets at GitHub"}, "homepage": "https://github.com/hartwork/gentoo-overlay-sping", "owner": [{"type": "person", "email": "sping@gentoo.org", "name": "Sebastian Pipping"}], "source": [{"type": "git", "uri": "https://github.com/hartwork/gentoo-overlay-sping.git"}, {"type": "git", "uri": "git://github.com/hartwork/gentoo-overlay-sping.git"}, {"type": "git", "uri": "git@github.com:hartwork/gentoo-overlay-sping.git"}], "feed": ["https://github.com/hartwork/gentoo-overlay-sping/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2017-03-18 17:47:33 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 3}, "squeezebox": {"quality": "experimental", "status": "unofficial", "name": "squeezebox", "description": {"en": "Packages for the Squeezebox network audio player from Logitech"}, "homepage": "https://cgit.gentoo.org/user/squeezebox.git/", "owner": [{"type": "person", "email": "stuart@hickinbottom.com", "name": "Stuart Hickinbottom"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/squeezebox.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/squeezebox.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/squeezebox.git"}], "feed": ["https://cgit.gentoo.org/user/squeezebox.git/atom/"], "x-timestamp-command": ["git", "log", "--format=%ci", "-1"], "x-openpgp-signature-command": ["git", "show", "-q", "--pretty=format:%G?", "HEAD"], "x-state": "SYNC_FAIL"}, "src_prepare-overlay": {"quality": "experimental", "status": "unofficial", "name": "src_prepare-overlay", "description": {"en": "src_prepare group's Gentoo overlay"}, "homepage": "https://gitlab.com/src_prepare/src_prepare-overlay.git", "owner": [{"type": "person", "name": "XGQT", "email": "xgqt@protonmail.com"}], "source": [{"type": "git", "uri": "https://gitlab.com/src_prepare/src_prepare-overlay.git"}, {"type": "git", "uri": "git+ssh://git@gitlab.com/src_prepare/src_prepare-overlay.git"}], "feed": ["https://gitlab.com/src_prepare/src_prepare-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-23 16:21:29 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 186}, "ssnb": {"quality": "experimental", "status": "unofficial", "name": "ssnb", "description": {"en": "Gentoo repository made by ssnb"}, "homepage": "https://cgit.gentoo.org/repo/user/ssnb.git/", "owner": [{"type": "person", "email": "samuelbernardo.mail@gmail.com", "name": "Samuel Bernardo"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/user/ssnb.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/repo/user/ssnb"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/user/ssnb.git"}], "feed": ["https://cgit.gentoo.org/repo/user/ssnb.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-10-18 21:07:18 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 365}, "sspreitz": {"quality": "experimental", "status": "unofficial", "name": "sspreitz", "description": {"en": "My Gentoo repository and ebuilds"}, "homepage": "https://github.com/sspreitzer/gentoo-repo", "owner": [{"type": "person", "email": "sspreitz@redhat.com", "name": "Sascha Spreitzer"}], "source": [{"type": "git", "uri": "https://github.com/sspreitzer/gentoo-repo.git"}, {"type": "git", "uri": "git+ssh://git@github.com/sspreitzer/gentoo-repo.git"}, {"type": "git", "uri": "git@github.com:sspreitzer/gentoo-repo.git"}], "feed": ["https://github.com/sspreitzer/gentoo-repo/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-09-24 10:35:30 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 24}, "steam-overlay": {"quality": "experimental", "status": "unofficial", "name": "steam-overlay", "description": {"en": "Gentoo overlay for Valve's Steam client and Steam-based games"}, "homepage": "https://github.com/anyc/steam-overlay", "owner": [{"type": "person", "email": "dev@kicherer.org", "name": "Mario Kicherer"}], "source": [{"type": "git", "uri": "https://github.com/anyc/steam-overlay.git"}, {"type": "git", "uri": "git://github.com/anyc/steam-overlay.git"}, {"type": "git", "uri": "git@github.com:anyc/steam-overlay.git"}], "feed": ["https://github.com/anyc/steam-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-11 12:34:45 +0100\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 12}, "stefantalpalaru": {"quality": "experimental", "status": "unofficial", "name": "stefantalpalaru", "description": {"en": "Gentoo overlay with ebuilds by Stefan Talpalaru that are not in the tree"}, "homepage": "https://github.com/stefantalpalaru/gentoo-overlay", "owner": [{"type": "person", "email": "stefantalpalaru@yahoo.com", "name": "Stefan Talpalaru"}], "source": [{"type": "git", "uri": "https://github.com/stefantalpalaru/gentoo-overlay.git"}, {"type": "git", "uri": "git://github.com/stefantalpalaru/gentoo-overlay.git"}, {"type": "git", "uri": "git@github.com:stefantalpalaru/gentoo-overlay.git"}], "feed": ["https://github.com/stefantalpalaru/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-18 21:05:01 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 967}, "stha09": {"quality": "experimental", "status": "unofficial", "name": "stha09", "description": {"en": "stha09's personal overlay"}, "homepage": "https://github.com/stha09/gpo-stha09", "owner": [{"type": "person", "email": "sultan@gentoo.org", "name": "Stephan Hartmann"}], "source": [{"type": "git", "uri": "https://github.com/stha09/gpo-stha09.git"}, {"type": "git", "uri": "git://github.com:stha09/gpo-stha09.git"}, {"type": "git", "uri": "git@github.com:stha09/gpo-stha09.git"}], "feed": ["https://github.com/stha09/gpo-stha09/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-17 10:33:55 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 7}, "stowe-verlay": {"quality": "experimental", "status": "unofficial", "name": "stowe-verlay", "description": {"en": "Few things that have either broken elsewhere or fallen unmaintained, such as winexe, a source-based version of logitech media server, a patched version of dansguardian"}, "homepage": "https://github.com/mwstowe/stowe-verlay", "owner": [{"type": "person", "email": "mstowe@chicago.us.mensa.org", "name": "Michael Stowe"}], "source": [{"type": "git", "uri": "https://github.com/mwstowe/stowe-verlay.git"}], "feed": ["https://github.com/mwstowe/stowe-verlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-19 18:49:47 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 48}, "strohel": {"quality": "experimental", "status": "unofficial", "name": "strohel", "description": {"en": "strohel's overlay"}, "homepage": "https://github.com/strohel/strohel-overlay", "owner": [{"type": "person", "email": "matej@laitl.cz", "name": "Mat\u011bj Laitl"}], "source": [{"type": "git", "uri": "https://strohel@github.com/strohel/strohel-overlay.git"}, {"type": "git", "uri": "git://github.com/strohel/strohel-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com:strohel/strohel-overlay.git"}], "feed": ["https://github.com/strohel/strohel-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-02-15 11:27:29 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "stuff": {"quality": "experimental", "status": "unofficial", "name": "stuff", "description": {"en": "stuff"}, "homepage": "https://github.com/istitov/stuff", "owner": [{"type": "person", "email": "iohann.s.titov@gmail.com"}], "source": [{"type": "git", "uri": "https://github.com/istitov/stuff.git"}], "feed": ["https://github.com/istitov/stuff/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-15 10:58:49 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 286}, "sublime-text": {"quality": "experimental", "status": "unofficial", "name": "sublime-text", "description": {"en": "Collection of ebuilds to install Sublime Text 2 or Sublime Text 3"}, "homepage": "https://github.com/DamnWidget/sublime-text", "owner": [{"type": "person", "email": "oscar.campos@member.fsf.org", "name": "Oscar Campos"}], "source": [{"type": "git", "uri": "https://github.com/DamnWidget/sublime-text.git"}, {"type": "git", "uri": "git://github.com/DamnWidget/sublime-text.git"}, {"type": "git", "uri": "git@github.com:DamnWidget/sublime-text.git"}], "feed": ["https://github.com/DamnWidget/sublime-text/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2019-04-08 13:16:10 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 19}, "superposition": {"quality": "experimental", "status": "unofficial", "name": "superposition", "description": {"en": "Phil's overlay"}, "homepage": "https://cgit.gentoo.org/repo/user/superposition.git/", "owner": [{"type": "person", "email": "Phil_miess@yahoo.com", "name": "Philip Miess"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/user/superposition.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/repo/user/superposition.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/user/superposition.git"}], "feed": ["https://cgit.gentoo.org/repo/user/superposition.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-04-24 06:36:55 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 61}, "swegener": {"quality": "experimental", "status": "official", "name": "swegener", "description": {"en": "This overlay contains some experimental stuff, but mostly\n    stuff I quickly wrote an ebuild for or grabed it from bugzilla and did not\n    have the time to commit it to the official tree or do not consider it ready\n    for it."}, "homepage": "https://dev.gentoo.org/~swegener/", "owner": [{"type": "person", "email": "swegener@gentoo.org"}], "source": [{"type": "rsync", "uri": "rsync://rsync.gentoo.stealer.net/swegener-overlay/"}], "x-state": "GOOD", "x-timestamp": "2018-11-19 10:32:42.000000000 +0000\n", "x-masters": ["gentoo"], "x-ebuild-count": 33}, "tabinol": {"quality": "experimental", "status": "unofficial", "name": "tabinol", "description": {"en": "Tabinol personal overlay with no special focus"}, "homepage": "https://github.com/Tabinol/tabinol-overlay", "owner": [{"type": "person", "email": "mblanchet@fastmail.com", "name": "Michel Blanchet"}], "source": [{"type": "git", "uri": "https://github.com/Tabinol/tabinol-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/Tabinol/tabinol-overlay.git"}], "feed": ["https://github.com/Tabinol/tabinol-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2019-02-25 22:30:56 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 6}, "tamiko": {"quality": "experimental", "status": "unofficial", "name": "tamiko", "description": {"en": "Developer overlay"}, "homepage": "https://cgit.gentoo.org/repo/dev/tamiko.git/", "owner": [{"type": "person", "email": "tamiko@gentoo.org", "name": "Matthias Maier"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/dev/tamiko.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/repo/dev/tamiko.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/dev/tamiko.git"}], "feed": ["https://cgit.gentoo.org/repo/dev/tamiko.git/atom/"], "x-timestamp-command": ["git", "log", "--format=%ci", "-1"], "x-openpgp-signature-command": ["git", "show", "-q", "--pretty=format:%G?", "HEAD"], "x-state": "SYNC_FAIL"}, "tante": {"quality": "experimental", "status": "unofficial", "name": "tante", "description": {"en": "Overlay of tante"}, "homepage": "https://github.com/tante/overlay", "owner": [{"type": "person", "email": "tante@tante.cc"}], "source": [{"type": "git", "uri": "https://github.com/tante/overlay.git"}], "x-state": "GOOD", "x-timestamp": "2017-02-26 14:13:35 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "tarantool": {"quality": "experimental", "status": "unofficial", "name": "tarantool", "description": {"en": "Tarantool Gentoo Overlay"}, "homepage": "https://github.com/tarantool/gentoo-overlay", "owner": [{"type": "person", "email": "totktonada.ru@gmail.com", "name": "Alexander Turenko"}], "source": [{"type": "git", "uri": "https://github.com/tarantool/gentoo-overlay.git"}, {"type": "git", "uri": "git://github.com/tarantool/gentoo-overlay.git"}, {"type": "git", "uri": "git@github.com:tarantool/gentoo-overlay.git"}], "feed": ["https://github.com/tarantool/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-09-14 10:50:49 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 49}, "tastytea": {"quality": "experimental", "status": "unofficial", "name": "tastytea", "description": {"en": "Overlay of tastytea"}, "homepage": "https://schlomp.space/tastytea/overlay", "owner": [{"type": "person", "email": "gentoo@tastytea.de", "name": "tastytea"}], "source": [{"type": "git", "uri": "https://schlomp.space/tastytea/overlay.git"}], "x-state": "GOOD", "x-timestamp": "2020-10-23 16:29:15 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 50}, "telans": {"quality": "experimental", "status": "unofficial", "name": "telans", "description": {"en": "Overlay from telans - gaming/misc"}, "homepage": "https://github.com/telans/EBUILDS", "owner": [{"type": "person", "email": "telans@posteo.de", "name": "telans"}], "source": [{"type": "git", "uri": "https://github.com/telans/EBUILDS.git"}], "feed": ["https://github.com/telans/EBUILDS/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-23 22:16:00 +1300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 28}, "tengine-overlay": {"quality": "experimental", "status": "unofficial", "name": "tengine-overlay", "description": {"en": "Tengine overlay for Gentoo Linux"}, "homepage": "https://github.com/damex/tengine-overlay", "owner": [{"type": "person", "email": "damex.pp@gmail.com", "name": "Roman Kuzmitsky"}], "source": [{"type": "git", "uri": "https://github.com/damex/tengine-overlay.git"}], "feed": ["https://github.com/damex/tengine-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2017-11-29 08:54:54 -0800\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 6}, "tf201": {"quality": "experimental", "status": "unofficial", "name": "tf201", "description": {"en": "TF201 (Asus Transformer Prime) overlay for Gentoo"}, "homepage": "https://github.com/Tux1c/tf201-overlay", "owner": [{"type": "person", "email": "tux1cc@gmail.com", "name": "Yan A."}], "source": [{"type": "git", "uri": "https://github.com/Tux1c/tf201-overlay"}], "x-state": "GOOD", "x-timestamp": "2015-04-11 16:03:12 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "tgbugs-overlay": {"quality": "experimental", "status": "unofficial", "name": "tgbugs-overlay", "description": {"en": "tgbugs portage overlay for custom ebuilds"}, "homepage": "https://github.com/tgbugs/tgbugs-overlay", "owner": [{"type": "person", "email": "tgbugs@gmail.com", "name": "Tom Gillespie"}], "source": [{"type": "git", "uri": "https://github.com/tgbugs/tgbugs-overlay.git"}, {"type": "git", "uri": "git://github.com/tgbugs/tgbugs-overlay.git"}, {"type": "git", "uri": "git@github.com:tgbugs/tgbugs-overlay.git"}], "feed": ["https://github.com/tgbugs/tgbugs-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-02 13:43:40 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 348}, "thabairne": {"quality": "experimental", "status": "unofficial", "name": "thabairne", "description": {"en": "ntnn's Overlay"}, "homepage": "https://github.com/ntnn/gentoo-thabairne", "owner": [{"type": "person", "email": "nelo@wallus.de", "name": "Nelo-Thara Wallus"}], "source": [{"type": "git", "uri": "https://github.com/ntnn/gentoo-thabairne.git"}], "feed": ["https://github.com/ntnn/gentoo-thabairne/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-22 20:38:59 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 15}, "thegreatmcpain": {"quality": "experimental", "status": "unofficial", "name": "thegreatmcpain", "description": {"en": "TheGreatMcPain's personal ebuild overlay"}, "homepage": "https://gitlab.com/TheGreatMcPain/thegreatmcpain-overlay", "owner": [{"type": "person", "email": "sixsupersonic@gmail.com", "name": "James McClain"}], "source": [{"type": "git", "uri": "https://gitlab.com/TheGreatMcPain/thegreatmcpain-overlay.git"}, {"type": "git", "uri": "git@gitlab.com:TheGreatMcPain/thegreatmcpain-overlay.git"}], "feed": ["https://gitlab.com/TheGreatMcPain/thegreatmcpain-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-21 21:46:14 -0500\n", "x-openpgp-signed": "E", "x-masters": ["gentoo", "bobwya"], "x-ebuild-count": 96}, "timboudreau": {"quality": "experimental", "status": "unofficial", "name": "timboudreau", "description": {"en": "Tim Boudreau's Overlay"}, "homepage": "https://github.com/timboudreau/gentoo", "owner": [{"type": "person", "email": "tim@timboudreau.com", "name": "Tim Boudreau"}], "source": [{"type": "git", "uri": "https://github.com/timboudreau/gentoo.git"}, {"type": "git", "uri": "git://github.com/timboudreau/gentoo.git"}, {"type": "git", "uri": "git@github.com:timboudreau/gentoo.git"}], "feed": ["https://github.com/timboudreau/gentoo/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2020-07-18 13:58:40 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 30}, "tmacedo": {"quality": "experimental", "status": "unofficial", "name": "tmacedo", "description": {"en": "User Overlay"}, "homepage": "https://github.com/tmacedo/portage", "owner": [{"type": "person", "email": "tftfmacedo@gmail.com", "name": "Tiago Macedo"}], "source": [{"type": "git", "uri": "git://github.com/tmacedo/portage.git"}], "feed": ["https://github.com/tmacedo/portage/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-08-23 16:37:57 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 24}, "tocaro": {"quality": "experimental", "status": "unofficial", "name": "tocaro", "description": {"en": "tocaro personnal o.g.o"}, "homepage": "https://cgit.gentoo.org/user/tocaro.git/", "owner": [{"type": "person", "email": "tocaro@thocar.org", "name": "Thomas Carri\u00e9"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/tocaro.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/tocaro.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/tocaro.git"}], "feed": ["https://cgit.gentoo.org/user/tocaro.git/atom/"], "x-timestamp-command": ["git", "log", "--format=%ci", "-1"], "x-openpgp-signature-command": ["git", "show", "-q", "--pretty=format:%G?", "HEAD"], "x-state": "SYNC_FAIL"}, "toniz4-overlay": {"quality": "experimental", "status": "unofficial", "name": "toniz4-overlay", "description": {"en": "Useful packages for your person use"}, "owner": [{"type": "person", "email": "cassioavila@yandex.com", "name": "C\u00e1ssio Ribeiro Alves de \u00c1vila"}], "source": [{"type": "git", "uri": "https://github.com/toniz4/toniz4-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2020-10-19 22:10:29 -0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "toolchain": {"quality": "experimental", "status": "official", "name": "toolchain", "description": {"en": "Toolchain ebuilds that are unsuitable for the tree. Snapshots,\n    unstable versions, etc..."}, "homepage": "https://cgit.gentoo.org/proj/toolchain.git/", "owner": [{"type": "project", "email": "toolchain@gentoo.org"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/toolchain.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/toolchain.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/toolchain.git"}], "feed": ["https://cgit.gentoo.org/proj/toolchain.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-02-22 09:39:04 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 0}, "torbrowser": {"quality": "experimental", "status": "unofficial", "name": "torbrowser", "description": {"en": "Tor Browser related ebuilds"}, "homepage": "https://github.com/MeisterP/torbrowser-overlay", "owner": [{"type": "person", "email": "poncho@spahan.ch", "name": "MeisterP"}], "source": [{"type": "git", "uri": "https://github.com/MeisterP/torbrowser-overlay.git"}, {"type": "git", "uri": "git://github.com/MeisterP/torbrowser-overlay.git"}, {"type": "git", "uri": "git@github.com:MeisterP/torbrowser-overlay.git"}], "feed": ["https://github.com/MeisterP/torbrowser-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-20 21:16:22 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 7}, "tranquility": {"quality": "experimental", "status": "official", "name": "tranquility", "description": {"en": "Developer overlay"}, "homepage": "https://gitweb.gentoo.org/repo/dev/tranquility.git/", "owner": [{"type": "person", "email": "tranquility@gentoo.org", "name": "Ole Reifschneider"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/dev/tranquility.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/repo/dev/tranquility.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/dev/tranquility.git"}], "feed": ["https://gitweb.gentoo.org/repo/dev/tranquility.git/atom/"], "x-state": "GOOD", "x-timestamp": "2016-10-13 10:48:40 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "triquetra": {"quality": "experimental", "status": "unofficial", "name": "triquetra", "description": {"en": "User overlay"}, "homepage": "https://cgit.gentoo.org/user/triquetra.git/", "owner": [{"type": "person", "email": "david@triquetradevelopment.com", "name": "David Crandall"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/triquetra.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/triquetra.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/triquetra.git"}], "feed": ["https://cgit.gentoo.org/user/triquetra.git/atom/"], "x-timestamp-command": ["git", "log", "--format=%ci", "-1"], "x-openpgp-signature-command": ["git", "show", "-q", "--pretty=format:%G?", "HEAD"], "x-state": "SYNC_FAIL"}, "trolltoo": {"quality": "experimental", "status": "unofficial", "name": "trolltoo", "description": {"en": "An ebuild overlay for Gentoo."}, "homepage": "https://github.com/dallenwilson/trolltoo", "owner": [{"type": "person", "email": "dallen.wilson@gmail.com", "name": "Dallen Wilson"}], "source": [{"type": "git", "uri": "https://github.com/dallenwilson/trolltoo.git"}, {"type": "git", "uri": "git+ssh://git@github.com/dallenwilson/trolltoo.git"}], "feed": ["https://github.com/dallenwilson/trolltoo/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-08-25 09:05:29 -0600\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 34}, "tryton": {"quality": "experimental", "status": "unofficial", "name": "tryton", "description": {"en": "Tryton"}, "homepage": "http://www.tryton.org/", "owner": [{"type": "person", "email": "cedk@gentoo.org"}], "source": [{"type": "mercurial", "uri": "https://hg.tryton.org/tryton-overlay"}], "x-state": "GOOD", "x-timestamp": "2020-10-18 21:44:56 +0200", "x-masters": ["gentoo"], "x-ebuild-count": 612}, "twister": {"quality": "experimental", "status": "unofficial", "name": "twister", "description": {"en": "Unoffical gentoo overlay for twister"}, "homepage": "https://github.com/ddorian1/gentoo-twister-overlay", "owner": [{"type": "person", "email": "mail@jschwab.org", "name": "Johannes Schwab"}], "source": [{"type": "git", "uri": "https://github.com/ddorian1/gentoo-twister-overlay.git"}, {"type": "git", "uri": "git://github.com/ddorian1/gentoo-twister-overlay.git"}, {"type": "git", "uri": "git@github.com:ddorian1/gentoo-twister-overlay.git"}], "feed": ["https://github.com/ddorian1/gentoo-twister-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2018-01-06 12:40:31 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "twitch153": {"quality": "experimental", "status": "unofficial", "name": "twitch153", "description": {"en": "Experimental ebuilds"}, "homepage": "https://github.com/twitch153/ebuilds", "owner": [{"type": "person", "email": "twitch153@gentoo.org", "name": "Devan Franchini"}], "source": [{"type": "git", "uri": "git://github.com/twitch153/ebuilds.git"}], "feed": ["https://github.com/twitch153/ebuilds/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2016-12-27 15:19:28 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 3}, "ulm": {"quality": "experimental", "status": "official", "name": "ulm", "description": {"en": "Developer overlay"}, "homepage": "https://cgit.gentoo.org/repo/dev/ulm.git/", "owner": [{"type": "person", "email": "ulm@gentoo.org", "name": "Ulrich M\u00fcller"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/dev/ulm.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/repo/dev/ulm.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/dev/ulm.git"}], "feed": ["https://cgit.gentoo.org/repo/dev/ulm.git/atom/"], "x-timestamp-command": ["git", "log", "--format=%ci", "-1"], "x-openpgp-signature-command": ["git", "show", "-q", "--pretty=format:%G?", "HEAD"], "x-state": "SYNC_FAIL"}, "ultrabug": {"quality": "experimental", "status": "official", "name": "ultrabug", "description": {"en": "Developer Overlay"}, "homepage": "https://cgit.gentoo.org/dev/ultrabug.git/", "owner": [{"type": "person", "email": "ultrabug@gentoo.org", "name": "Alexys Jacob"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/ultrabug.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/ultrabug.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/ultrabug.git"}], "feed": ["https://cgit.gentoo.org/dev/ultrabug.git/atom/"], "x-timestamp-command": ["git", "log", "--format=%ci", "-1"], "x-openpgp-signature-command": ["git", "show", "-q", "--pretty=format:%G?", "HEAD"], "x-state": "SYNC_FAIL"}, "unity-gentoo": {"quality": "experimental", "status": "unofficial", "name": "unity-gentoo", "description": {"en": "Overlay to install the Unity desktop"}, "homepage": "https://github.com/shiznix/unity-gentoo", "owner": [{"type": "person", "email": "rickfharris@yahoo.com.au", "name": "Rick Harris"}], "source": [{"type": "git", "uri": "https://github.com/shiznix/unity-gentoo"}, {"type": "git", "uri": "git://github.com/shiznix/unity-gentoo.git"}], "feed": ["https://github.com/feeds/shiznix/commits/unity-gentoo/master"], "x-state": "GOOD", "x-timestamp": "2020-10-22 02:42:09 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 162}, "usenet-overlay": {"quality": "experimental", "status": "unofficial", "name": "usenet-overlay", "description": {"en": "Personal Overlay for Lidarr, Radarr and Sonarr "}, "homepage": "https://github.com/xartin/gentoo-overlay", "owner": [{"type": "person", "email": "mcrawford@eliteitminds.com", "name": "Michael Crawford"}], "source": [{"type": "git", "uri": "https://github.com/xartin/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/xartin/gentoo-overlay.git"}], "feed": ["https://github.com/xartin/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-07-06 21:14:05 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 18}, "vaca": {"quality": "experimental", "status": "unofficial", "name": "vaca", "description": {"en": "Just another personal Gentoo overlay"}, "homepage": "https://github.com/hashashin/gentoo-vaca-overlay", "owner": [{"type": "person", "email": "gentoo.power@gmail.com", "name": "hashashin"}], "source": [{"type": "git", "uri": "https://github.com/hashashin/gentoo-vaca-overlay"}, {"type": "git", "uri": "git://github.com/hashashin/gentoo-vaca-overlay.git"}], "feed": ["https://github.com/hashashin/gentoo-vaca-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2018-08-19 13:48:20 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 32}, "vampire": {"quality": "experimental", "status": "unofficial", "name": "vampire", "description": {"en": "A personal repository. So much bleeding edge, you would bet a vampire was involved."}, "homepage": "https://github.com/TheCrueltySage/vampire-overlay", "owner": [{"type": "person", "email": "miltenfiremage@gmail.com", "name": "TheCrueltySage"}], "source": [{"type": "git", "uri": "https://github.com/TheCrueltySage/vampire-overlay.git"}, {"type": "git", "uri": "git://github.com/TheCrueltySage/vampire-overlay.git"}], "feed": ["https://github.com/TheCrueltySage/vampire-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-06-20 15:41:07 +0700\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 22}, "vapoursynth": {"quality": "experimental", "status": "unofficial", "name": "vapoursynth", "description": {"en": "Unofficial repository with all vapoursynth related ebuilds"}, "homepage": "https://github.com/4re/vapoursynth-portage", "owner": [{"type": "person", "email": "surukko@gmail.com"}], "source": [{"type": "git", "uri": "https://github.com/4re/vapoursynth-portage.git"}], "x-state": "GOOD", "x-timestamp": "2020-08-24 13:02:09 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 313}, "vayerx": {"quality": "experimental", "status": "unofficial", "name": "vayerx", "description": {"en": "Personal overlay of Vasiliy Yeremeyev"}, "homepage": "https://github.com/vayerx/vayerx-gentoo/", "owner": [{"type": "person", "email": "vayerx@gmail.com", "name": "Vasiliy Yeremeyev"}], "source": [{"type": "git", "uri": "https://github.com/vayerx/vayerx-gentoo.git"}, {"type": "git", "uri": "git://github.com/vayerx/vayerx-gentoo.git"}, {"type": "git", "uri": "git@github.com:vayerx/vayerx-gentoo.git"}], "feed": ["https://github.com/vayerx/vayerx-gentoo/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2020-06-25 19:26:34 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 94}, "vdr-devel": {"quality": "experimental", "status": "official", "name": "vdr-devel", "description": {"en": "Overlay for VDR, that contains ebuilds for development version\n    of VDR, and specific plugins for that version."}, "homepage": "https://cgit.gentoo.org/proj/vdr/devel.git/", "owner": [{"type": "project", "email": "vdr@gentoo.org"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/vdr/devel.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/vdr/devel.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/vdr/devel.git"}], "feed": ["https://cgit.gentoo.org/proj/vdr/devel.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-08-27 20:54:04 +0200\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 37}, "vifino-overlay": {"quality": "experimental", "status": "unofficial", "name": "vifino-overlay", "description": {"en": "vifino's personal overlay"}, "homepage": "https://github.com/vifino/vifino-overlay", "owner": [{"type": "person", "email": "vifino@tty.sh", "name": "Adrian \"vifino\" Pistol"}], "source": [{"type": "git", "uri": "https://github.com/vifino/vifino-overlay.git"}, {"type": "git", "uri": "git://github.com/vifino/vifino-overlay.git"}, {"type": "git", "uri": "git@github.com:vifino/vifino-overlay.git"}], "feed": ["https://github.com/vifino/vifino-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-09-14 17:17:25 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 51}, "vklimovs": {"quality": "experimental", "status": "unofficial", "name": "vklimovs", "description": {"en": "vklimovs' personal portage overlay"}, "homepage": "https://github.com/vklimovs/portage-overlay", "owner": [{"type": "person", "email": "vklimovs@gmail.com", "name": "Vjaceslavs Klimovs"}], "source": [{"type": "git", "uri": "https://github.com/vklimovs/portage-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/vklimovs/portage-overlay.git"}], "feed": ["https://github.com/vklimovs/portage-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-18 22:02:49 -0700\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 20}, "vmacs": {"quality": "experimental", "status": "unofficial", "name": "vmacs", "description": {"en": "VMACS Personal Gentoo Overlay"}, "homepage": "https://cgit.gentoo.org/user/vmacs.git/", "owner": [{"type": "person", "email": "vance.m.allen@gmail.com", "name": "Vance M. Allen"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/vmacs.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/vmacs.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/vmacs.git"}], "feed": ["https://cgit.gentoo.org/user/vmacs.git/atom/"], "x-timestamp-command": ["git", "log", "--format=%ci", "-1"], "x-openpgp-signature-command": ["git", "show", "-q", "--pretty=format:%G?", "HEAD"], "x-state": "SYNC_FAIL"}, "vortex": {"quality": "experimental", "status": "unofficial", "name": "vortex", "description": {"en": "Personal overlay"}, "homepage": "https://github.com/nE0sIghT/vortex-overlay", "owner": [{"type": "person", "email": "ykonotopov@gnome.org", "name": "Yuri 'nE0sIghT' Konotopov"}], "source": [{"type": "git", "uri": "https://github.com/nE0sIghT/vortex-overlay.git"}, {"type": "git", "uri": "git://github.com/nE0sIghT/vortex-overlay.git"}], "feed": ["https://github.com/nE0sIghT/vortex-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-06-24 19:41:04 +0400\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 75}, "vowstar": {"quality": "experimental", "status": "unofficial", "name": "vowstar", "description": {"en": "Ebuilds from vowstar's git"}, "homepage": "https://github.com/vowstar/vowstar-overlay", "owner": [{"type": "person", "email": "vowstar@gmail.com"}], "source": [{"type": "git", "uri": "https://github.com/vowstar/vowstar-overlay.git"}, {"type": "git", "uri": "git://github.com/vowstar/vowstar-overlay.git"}, {"type": "git", "uri": "git@github.com:vowstar/vowstar-overlay.git"}], "feed": ["https://github.com/vowstar/vowstar-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-20 15:00:56 +0800\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 59}, "voyageur": {"quality": "experimental", "status": "official", "name": "voyageur", "description": {"en": "Voyageur's random ebuilds stuff"}, "homepage": "https://cafarelli.fr/cgi-bin/cgit.cgi/voyageur-overlay/", "owner": [{"type": "person", "email": "voyageur@gentoo.org"}], "source": [{"type": "git", "uri": "https://cafarelli.fr/git/voyageur-overlay/"}], "feed": ["https://cafarelli.fr/cgi-bin/cgit.cgi/voyageur-overlay/atom"], "x-state": "GOOD", "x-timestamp": "2020-09-28 12:38:27 +0200\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 33}, "waebbl": {"quality": "experimental", "status": "unofficial", "name": "waebbl", "description": {"en": "waebbl's overlay"}, "homepage": "https://github.com/waebbl/waebbl-gentoo", "owner": [{"type": "person", "email": "waebbl@gmail.com", "name": "Bernd Waibel"}], "source": [{"type": "git", "uri": "https://github.com/waebbl/waebbl-gentoo.git"}, {"type": "git", "uri": "git+ssh://git@github.com/waebbl/waebbl-gentoo.git"}], "feed": ["https://github.com/waebbl/waebbl-gentoo/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-22 07:14:41 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo", "raiagent"], "x-ebuild-count": 71}, "wayland-desktop": {"quality": "experimental", "status": "unofficial", "name": "wayland-desktop", "description": {"en": "gentoo overlay for wayland related ebuilds"}, "homepage": "https://github.com/epsilon-0/wayland-desktop", "owner": [{"type": "person", "email": "gentoo@aisha.cc", "name": "Aisha Tammy"}], "source": [{"type": "git", "uri": "https://github.com/epsilon-0/wayland-desktop.git"}, {"type": "git", "uri": "git+ssh://git@github.com/epsilon-0/wayland-desktop.git"}], "x-state": "GOOD", "x-timestamp": "2020-10-06 19:45:10 -0400\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 17}, "wbrana": {"quality": "experimental", "status": "unofficial", "name": "wbrana", "description": {"en": "wbrana's overlay"}, "homepage": "https://cgit.gentoo.org/user/wbrana.git/", "owner": [{"type": "person", "email": "wbrana@gmail.com", "name": "William Brana"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/wbrana.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/wbrana.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/wbrana.git"}], "feed": ["https://cgit.gentoo.org/user/wbrana.git/atom/"], "x-state": "GOOD", "x-timestamp": "2015-06-28 16:56:01 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "wdzierzan": {"quality": "experimental", "status": "unofficial", "name": "wdzierzan", "description": {"en": "Stuff I'd rather `emerge' than `stow'"}, "homepage": "https://cgit.gentoo.org/user/wdzierzan.git/", "owner": [{"type": "person", "email": "wojciech.dzierzanowski@gmail.com", "name": "Wojciech Dzier\u017canowski"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/wdzierzan.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/wdzierzan.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/wdzierzan.git"}], "feed": ["https://cgit.gentoo.org/user/wdzierzan.git/atom/"], "x-timestamp-command": ["git", "log", "--format=%ci", "-1"], "x-openpgp-signature-command": ["git", "show", "-q", "--pretty=format:%G?", "HEAD"], "x-state": "SYNC_FAIL"}, "webos": {"quality": "experimental", "status": "unofficial", "name": "webos", "description": {"en": "Ported Open WebOS components and libraries"}, "homepage": "https://github.com/feniksa/webos-overlay", "owner": [{"type": "person", "email": "feniksa@rambler.ru", "name": "Maksym Sditanov"}], "source": [{"type": "git", "uri": "https://github.com/feniksa/webos-overlay.git"}, {"type": "git", "uri": "git://github.com:feniksa/webos-overlay.git"}, {"type": "git", "uri": "git@github.com:feniksa/webos-overlay.git"}], "feed": ["https://github.com/feniksa/webos-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-02-11 02:21:46 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 49}, "weuxel": {"quality": "experimental", "status": "unofficial", "name": "weuxel", "description": {"en": "Weuxels Personal Overlay"}, "homepage": "https://github.com/Weuxel/portage-weuxel", "owner": [{"type": "person", "email": "norman@smash-net.org", "name": "Norman Rie\u00df"}], "source": [{"type": "git", "uri": "https://github.com/Weuxel/portage-weuxel.git"}, {"type": "git", "uri": "git://github.com/Weuxel/portage-weuxel.git"}, {"type": "git", "uri": "git@github.com:Weuxel/portage-weuxel.git"}], "feed": ["https://github.com/Weuxel/portage-weuxel/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2018-12-18 10:17:01 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "what4-java": {"quality": "experimental", "status": "unofficial", "name": "what4-java", "description": {"en": "Incubator for dev-java updates that the Gentoo Java team has no time for"}, "homepage": "https://github.com/kwhat/gentoo-what4-java-overlay", "owner": [{"type": "person", "email": "alex@1stleg.com", "name": "Alex Barker"}], "source": [{"type": "git", "uri": "https://github.com/kwhat/gentoo-what4-java-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2020-07-02 08:48:49 -0700\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 23}, "wichtounet": {"quality": "experimental", "status": "unofficial", "name": "wichtounet", "description": {"en": "Personal overlay of Baptiste Wicht"}, "homepage": "https://github.com/wichtounet/wichtounet-overlay", "owner": [{"type": "person", "email": "baptistewicht@gmail.com", "name": "Baptiste Wicht"}], "source": [{"type": "git", "uri": "https://github.com/wichtounet/wichtounet-overlay.git"}, {"type": "git", "uri": "git://github.com/wichtounet/wichtounet-overlay.git"}, {"type": "git", "uri": "git@github.com:wichtounet/wichtounet-overlay.git"}], "feed": ["https://github.com/wichtounet/wichtounet-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-08-27 18:08:31 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 30}, "wine": {"quality": "testing", "status": "official", "name": "wine", "description": {"en": "All supported Wine ebuilds from the Gentoo Wine Project"}, "homepage": "https://wiki.gentoo.org/wiki/Project:Wine", "owner": [{"type": "project", "email": "wine@gentoo.org", "name": "Gentoo Wine Project"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/proj/wine.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/repo/proj/wine.git"}], "x-state": "GOOD", "x-timestamp": "2020-10-11 16:17:39 -0400\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 228}, "winny": {"quality": "experimental", "status": "unofficial", "name": "winny", "description": {"en": "Winny's personal overlay"}, "homepage": "https://github.com/winny-/winny-overlay", "owner": [{"type": "person", "email": "winston@ml1.net", "name": "winny"}], "source": [{"type": "git", "uri": "https://github.com/winny-/winny-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/winny-/winny-overlay.git"}], "feed": ["https://github.com/winny-/winny-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-09-20 01:08:19 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 63}, "wjn-overlay": {"quality": "experimental", "status": "unofficial", "name": "wjn-overlay", "description": {"en": "wjn's overlay for Gentoo Linux"}, "homepage": "https://bitbucket.org/wjn/wjn-overlay", "owner": [{"type": "person", "email": "wjn@aol.jp", "name": "wjn"}], "source": [{"type": "git", "uri": "https://bitbucket.org/wjn/wjn-overlay.git"}], "x-state": "BAD_CACHE", "x-timestamp": "2020-10-14 21:38:47 +0900\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 26}, "wuodan": {"quality": "experimental", "status": "unofficial", "name": "wuodan", "description": {"en": "An experimental portage overlay"}, "homepage": "https://github.com/Wuodan/gentoo-overlay", "owner": [{"type": "person", "email": "stefan.kuhn.zurich@gmail.com", "name": "Stefan Kuhn"}], "source": [{"type": "git", "uri": "https://github.com/Wuodan/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/Wuodan/gentoo-overlay.git"}], "feed": ["https://github.com/Wuodan/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-09-01 16:33:01 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo", "pentoo"], "x-ebuild-count": 25}, "x11": {"quality": "experimental", "status": "official", "name": "x11", "description": {"en": "Gentoo X11 team ebuild repository"}, "homepage": "https://cgit.gentoo.org/proj/x11.git", "owner": [{"type": "project", "email": "x11@gentoo.org"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/x11.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/x11"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/x11.git"}], "feed": ["https://cgit.gentoo.org/proj/x11.git/atom/"], "x-state": "GOOD", "x-timestamp": "2019-06-24 17:08:58 -0400\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 80}, "xdch47": {"quality": "experimental", "status": "unofficial", "name": "xdch47", "description": {"en": "Gentoo portage overlay of xdch47"}, "homepage": "https://github.com/xdch47/gpo-xdch47", "owner": [{"type": "person", "email": "xdch47@posteo.de", "name": "Felix Neum\u00e4rker"}], "source": [{"type": "git", "uri": "https://github.com/xdch47/gpo-xdch47.git"}, {"type": "git", "uri": "git+ssh://git@github.com/xdch47/gpo-xdch47.git"}], "x-state": "GOOD", "x-timestamp": "2020-09-22 08:47:26 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 40}, "xelnor": {"quality": "experimental", "status": "unofficial", "name": "xelnor", "description": {"en": "Rapha\u00ebl Barrois' (Xelnor) Gentoo overlay."}, "homepage": "http://overlay.xelnor.net", "owner": [{"type": "person", "email": "gentoo@xelnor.net"}], "source": [{"type": "git", "uri": "git://overlay.xelnor.net/overlay.git"}], "x-state": "GOOD", "x-timestamp": "2020-10-05 20:48:04 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 75}, "xoreos": {"quality": "experimental", "status": "unofficial", "name": "xoreos", "description": {"en": "Gentoo overlay for the xoreos project, providing a WIP reimplementation of the BioWare Aurora engine and related modding tools."}, "homepage": "https://github.com/xoreos/gentoo-overlay", "owner": [{"type": "person", "email": "drmccoy@drmccoy.de", "name": "Sven \"DrMcCoy\" Hesse"}], "source": [{"type": "git", "uri": "https://github.com/xoreos/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/xoreos/gentoo-overlay.git"}], "feed": ["https://github.com/xoreos/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-08-09 19:51:52 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 12}, "xtreemfs": {"quality": "experimental", "status": "unofficial", "name": "xtreemfs", "description": {"en": "XtreemFS, a cloud filesystem"}, "homepage": "https://github.com/xtreemfs-gentoo/overlay", "owner": [{"type": "person", "email": "p@trickhieber.de", "name": "Patrick Hieber"}], "source": [{"type": "git", "uri": "https://github.com/xtreemfs-gentoo/overlay.git"}, {"type": "git", "uri": "git://github.com/xtreemfs-gentoo/overlay.git"}, {"type": "git", "uri": "git@github.com:xtreemfs-gentoo/overlay.git"}], "feed": ["https://github.com/xtreemfs-gentoo/overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2016-08-21 22:24:19 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 0}, "xwing": {"quality": "experimental", "status": "unofficial", "name": "xwing", "description": {"en": "This overlay contains some experimental stuff, such as\n    turboprint printers driver (bug #61311), intel-536ep driver for lastest 2.6\n    kernels (bug #127464), lastest grisbi version (proxy maintainer) before\n    it's portage integration and so on."}, "homepage": "http://gentoo.xwing.info", "owner": [{"type": "person", "email": "casta@xwing.info"}], "source": [{"type": "rsync", "uri": "rsync://gentoo.xwing.info/xwing-overlay"}], "x-state": "GOOD", "x-timestamp": "2020-09-06 14:01:32.000000000 +0000\n", "x-masters": ["gentoo"], "x-ebuild-count": 24}, "yandex": {"quality": "experimental", "status": "unofficial", "name": "yandex", "description": {"en": "Gentoo overlay with packages for software made by Yandex", "ru": "\u041e\u0432\u0435\u0440\u043b\u0435\u0439 \u0441 \u0441\u043e\u0444\u0442\u043e\u043c, \u0432\u044b\u043f\u0443\u0449\u0435\u043d\u043d\u044b\u043c \u042f\u043d\u0434\u0435\u043a\u0441\u043e\u043c"}, "homepage": "https://github.com/yandex-gentoo/overlay", "owner": [{"type": "person", "email": "mva@gentoo.org", "name": "Vadim A. Misbakh-Soloviov"}], "source": [{"type": "git", "uri": "https://github.com/yandex-gentoo/overlay.git"}, {"type": "git", "uri": "git://github.com/yandex-gentoo/overlay.git"}, {"type": "git", "uri": "git@github.com:yandex-gentoo/overlay.git"}], "feed": ["https://github.com/yandex-gentoo/overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2019-07-24 05:06:41 +0700\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "yarik-overlay": {"quality": "experimental", "status": "unofficial", "name": "yarik-overlay", "description": {"en": "Some new packages plus uncommitted patches and ebuilds for the main tree"}, "homepage": "https://github.com/yarikmsu/yarik-overlay", "owner": [{"type": "person", "email": "ygorbunov@gmail.com", "name": "Yaroslav Gorbunov"}], "source": [{"type": "git", "uri": "https://github.com/yarikmsu/yarik-overlay.git"}], "feed": ["https://github.com/yarikmsu/yarik-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2018-09-02 12:58:34 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 17}, "ycUygB1": {"quality": "experimental", "status": "unofficial", "name": "ycUygB1", "description": {"en": "Gentoo User ycUygB1 overlay"}, "homepage": "https://github.com/ycUygB1/overlay", "owner": [{"type": "person", "email": "harold@alum.mit.edu", "name": "Harold Anderson"}], "source": [{"type": "git", "uri": "https://github.com/ycUygB1/overlay.git"}, {"type": "git", "uri": "git://github.com/ycUygB1/overlay.git"}, {"type": "git", "uri": "git@github.com:ycUygB1/overlay.git"}], "feed": ["https://github.com/ycUygB1/overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2018-08-10 19:13:36 -0700\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 68}, "yoreek": {"quality": "experimental", "status": "unofficial", "name": "yoreek", "description": {"en": "Ebuilds related to nginx webserver modules"}, "homepage": "https://cgit.gentoo.org/user/yoreek.git/", "owner": [{"type": "person", "email": "yoreek@yahoo.com", "name": "Yuri U."}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/yoreek.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/yoreek.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/yoreek.git"}], "feed": ["https://cgit.gentoo.org/user/yoreek.git/atom/"], "x-state": "GOOD", "x-timestamp": "2019-10-28 19:20:48 +0800\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "youbroketheinternet": {"quality": "experimental", "status": "unofficial", "name": "youbroketheinternet", "description": {"en": "This overlay is a collaborative maintained Gentoo developer overlay. Some of us are involved with SecuShare, but we try out all sorts of XKEYSCORE-resistant technology. Some of our unique ebuilds are the full GNUnet suite, and software around the psyced chatserver. Some ebuilds are experimental/testing - refer to the included README for more info and details. If you would like to get involved read https://wiki.gentoo.org/wiki/Overlay:Youbroketheinternet"}, "homepage": "http://youbroketheinternet.org/#overlay", "owner": [{"type": "person", "email": "lynX@youbroketheinternet.pages.de", "name": "lynX"}], "source": [{"type": "git", "uri": "https://gnunet.org/git/youbroketheinternet-overlay.git"}, {"type": "git", "uri": "git://cheettyiapsyciew.onion/youbroketheinternet-overlay"}, {"type": "git", "uri": "git://gnunet.org/youbroketheinternet-overlay.git"}], "x-state": "GOOD", "x-timestamp": "1984-04-04 00:44:24 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 159}, "yurij-overlay": {"quality": "experimental", "status": "unofficial", "name": "yurij-overlay", "description": {"en": "Yurij's overlay"}, "homepage": "https://github.com/yurijmikhalevich/yurij-overlay", "owner": [{"type": "person", "email": "yurij@mikhalevi.ch", "name": "Yurij Mikhalevich"}], "source": [{"type": "git", "uri": "https://github.com/yurijmikhalevich/yurij-overlay.git"}, {"type": "git", "uri": "git://github.com/yurijmikhalevich/yurij-overlay.git"}, {"type": "git", "uri": "git@github.com:yurijmikhalevich/yurij-overlay.git"}], "feed": ["https://github.com/yurijmikhalevich/yurij-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2017-09-03 21:21:55 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "yuzu-overlay": {"quality": "experimental", "status": "unofficial", "name": "yuzu-overlay", "description": {"en": "Provides the Yuzu Switch Emulator and required dependencies."}, "homepage": "https://github.com/Alex-Aralis/yuzu-overlay", "owner": [{"type": "person", "email": "alex.aralis@gmail.com", "name": "Alex Aralis"}], "source": [{"type": "git", "uri": "https://github.com/Alex-Aralis/yuzu-overlay.git"}, {"type": "git", "uri": "git://github.com/Alex-Aralis/yuzu-overlay.git"}, {"type": "git", "uri": "git@github.com:Alex-Aralis/yuzu-overlay.git"}], "feed": ["https://github.com/Alex-Aralis/yuzu-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-08-25 11:16:37 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 10}, "zerodaysfordays": {"quality": "experimental", "status": "unofficial", "name": "zerodaysfordays", "description": {"en": "Jakob L. Kreuze's personal overlay."}, "homepage": "https://git.sr.ht/~jakob/zerodaysfordays", "owner": [{"type": "person", "email": "zerodaysfordays@sdf.lonestar.org", "name": "Jakob L. Kreuze"}], "source": [{"type": "git", "uri": "https://git.sr.ht/~jakob/zerodaysfordays"}], "x-state": "GOOD", "x-timestamp": "2020-05-09 19:15:21 -0400\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 11}, "zoobab": {"quality": "experimental", "status": "unofficial", "name": "zoobab", "description": {"en": "Personal overlay of Benjamin Henrion"}, "homepage": "https://github.com/zoobab/overlay4gentoo/", "owner": [{"type": "person", "email": "zoobab@gmail.com", "name": "Benjamin Henrion"}], "source": [{"type": "git", "uri": "https://github.com/zoobab/overlay4gentoo.git"}, {"type": "git", "uri": "git://github.com/zoobab/overlay4gentoo.git"}, {"type": "git", "uri": "git@github.com:zoobab/overlay4gentoo.git"}], "feed": ["https://github.com/zoobab/overlay4gentoo/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2020-10-16 19:31:19 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 25}, "zscheile": {"quality": "experimental", "status": "unofficial", "name": "zscheile", "description": {"en": "Zscheile Overlay"}, "homepage": "https://github.com/zserik/portage-zscheile", "owner": [{"type": "person", "email": "zseri@ytrizja.de", "name": "Erik Zscheile"}], "source": [{"type": "git", "uri": "https://github.com/zserik/portage-zscheile.git"}, {"type": "git", "uri": "git://github.com/zserik/portage-zscheile.git"}, {"type": "git", "uri": "git@github.com:zserik/portage-zscheile.git"}], "feed": ["https://github.com/zserik/portage-zscheile/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-02 15:29:57 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 126}, "zugaina": {"quality": "experimental", "status": "unofficial", "name": "zugaina", "description": {"en": "collection of ebuilds by ycarus"}, "homepage": "http://gpo.zugaina.org/Overlays/zugaina/", "owner": [{"type": "person", "email": "ycarus@zugaina.org"}], "source": [{"type": "rsync", "uri": "rsync://gentoo.zugaina.org/zugaina-portage"}], "x-state": "GOOD", "x-timestamp": "2019-07-24 19:12:13.000000000 +0000\n", "x-masters": ["gentoo"], "x-ebuild-count": 474}, "zx2c4": {"quality": "experimental", "status": "official", "name": "zx2c4", "description": {"en": "zx2c4's repository of additional ebuilds"}, "homepage": "http://git.zx2c4.com/portage/", "owner": [{"type": "person", "email": "zx2c4@gentoo.org", "name": "Jason A. Donenfeld"}], "source": [{"type": "git", "uri": "git://git.zx2c4.com/portage"}, {"type": "git", "uri": "http://git.zx2c4.com/portage"}, {"type": "git", "uri": "ssh://git@git.zx2c4.com/portage"}], "feed": ["http://git.zx2c4.com/portage/atom/?h=master"], "x-state": "GOOD", "x-timestamp": "2020-03-01 15:33:49 +0800\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 9}, "zyrenth": {"quality": "experimental", "status": "unofficial", "name": "zyrenth", "description": {"en": "Personal overlay"}, "homepage": "https://github.com/kabili207/zyrenth-overlay", "owner": [{"type": "person", "email": "kabi-bugz.gentoo@zyrenth.com", "name": "Amy Nagle"}], "source": [{"type": "git", "uri": "https://github.com/kabili207/zyrenth-overlay.git"}, {"type": "git", "uri": "git://github.com/kabili207/zyrenth-overlay.git"}, {"type": "git", "uri": "git@github.com:kabili207/zyrenth-overlay.git"}], "feed": ["https://github.com/kabili207/zyrenth-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-08-23 18:12:23 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 63}}
\ No newline at end of file
+{"0bs1d1an": {"quality": "experimental", "status": "unofficial", "name": "0bs1d1an", "description": {"en": "Personal overlay"}, "homepage": "https://gitlab.com/0bs1d1an/0bs1d1an-overlay", "owner": [{"type": "person", "email": "gkroon@maelstrom.ninja", "name": "Guido Kroon"}], "source": [{"type": "git", "uri": "https://gitlab.com/0bs1d1an/0bs1d1an-overlay.git"}, {"type": "git", "uri": "git+ssh://git@gitlab.com/0bs1d1an/0bs1d1an-overlay.git"}], "feed": ["https://gitlab.com/0bs1d1an/0bs1d1an-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-07-05 16:07:57 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo", "pentoo", "steam-overlay"], "x-ebuild-count": 80}, "0x4d4c": {"quality": "experimental", "status": "unofficial", "name": "0x4d4c", "description": {"en": "Personal overlay with no special focus"}, "homepage": "https://github.com/0x4d4c/gentoo-overlay", "owner": [{"type": "person", "email": "gentoo@0x4d4c.xyz", "name": "Martin Lambertz"}], "source": [{"type": "git", "uri": "https://github.com/0x4d4c/gentoo-overlay.git"}, {"type": "git", "uri": "git://github.com/0x4d4c/gentoo-overlay.git"}, {"type": "git", "uri": "git@github.com:0x4d4c/gentoo-overlay.git"}], "feed": ["https://github.com/0x4d4c/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2017-06-09 22:51:12 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 20}, "4nykey": {"quality": "experimental", "status": "unofficial", "name": "4nykey", "description": {"en": "An experimental portage overlay"}, "homepage": "https://github.com/4nykey/4nykey", "owner": [{"type": "person", "email": "4nykey@gmail.com", "name": "Aleksei Kaveshnikov"}], "source": [{"type": "git", "uri": "https://github.com/4nykey/4nykey.git"}, {"type": "git", "uri": "git://github.com/4nykey/4nykey.git"}, {"type": "git", "uri": "git@github.com:4nykey/4nykey.git"}], "feed": ["https://github.com/4nykey/4nykey/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-22 13:09:00 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 451}, "AlexandreFournier": {"quality": "experimental", "status": "unofficial", "name": "AlexandreFournier", "description": {"en": "Alexandre Fournier's personal overlay"}, "homepage": "https://github.com/AlexandreFournier/gentoo-overlay", "owner": [{"type": "person", "email": "gentoo@alexandrefournier.com", "name": "Alexandre Fournier"}], "source": [{"type": "git", "uri": "https://github.com/AlexandreFournier/gentoo-overlay.git"}, {"type": "git", "uri": "git://github.com/AlexandreFournier/gentoo-overlay.git"}, {"type": "git", "uri": "git@github.com:AlexandreFournier/gentoo-overlay.git"}], "feed": ["https://github.com/AlexandreFournier/gentoo-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2020-10-02 10:07:28 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 67}, "ArchFeh": {"quality": "experimental", "status": "unofficial", "name": "ArchFeh", "description": {"en": "ArchFeh's personal overlay"}, "homepage": "https://github.com/ArchFeh/ArchFeh-overlay", "owner": [{"type": "person", "email": "guyu2876@gmail.com", "name": "ArchFeh"}], "source": [{"type": "git", "uri": "https://github.com/ArchFeh/ArchFeh-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/ArchFeh/ArchFeh-overlay.git"}], "feed": ["https://github.com/ArchFeh/ArchFeh-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-04-22 15:59:45 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 22}, "AstroFloyd": {"quality": "experimental", "status": "unofficial", "name": "AstroFloyd", "description": {"en": "AstroFloyd's Gentoo overlay"}, "homepage": "https://cgit.gentoo.org/user/AstroFloyd.git/", "owner": [{"type": "person", "email": "AstroFloyd@gmail.com", "name": "AstroFloyd"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/AstroFloyd.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/AstroFloyd.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/AstroFloyd.git"}], "feed": ["https://cgit.gentoo.org/user/AstroFloyd.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-10-05 21:33:20 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 134}, "AzP": {"quality": "experimental", "status": "unofficial", "name": "AzP", "description": {"en": "Peter's own software playground"}, "homepage": "https://cgit.gentoo.org/user/AzP.git/", "owner": [{"type": "person", "email": "peterasplund@gentoo.se", "name": "Peter Asplund"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/AzP.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/AzP.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/AzP.git"}], "feed": ["https://cgit.gentoo.org/user/AzP.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-10-17 22:46:05 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 15}, "Case_Of": {"quality": "experimental", "status": "unofficial", "name": "Case_Of", "description": {"en": "Personal overlay"}, "homepage": "https://framagit.org/Case_Of/gentoo-overlay", "owner": [{"type": "person", "email": "gentoo@retornaz.com", "name": "Quentin Retornaz"}], "source": [{"type": "git", "uri": "https://framagit.org/Case_Of/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@framagit.org/Case_Of/gentoo-overlay.git"}], "feed": ["https://framagit.org/Case_Of/gentoo-overlay/commits/master?format=atom"], "x-state": "GOOD", "x-timestamp": "2020-10-10 04:41:35 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 15}, "Drauthius": {"quality": "experimental", "status": "unofficial", "name": "Drauthius", "description": {"en": "Ebuilds related to game dev"}, "homepage": "https://cgit.gentoo.org/repo/user/Drauthius.git/", "owner": [{"type": "person", "email": "albert@diserholt.com", "name": "Albert Diserholt"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/user/Drauthius.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/repo/user/Drauthius"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/user/Drauthius.git"}], "feed": ["https://cgit.gentoo.org/repo/user/Drauthius.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-09-17 16:30:24 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 12}, "DuPol": {"quality": "experimental", "status": "unofficial", "name": "DuPol", "description": {"en": "DuPol's own and modified portage ebuilds."}, "homepage": "https://cgit.gentoo.org/user/DuPol.git/", "owner": [{"type": "person", "email": "DuPol@gmx.de", "name": "Dustin Polke"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/DuPol.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/DuPol.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/DuPol.git"}], "feed": ["https://cgit.gentoo.org/user/DuPol.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-02-18 21:05:32 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 12}, "FireBurn": {"quality": "experimental", "status": "unofficial", "name": "FireBurn", "description": {"en": "32bit ebuilds (libdrm, mesa, libx11, mesa-progs, ..)"}, "homepage": "https://github.com/FireBurn/Overlay", "owner": [{"type": "person", "email": "mike@fireburn.co.uk", "name": "Mike Lothian"}], "source": [{"type": "git", "uri": "git://github.com/FireBurn/Overlay.git"}], "feed": ["https://github.com/FireBurn/Overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2020-10-23 17:05:43 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 58}, "HomeAssistantRepository": {"quality": "experimental", "status": "unofficial", "name": "HomeAssistantRepository", "description": {"en": "Home Assistant on Gentoo Linux without virtualenv or docker."}, "homepage": "https://git.edevau.net/onkelbeh/HomeAssistantRepository", "owner": [{"type": "person", "email": "b@edevau.net", "name": "Andreas Billmeier"}], "source": [{"type": "git", "uri": "https://git.edevau.net/onkelbeh/HomeAssistantRepository.git"}, {"type": "git", "uri": "https://github.com/onkelbeh/HomeAssistantRepository.git"}], "x-state": "GOOD", "x-timestamp": "2020-10-23 08:13:31 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 2533}, "JRG": {"quality": "experimental", "status": "unofficial", "name": "JRG", "description": {"en": "John's Collaboration Overlay"}, "homepage": "https://github.com/john-r-graham/jrg-overlay", "owner": [{"type": "person", "email": "john_r_graham@gentoo.org", "name": "John R. Graham"}], "source": [{"type": "git", "uri": "https://github.com/john-r-graham/jrg-overlay.git"}, {"type": "git", "uri": "git://github.com/john-r-graham/jrg-overlay.git"}, {"type": "git", "uri": "git@github.com:john-r-graham/jrg-overlay.git"}], "feed": ["https://github.com/john-r-graham/jrg-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-09-11 13:52:29 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 14}, "KBrown-pub": {"quality": "experimental", "status": "unofficial", "name": "KBrown-pub", "description": {"en": "KBrown's public overlay"}, "homepage": "http://sandino.araico.net/", "owner": [{"type": "person", "email": "sandino@sandino.net", "name": "Sandino Araico Sanchez"}], "source": [{"type": "git", "uri": "https://git.softwarelibre.mx/KBrown/gentoo-overlay.git"}, {"type": "git", "uri": "https://github.com/KenjiBrown/gentoo-overlay.git"}], "feed": ["https://git.softwarelibre.mx/KBrown/gentoo-overlay/-/commits/KBrown-pub?format=atom"], "x-state": "GOOD", "x-timestamp": "2020-09-17 23:17:57 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 134}, "Krontage": {"quality": "experimental", "status": "unofficial", "name": "Krontage", "description": {"en": "Personal overlay of Kron"}, "homepage": "https://github.com/undying/krontage", "owner": [{"type": "person", "email": "undying-m@yandex.ru", "name": "Kron"}], "source": [{"type": "git", "uri": "https://github.com/undying/krontage.git"}, {"type": "git", "uri": "git://github.com/undying/krontage.git"}, {"type": "git", "uri": "git@github.com:undying/krontage.git"}], "feed": ["https://github.com/undying/krontage/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-18 18:30:47 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 19}, "ROKO__": {"quality": "experimental", "status": "unofficial", "name": "ROKO__", "description": {"en": "Unofficial ebuilds for gentoo based distributions."}, "homepage": "https://github.com/sandikata/ROKO__", "owner": [{"type": "person", "email": "sandikata@yandex.ru", "name": "Alexandrow Rosen"}], "source": [{"type": "git", "uri": "https://github.com/sandikata/ROKO__.git"}, {"type": "git", "uri": "git://github.com/sandikata/ROKO__.git"}], "feed": ["https://github.com/sandikata/ROKO__/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-22 19:53:34 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 105}, "R_Overlay": {"quality": "experimental", "status": "official", "name": "R_Overlay", "description": {"en": "Gentoo overlay of R packages"}, "homepage": "https://cgit.gentoo.org/proj/R_overlay.git/", "owner": [{"type": "person", "email": "heroxbd@gentoo.org", "name": "Benda Xu"}], "source": [{"type": "rsync", "uri": "rsync://roverlay.dev.gentoo.org/roverlay"}], "x-state": "GOOD", "x-timestamp": "2020-08-14 09:27:44.000000000 +0000\n", "x-masters": ["gentoo"], "x-ebuild-count": 30474}, "ShyPixie": {"quality": "experimental", "status": "unofficial", "name": "ShyPixie", "description": {"en": "Personal overlay of Lara Maia"}, "homepage": "https://github.com/ShyPixie/Overlays", "owner": [{"type": "person", "email": "dev@lara.click", "name": "Lara Maia"}], "source": [{"type": "git", "uri": "https://github.com/ShyPixie/Overlays.git"}, {"type": "git", "uri": "git://github.com/ShyPixie/Overlays.git"}, {"type": "git", "uri": "git@github.com:ShyPixie/Overlays.git"}], "feed": ["https://github.com/ShyPixie/Overlays/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2017-03-22 12:26:37 +0000\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 14}, "SwordArMor": {"quality": "experimental", "status": "unofficial", "name": "SwordArMor", "description": {"en": "Personnal overlay of alarig/SwordArMor"}, "homepage": "https://git.grifon.fr/alarig/SwordArMor-gentoo-overlay", "owner": [{"type": "person", "email": "alarig@swordarmor.fr", "name": "Alarig Le Lay"}], "source": [{"type": "git", "uri": "https://git.grifon.fr/alarig/SwordArMor-gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@git.grifon.fr:alarig/SwordArMor-gentoo-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2020-10-22 19:19:51 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 138}, "ace": {"quality": "experimental", "status": "unofficial", "name": "ace", "description": {"en": "Personal overlay with ebuilds that were missing at one point or another"}, "homepage": "https://github.com/ananace/overlay", "owner": [{"type": "person", "email": "ace@haxalot.com", "name": "Alexander Olofsson"}], "source": [{"type": "git", "uri": "https://github.com/ananace/overlay.git"}, {"type": "git", "uri": "git://github.com/ananace/overlay.git"}, {"type": "git", "uri": "git@github.com:ananace/overlay.git"}], "feed": ["https://github.com/ananace/overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-02 11:27:41 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 31}, "activehome": {"quality": "experimental", "status": "unofficial", "name": "activehome", "description": {"en": "Gentoo overlay for ebuilds related to 'hand-made' Active Home construction", "ru": "\u041e\u0432\u0435\u0440\u043b\u0435\u0439 \u0434\u043b\u044f ebuild'\u043e\u0432 \u0441\u0432\u044f\u0437\u0430\u043d\u043d\u044b\u0445 \u0441\u043e\u0437\u0434\u0430\u043d\u0438\u0435\u043c \u0441\u0430\u043c\u043e\u0434\u0435\u043b\u044c\u043d\u043e\u0433\u043e \u0443\u043c\u043d\u043e\u0433\u043e \u0434\u043e\u043c\u0430"}, "homepage": "https://cgit.gentoo.org/user/activehome.git/", "owner": [{"type": "person", "email": "mva@gentoo.org", "name": "Vadim A. Misbakh-Soloviov"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/activehome.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/activehome.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/activehome.git"}], "feed": ["https://cgit.gentoo.org/user/activehome.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-07-21 16:01:39 +0700\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "aeon-gentoo-overlay": {"quality": "experimental", "status": "unofficial", "name": "aeon-gentoo-overlay", "description": {"en": "Gentoo overlay for Aeon Dev packages and dependencies"}, "homepage": "https://github.com/aeon-engine/aeon-gentoo-overlay", "owner": [{"type": "person", "email": "robindegen@gmail.com", "name": "Robin Degen"}], "source": [{"type": "git", "uri": "https://github.com/aeon-engine/aeon-gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/aeon-engine/aeon-gentoo-overlay.git"}], "feed": ["https://github.com/aeon-engine/aeon-gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2019-05-19 12:32:23 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 3}, "ag-ops": {"quality": "experimental", "status": "unofficial", "name": "ag-ops", "description": {"en": "Useful tools for SysAdmins or DevOps"}, "homepage": "https://gitlab.com/ILMostro/ag-ops", "owner": [{"type": "person", "email": "ilmostro7@gmail.com", "name": "John Johnson"}], "source": [{"type": "git", "uri": "https://gitlab.com/ILMostro/ag-ops.git"}, {"type": "git", "uri": "git+ssh://git@gitlab.com/ILMostro/ag-ops.git"}], "feed": ["https://gitlab.com/ILMostro/ag-ops/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-09-02 23:15:27 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 87}, "ago": {"quality": "experimental", "status": "official", "name": "ago", "description": {"en": "Developer overlay"}, "homepage": "https://cgit.gentoo.org/dev/ago.git/", "owner": [{"type": "person", "email": "ago@gentoo.org", "name": "Agostino Sarubbo"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/ago.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/ago.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/ago.git"}], "feed": ["https://cgit.gentoo.org/dev/ago.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-09-25 09:11:19 +0200\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 17}, "ahyangyi-overlay": {"quality": "experimental", "status": "unofficial", "name": "ahyangyi-overlay", "description": {"en": "Ahyangyi's overlay"}, "homepage": "https://github.com/ahyangyi/ahyangyi-overlay", "owner": [{"type": "person", "email": "ahyangyi@gmail.com", "name": "Yi Yang"}], "source": [{"type": "git", "uri": "https://github.com/ahyangyi/ahyangyi-overlay.git"}], "feed": ["https://github.com/ahyangyi/ahyangyi-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-09-06 19:09:37 +0800\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 48}, "alatar-lay": {"quality": "experimental", "status": "unofficial", "name": "alatar-lay", "description": {"en": "Alatar`s personal ebuilds"}, "homepage": "https://github.com/alatarum/alatar-lay", "owner": [{"type": "person", "email": "alatar_@list.ru", "name": "Alatar"}], "source": [{"type": "git", "uri": "https://github.com/alatarum/alatar-lay.git"}, {"type": "git", "uri": "git://github.com/alatarum/alatar-lay.git"}, {"type": "git", "uri": "git@github.com:alatarum/alatar-lay.git"}], "feed": ["https://github.com/alatarum/alatar-lay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2018-05-02 01:46:05 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 7}, "alesharik": {"quality": "experimental", "status": "unofficial", "name": "alesharik", "description": {"en": "Gentoo portage overlay of alesharik"}, "homepage": "https://github.com/alesharik/alesharik-overlay", "owner": [{"type": "person", "email": "alesharik4@gmail.com", "name": "Aleksei Arsenev"}], "source": [{"type": "git", "uri": "https://github.com/alesharik/alesharik-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/alesharik/alesharik-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2020-10-18 15:27:47 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 18}, "alexcepoi": {"quality": "experimental", "status": "unofficial", "name": "alexcepoi", "description": {"en": "Personal User Overlay"}, "homepage": "https://cgit.gentoo.org/user/alexcepoi.git/", "owner": [{"type": "person", "email": "alex.cepoi@gmail.com", "name": "Alexandru Cepoi"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/alexcepoi.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/alexcepoi.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/alexcepoi.git"}], "feed": ["https://cgit.gentoo.org/user/alexcepoi.git/atom/"], "x-state": "GOOD", "x-timestamp": "2018-01-21 15:49:24 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "alexxy": {"quality": "experimental", "status": "official", "name": "alexxy", "description": {"en": "Some random work in progress stuff from alexxy"}, "homepage": "https://cgit.gentoo.org/dev/alexxy.git", "owner": [{"type": "person", "email": "alexxy@gentoo.org", "name": "Alexey Shvetsov"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/alexxy.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/alexxy.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/alexxy.git"}], "feed": ["https://cgit.gentoo.org/dev/alexxy.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-02-11 14:50:24 +0300\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 3}, "alinefr": {"quality": "experimental", "status": "unofficial", "name": "alinefr", "description": {"en": "Some overlays that I could not find anywhere else."}, "homepage": "https://github.com/alinefr/alinefr-overlay", "owner": [{"type": "person", "email": "aline@alinefreitas.com.br", "name": "Aline Freitas"}], "source": [{"type": "git", "uri": "https://github.com/alinefr/alinefr-overlay.git"}, {"type": "git", "uri": "git://github.com/alinefr/alinefr-overlay.git"}, {"type": "git", "uri": "git@github.com:alinefr/alinefr-overlay.git"}], "feed": ["https://github.com/alinefr/alinefr-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2020-05-12 19:16:58 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 28}, "aluco": {"quality": "experimental", "status": "unofficial", "name": "aluco", "description": {"en": "From drm-next to phoronix-test-suite ebuilds"}, "homepage": "https://cgit.gentoo.org/user/aluco.git/", "owner": [{"type": "person", "email": "anthoine.bourgeois@gmail.com", "name": "Anthoine Bourgeois"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/aluco.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/aluco.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/aluco.git"}], "feed": ["https://cgit.gentoo.org/user/aluco.git/atom/"], "x-state": "GOOD", "x-timestamp": "2017-05-22 00:05:14 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 24}, "amedeos": {"quality": "experimental", "status": "unofficial", "name": "amedeos", "description": {"en": "amedeos's personal overlay"}, "homepage": "https://github.com/amedeos/amedeos-overlay", "owner": [{"type": "person", "email": "amedeo@linux.com", "name": "Amedeo Salvati"}], "source": [{"type": "git", "uri": "https://github.com/amedeos/amedeos-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/amedeos/amedeos-overlay.git"}], "feed": ["https://github.com/amedeos/amedeos-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-17 20:46:50 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 34}, "anarchy": {"quality": "experimental", "status": "official", "name": "anarchy", "description": {"en": "Testing/Bug fixes, new ebuilds"}, "homepage": "https://cgit.gentoo.org/dev/anarchy.git/", "owner": [{"type": "person", "email": "anarchy@gentoo.org", "name": "Jory Pratt"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/anarchy.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/anarchy"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/anarchy.git"}], "feed": ["https://cgit.gentoo.org/dev/anarchy.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-10-09 06:00:27 -0500\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 12}, "anaximander": {"quality": "experimental", "status": "unofficial", "name": "anaximander", "description": {"en": "anaximander's user overlay"}, "homepage": "https://cgit.gentoo.org/user/anaximander.git/", "owner": [{"type": "person", "email": "dominik.kriegner+gentoo@gmail.com", "name": "Dominik Kriegner"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/anaximander.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/anaximander.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/anaximander.git"}], "feed": ["https://cgit.gentoo.org/user/anaximander.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-09-30 10:25:23 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 3}, "anders-larsson": {"quality": "experimental", "status": "unofficial", "name": "anders-larsson", "description": {"en": "A few packages that are not hosted elsewhere."}, "homepage": "https://github.com/anders-larsson/gentoo-overlay", "owner": [{"type": "person", "email": "andla@thethundertemplars.com", "name": "Anders Larsson"}], "source": [{"type": "git", "uri": "https://github.com/anders-larsson/gentoo-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2020-10-23 05:56:48 +0000\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 34}, "andjscott": {"quality": "experimental", "status": "unofficial", "name": "andjscott", "description": {"en": "Few ebuilds that others may find useful"}, "homepage": "https://github.com/andjscott/overlays", "owner": [{"type": "person", "email": "andj.scott@gmail.com"}], "source": [{"type": "git", "uri": "https://github.com/andjscott/overlays.git"}], "x-state": "BAD_CACHE", "x-timestamp": "2016-10-17 16:03:33 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 14}, "andrey_utkin": {"quality": "experimental", "status": "official", "name": "andrey_utkin", "description": {"en": "Developer overlay"}, "homepage": "https://github.com/andrey-utkin/gentoo-overlay.git", "owner": [{"type": "person", "email": "andrey_utkin@gentoo.org", "name": "andrey_utkin"}], "source": [{"type": "git", "uri": "https://github.com/andrey-utkin/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/andrey-utkin/gentoo-overlay.git"}], "feed": ["https://github.com/andrey-utkin/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-09-04 11:23:21 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "andy": {"quality": "experimental", "status": "unofficial", "name": "andy", "description": {"en": "Andy's custom stuff and embedded software"}, "homepage": "https://cgit.gentoo.org/user/andy.git/", "owner": [{"type": "person", "email": "andy@ndyk.de", "name": "Andy K."}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/andy.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/andy.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/andy.git"}], "feed": ["https://cgit.gentoo.org/user/andy.git/atom"], "x-state": "BAD_CACHE", "x-timestamp": "2020-01-03 10:49:14 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 23}, "anomen": {"quality": "experimental", "status": "unofficial", "name": "anomen", "description": {"en": "anomen's personal Gentoo overlay"}, "homepage": "https://github.com/anomen-s/anomen-overlay", "owner": [{"type": "person", "email": "ludek_h@seznam.cz", "name": "anomen"}], "source": [{"type": "git", "uri": "https://github.com/anomen-s/anomen-overlay.git"}, {"type": "git", "uri": "git://github.com/anomen-s/anomen-overlay.git"}, {"type": "git", "uri": "git@github.com:anomen-s/anomen-overlay.git"}], "feed": ["https://github.com/anomen-s/anomen-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-09-19 13:40:34 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 58}, "anyc": {"quality": "experimental", "status": "unofficial", "name": "anyc", "description": {"en": "Testing ebuilds for out-of-tree applications"}, "homepage": "https://github.com/anyc/anyc-overlay", "owner": [{"type": "person", "email": "dev@kicherer.org", "name": "Mario Kicherer"}], "source": [{"type": "git", "uri": "https://github.com/anyc/anyc-overlay.git"}, {"type": "git", "uri": "git://github.com/anyc/anyc-overlay.git"}, {"type": "git", "uri": "git@github.com:anyc/anyc-overlay.git"}], "feed": ["https://github.com/anyc/anyc-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-02-16 18:56:45 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 95}, "apriluwu": {"quality": "experimental", "status": "unofficial", "name": "apriluwu", "description": {"en": "apriluwu's personal overlay"}, "homepage": "https://github.com/apriluwu/gentoo-overlay", "owner": [{"type": "person", "email": "aaprilthemonth@gmail.com", "name": "April C."}], "source": [{"type": "git", "uri": "https://github.com/apriluwu/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/apriluwu/gentoo-overlay.git"}], "feed": ["https://github.com/apriluwu/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-06-27 13:41:25 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "archenroot": {"quality": "experimental", "status": "unofficial", "name": "archenroot", "description": {"en": "GPU, Neural Networks, Big Data, HPC, Java"}, "homepage": "https://github.com/archenroot/gentoo-overlay", "owner": [{"type": "person", "email": "archenroot@gmail.com", "name": "Ladislav Jech"}], "source": [{"type": "git", "uri": "https://github.com/archenroot/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/archenroot/gentoo-overlay.git"}], "feed": ["https://github.com/archenroot/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2019-05-16 09:43:27 +0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "argent-main": {"quality": "experimental", "status": "unofficial", "name": "argent-main", "description": {"en": "Argent Linux"}, "homepage": "https://gitlab.com/argent/argent-main", "owner": [{"type": "person", "email": "stefan.cristian+gentoo@rogentos.ro", "name": "Stefan Cristian Brindusa"}], "source": [{"type": "git", "uri": "https://gitlab.com/argent/argent-main.git"}], "feed": ["https://gitlab.com/argent/argent-main/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2018-06-10 00:58:11 +0300\n", "x-openpgp-signed": "N", "x-masters": [], "x-ebuild-count": 2146}, "arx-libertatis": {"quality": "experimental", "status": "unofficial", "name": "arx-libertatis", "description": {"en": "Arx Libertatis Overlay"}, "homepage": "https://github.com/arx/ArxGentoo", "owner": [{"type": "person", "email": "daniel@constexpr.org", "name": "Daniel Scharrer"}], "source": [{"type": "git", "uri": "https://github.com/arx/ArxGentoo.git"}, {"type": "git", "uri": "git://github.com/arx/ArxGentoo.git"}], "x-state": "GOOD", "x-timestamp": "2020-08-11 21:12:11 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 7}, "atom": {"quality": "experimental", "status": "unofficial", "name": "atom", "description": {"en": "Atom Overlay"}, "homepage": "https://github.com/elprans/atom-overlay", "owner": [{"type": "person", "email": "elvis@magic.io", "name": "Elvis Pranskevichus"}], "source": [{"type": "git", "uri": "https://github.com/elprans/atom-overlay.git"}], "feed": ["https://github.com/elprans/atom-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-04 10:10:24 -0700\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "audio-overlay": {"quality": "experimental", "status": "unofficial", "name": "audio-overlay", "description": {"en": "Pro audio overlay. Please file bugs or package suggestions at https://github.com/gentoo-audio/audio-overlay/issues/new"}, "homepage": "https://github.com/gentoo-audio/audio-overlay", "owner": [{"type": "project", "email": "audio-overlay@googlegroups.com", "name": "Audio overlay"}], "source": [{"type": "git", "uri": "https://github.com/gentoo-audio/audio-overlay.git"}, {"type": "git", "uri": "git://github.com/gentoo-audio/audio-overlay.git"}, {"type": "git", "uri": "git@github.com:gentoo-audio/audio-overlay.git"}], "feed": ["https://github.com/gentoo-audio/audio-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-18 11:43:11 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 68}, "average": {"quality": "experimental", "status": "unofficial", "name": "average", "description": {"en": "Personal playground for some ebuilds not found elsewhere"}, "homepage": "https://github.com/AnAverageHuman/average", "owner": [{"type": "person", "email": "jeffrey@icurse.nl", "name": "Jeffrey Lin"}], "source": [{"type": "git", "uri": "https://github.com/AnAverageHuman/average.git"}, {"type": "git", "uri": "git+ssh://git@github.com/AnAverageHuman/average.git"}], "feed": ["https://github.com/AnAverageHuman/average/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-06-29 16:12:16 -0400\n", "x-openpgp-signed": "E", "x-masters": ["gentoo", "graaff"], "x-ebuild-count": 18}, "awesome": {"quality": "experimental", "status": "unofficial", "name": "awesome", "description": {"en": "Awesome ebuilds"}, "homepage": "https://gitlab.awesome-it.de/overlays/awesome", "owner": [{"type": "person", "email": "info@awesome-it.de", "name": "Daniel Morlock"}], "source": [{"type": "git", "uri": "https://gitlab.awesome-it.de/overlays/awesome.git"}], "x-state": "GOOD", "x-timestamp": "2020-10-10 09:34:00 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 37}, "axs": {"quality": "experimental", "status": "official", "name": "axs", "description": {"en": "Developer overlay"}, "homepage": "https://cgit.gentoo.org/dev/axs.git/", "owner": [{"type": "person", "email": "axs@gentoo.org", "name": "Ian Stakenvicius"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/axs.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/axs.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/axs.git"}], "feed": ["https://cgit.gentoo.org/dev/axs.git/atom/"], "x-state": "GOOD", "x-timestamp": "2017-12-19 14:22:25 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 17}, "barnowl": {"quality": "experimental", "status": "unofficial", "name": "barnowl", "description": {"en": "BarnOwl IM client"}, "homepage": "https://github.com/wthrowe/barnowl-overlay", "owner": [{"type": "person", "email": "wtt6@cornell.edu", "name": "William Throwe"}], "source": [{"type": "git", "uri": "https://github.com/wthrowe/barnowl-overlay.git"}, {"type": "git", "uri": "git://github.com/wthrowe/barnowl-overlay.git"}], "feed": ["https://github.com/wthrowe/barnowl-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-05-12 02:13:53 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 9}, "barzog-overlay": {"quality": "experimental", "status": "unofficial", "name": "barzog-overlay", "description": {"en": "Oleg Gawriloff's overlay"}, "homepage": "https://github.com/barzog/barzog-gentoo-overlay", "owner": [{"type": "person", "email": "barzog@telecom.by", "name": "Oleg Gawriloff"}], "source": [{"type": "git", "uri": "https://github.com/barzog/barzog-gentoo-overlay.git"}, {"type": "git", "uri": "git://github.com/barzog/barzog-gentoo-overlay.git"}, {"type": "git", "uri": "git@github.com:barzog/barzog-gentoo-overlay.git"}], "feed": ["https://github.com/barzog/barzog-gentoo-overlay/commits/master"], "x-state": "BAD_CACHE", "x-timestamp": "2019-12-02 16:52:17 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 203}, "beatussum-overlay": {"quality": "experimental", "status": "unofficial", "name": "beatussum-overlay", "description": {"en": "Beatussum's overlay", "fr": "Overlay de Beatussum"}, "longdescription": {"en": "\n        My Gentoo overlay aims to provide some packages that are not (yet) in the main Gentoo tree.\n    ", "fr": "\n        Mon overlay a pour but de fournir certains paquets qui ne sont pas (encore) disponibles dans l'arbre principal.\n    "}, "homepage": "https://github.com/beatussum/beatussum-overlay", "owner": [{"type": "person", "email": "beatussum@protonmail.com", "name": "Matt\u00e9o Rossillol--Laruelle"}], "source": [{"type": "git", "uri": "https://github.com/beatussum/beatussum-overlay.git"}, {"type": "git", "uri": "ssh://git@github.com/beatussum/beatussum-overlay.git"}], "feed": ["https://github.com/beatussum/beatussum-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-09-21 18:14:38 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 24}, "benzene-overlay": {"quality": "experimental", "status": "unofficial", "name": "benzene-overlay", "description": {"en": "Universebenzene's personal Gentoo overlay"}, "homepage": "https://github.com/Universebenzene/benzene-overlay", "owner": [{"type": "person", "email": "universebenzene@sina.com", "name": "Universebenzene"}], "source": [{"type": "git", "uri": "https://github.com/Universebenzene/benzene-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/Universebenzene/benzene-overlay.git"}], "feed": ["https://github.com/Universebenzene/benzene-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-23 16:01:33 +0800\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 64}, "bes": {"quality": "experimental", "status": "unofficial", "name": "bes", "description": {"en": "bes' personal overlay"}, "homepage": "https://github.com/bes-internal/gentoo-overlay-bes", "owner": [{"type": "person", "email": "bes.internal@gmail.com", "name": "Vladimir Varlamov"}], "source": [{"type": "git", "uri": "https://github.com/bes-internal/gentoo-overlay-bes.git"}, {"type": "git", "uri": "git://github.com/bes-internal/gentoo-overlay-bes.git"}, {"type": "git", "uri": "git@github.com:bes-internal/gentoo-overlay-bes.git"}], "feed": ["https://github.com/bes-internal/gentoo-overlay-bes/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-09-25 00:58:24 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 8}, "bezerker": {"quality": "experimental", "status": "unofficial", "name": "bezerker", "description": {"en": "Bezerker's Packages"}, "homepage": "https://github.com/bezerker/gentoo-overlay", "owner": [{"type": "person", "email": "bezerker@bezerker.org", "name": "Bezerker"}], "source": [{"type": "git", "uri": "https://github.com/bezerker/gentoo-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2015-09-04 06:56:43 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 3}, "bibletime": {"quality": "experimental", "status": "unofficial", "name": "bibletime", "description": {"en": "BibleTime overlay"}, "homepage": "https://cgit.gentoo.org/user/bibletime.git/", "owner": [{"type": "person", "email": "jaak@ristioja.ee", "name": "Jaak Ristioja"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/bibletime.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/bibletime.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/bibletime.git"}], "feed": ["https://cgit.gentoo.org/user/bibletime.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-08-02 21:35:41 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 6}, "binaryden": {"quality": "experimental", "status": "unofficial", "name": "binaryden", "description": {"en": "Overlay for Cinnamon and other Gentoo packages"}, "homepage": "https://github.com/tkemmer/binaryden", "owner": [{"type": "person", "email": "thomas@binaryden.de", "name": "Thomas Kemmer"}], "source": [{"type": "git", "uri": "https://github.com/tkemmer/binaryden.git"}, {"type": "git", "uri": "git://github.com/tkemmer/binaryden.git"}, {"type": "git", "uri": "git+ssh://git@github.com/tkemmer/binaryden.git"}], "feed": ["https://github.com/tkemmer/binaryden/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-18 19:45:56 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 27}, "bircoph": {"quality": "experimental", "status": "official", "name": "bircoph", "description": {"en": "Developer overlay"}, "homepage": "https://cgit.gentoo.org/dev/bircoph.git/", "owner": [{"type": "person", "email": "bircoph@gentoo.org", "name": "Andrew Savchenko"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/bircoph.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/bircoph.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/bircoph.git"}], "feed": ["https://cgit.gentoo.org/dev/bircoph.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-09-25 11:52:20 +0300\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 30}, "bitcetera": {"quality": "experimental", "status": "unofficial", "name": "bitcetera", "description": {"en": "Miscellaneous Gentoo ebuilds"}, "homepage": "https://github.com/svoop/bitcetera-overlay", "owner": [{"type": "person", "email": "gentoo@bitcetera.com", "name": "Sven Schwyn"}], "source": [{"type": "git", "uri": "https://github.com/svoop/bitcetera-overlay.git"}, {"type": "git", "uri": "git://github.com/svoop/bitcetera-overlay.git"}, {"type": "git", "uri": "git@github.com:svoop/bitcetera-overlay.git"}], "feed": ["https://github.com/svoop/bitcetera-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-06-01 18:54:06 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 20}, "bitcoin": {"quality": "experimental", "status": "unofficial", "name": "bitcoin", "description": {"en": "Bitcoin and CPU/GPU mining related ebuilds"}, "homepage": "https://gitlab.com/bitcoin/gentoo.git", "owner": [{"type": "person", "email": "flo@geekplace.eu", "name": "Florian Schmaus"}], "source": [{"type": "git", "uri": "https://gitlab.com/bitcoin/gentoo.git"}], "x-state": "GOOD", "x-timestamp": "2020-10-22 16:17:02 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 162}, "bleeding-edge": {"quality": "experimental", "status": "unofficial", "name": "bleeding-edge", "description": {"en": "Gentoo ebuilds for \"bleeding edge\" versions of packages - newest, untested - running on ~amd64."}, "homepage": "https://cgit.gentoo.org/repo/user/bleeding-edge.git/", "owner": [{"type": "person", "email": "jasiupsota@gmail.com", "name": "Jan Psota"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/user/bleeding-edge.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/repo/user/bleeding-edge"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/user/bleeding-edge.git"}], "feed": ["https://cgit.gentoo.org/repo/user/bleeding-edge.git/atom/"], "x-state": "GOOD", "x-timestamp": "2018-09-26 10:53:10 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 11}, "blender-gentoo-logo": {"quality": "experimental", "status": "official", "name": "blender-gentoo-logo", "description": {"en": "Software needed to render the Blender-based gentoo Logo of 2003"}, "homepage": "https://gitweb.gentoo.org/repo/proj/blender-gentoo-logo.git/", "owner": [{"type": "person", "email": "sping@gentoo.org", "name": "Sebastian Pipping"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/proj/blender-gentoo-logo.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/proj/blender-gentoo-logo.git"}], "feed": ["https://gitweb.gentoo.org/repo/proj/blender-gentoo-logo.git/atom/?h=master"], "x-state": "GOOD", "x-timestamp": "2017-09-09 16:34:22 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 3}, "bliss-overlay": {"quality": "experimental", "status": "unofficial", "name": "bliss-overlay", "description": {"en": "FearedBliss's Gentoo Overlay"}, "homepage": "https://github.com/fearedbliss", "owner": [{"type": "person", "email": "jvasquez1011@gmail.com"}], "source": [{"type": "git", "uri": "https://github.com/fearedbliss/bliss-overlay.git"}, {"type": "git", "uri": "git://github.com:fearedbliss/bliss-overlay.git"}, {"type": "git", "uri": "git@github.com:fearedbliss/bliss-overlay.git"}], "feed": ["https://github.com/fearedbliss/bliss-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-09-20 09:16:21 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 9}, "bloody": {"quality": "experimental", "status": "unofficial", "name": "bloody", "description": {"en": "krita bleeding edge and artists tools/resources"}, "homepage": "https://github.com/bloodywing/bloody", "owner": [{"type": "person", "email": "bloodywing@neocomy.net", "name": "Pierre Geier"}], "source": [{"type": "git", "uri": "https://github.com/bloodywing/bloody.git"}, {"type": "git", "uri": "git://github.com/bloodywing/bloody.git"}, {"type": "git", "uri": "git@github.com:bloodywing/bloody.git"}], "feed": ["https://github.com/bloodywing/bloody/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-04-17 17:18:04 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "bobwya": {"quality": "experimental", "status": "unofficial", "name": "bobwya", "description": {"en": "Miscellaneous Gentoo ebuilds"}, "homepage": "https://github.com/bobwya/miscellaneous_ebuilds", "owner": [{"type": "person", "email": "bob.mt.wya@gmail.com", "name": "Bob Wya"}], "source": [{"type": "git", "uri": "https://github.com/bobwya/miscellaneous_ebuilds.git"}, {"type": "git", "uri": "git://github.com/bobwya/miscellaneous_ebuilds.git"}, {"type": "git", "uri": "git@github.com:bobwya/miscellaneous_ebuilds.git"}], "feed": ["https://github.com/bobwya/miscellaneous_ebuilds/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-23 14:18:29 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 496}, "bombo82": {"quality": "experimental", "status": "unofficial", "name": "bombo82", "description": {"en": "Bombo82's own gentoo overlay"}, "homepage": "https://github.com/bombo82/bombo82-overlay", "owner": [{"type": "person", "email": "bombo82@giannibombelli.it", "name": "Gianni Bombelli (bombo82)"}], "source": [{"type": "git", "uri": "https://github.com/bombo82/bombo82-overlay.git"}, {"type": "git", "uri": "git@github.com:bombo82/bombo82-overlay.git"}], "feed": ["https://github.com/bombo82/bombo82-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-21 13:17:58 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 22}, "booboo": {"quality": "experimental", "status": "unofficial", "name": "booboo", "description": {"en": "L29Ah personal overlay"}, "homepage": "https://github.com/l29ah/booboo", "owner": [{"type": "person", "email": "zl29ah@gmail.com", "name": "Sergey Alirzaev"}], "source": [{"type": "git", "uri": "https://github.com/l29ah/booboo.git"}], "feed": ["https://github.com/l29ah/booboo/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-18 00:41:08 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 424}, "brave-overlay": {"quality": "experimental", "status": "unofficial", "name": "brave-overlay", "description": {"en": "Brave Overlay"}, "homepage": "https://gitlab.com/jason.oliveira/brave-overlay", "owner": [{"type": "person", "email": "jason.oliveira@medicalcannab.is", "name": "Jason Oliveira"}], "source": [{"type": "git", "uri": "https://gitlab.com/jason.oliveira/brave-overlay.git"}], "feed": ["https://gitlab.com/jason.oliveira/brave-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-22 17:03:24 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 6}, "bright": {"quality": "experimental", "status": "unofficial", "name": "bright", "description": {"en": "BrightOne's personal overlay"}, "homepage": "https://github.com/filalex77/bright", "owner": [{"type": "person", "email": "brightone@protonmail.com", "name": "Oleksii Filonenko"}], "source": [{"type": "git", "uri": "https://github.com/filalex77/bright.git"}], "feed": ["https://github.com/filalex77/bright/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2019-07-25 22:54:21 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 33}, "brother-overlay": {"quality": "experimental", "status": "unofficial", "name": "brother-overlay", "description": {"en": "Brother printer and scanner software"}, "homepage": "https://github.com/stefan-langenmaier/brother-overlay", "owner": [{"type": "person", "email": "stefan.langenmaier+gentoo@gmail.com", "name": "Stefan Langenmaier"}], "source": [{"type": "git", "uri": "https://github.com/stefan-langenmaier/brother-overlay.git"}, {"type": "git", "uri": "git://github.com/stefan-langenmaier/brother-overlay.git"}, {"type": "git", "uri": "git@github.com:stefan-langenmaier/brother-overlay.git"}], "feed": ["https://github.com/stefan-langenmaier/brother-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-09-06 15:09:21 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 569}, "bubba": {"quality": "experimental", "status": "unofficial", "name": "bubba", "description": {"en": "\"Bubba\" platform support for Excito B2|3"}, "homepage": "https://github.com/gordonb3/bubba-overlay", "owner": [{"type": "person", "email": "gordon@bosvangennip.nl", "name": "Gordon Bos"}], "source": [{"type": "git", "uri": "https://github.com/gordonb3/bubba-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2020-10-22 09:59:29 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 61}, "bumblebee": {"quality": "experimental", "status": "unofficial", "name": "bumblebee", "description": {"en": "Packages related to the bumblebee project"}, "homepage": "https://github.com/Bumblebee-Project/bumblebee-gentoo/", "owner": [{"type": "person", "email": "mva@gentoo.org", "name": "Vadim A. Misbakh-Soloviov"}], "source": [{"type": "git", "uri": "git://github.com/Bumblebee-Project/bumblebee-gentoo"}], "feed": ["https://github.com/Bumblebee-Project/bumblebee-gentoo/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-02-17 00:03:28 +0700\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 6}, "buzden": {"quality": "experimental", "status": "unofficial", "name": "buzden", "description": {"en": "Personal overlay of Denis Buzdalov"}, "homepage": "https://github.com/buzden/buzden-overlay", "owner": [{"type": "person", "email": "public@buzden.ru", "name": "Denis Buzdalov"}], "source": [{"type": "git", "uri": "https://github.com/buzden/buzden-overlay.git"}, {"type": "git", "uri": "git://github.com/buzden/buzden-overlay.git"}, {"type": "git", "uri": "git@github.com:buzden/buzden-overlay.git"}], "feed": ["https://github.com/buzden/buzden-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-06 13:44:08 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 17}, "c2p-overlay": {"quality": "experimental", "status": "unofficial", "name": "c2p-overlay", "description": {"en": "Personal overlay of Karol Grudzi\u0144ski"}, "homepage": "https://github.com/karolgrudzinski/c2p-overlay", "owner": [{"type": "person", "email": "krlgrudzinski+gentoo@gmail.com", "name": "Karol Grudzi\u0144ski"}], "source": [{"type": "git", "uri": "https://github.com/karolgrudzinski/c2p-overlay.git"}, {"type": "git", "uri": "git://github.com/karolgrudzinski/c2p-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com:karolgrudzinski/c2p-overlay.git"}], "feed": ["https://github.com/karolgrudzinski/c2p-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2019-01-02 13:21:57 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 33}, "calculate": {"quality": "experimental", "status": "unofficial", "name": "calculate", "description": {"en": "Calculate Overlay"}, "homepage": "http://www.calculate-linux.org", "owner": [{"type": "person", "email": "at@calculate.ru"}], "source": [{"type": "git", "uri": "git://git.calculate-linux.org/calculate/calculate-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2020-10-23 09:16:15 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 279}, "canutethegreat-overlay": {"quality": "experimental", "status": "unofficial", "name": "canutethegreat-overlay", "description": {"en": "Overlay for personal projects, forks, and customizations"}, "homepage": "http://gentoo.canutethegreat.com/", "owner": [{"type": "person", "email": "canutethegreat@gmail.com", "name": "Ronald Farrer"}], "source": [{"type": "git", "uri": "https://github.com/CanuteTheGreat/canutethegreat-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/CanuteTheGreat/canutethegreat-overlay.git"}], "feed": ["https://github.com/CanuteTheGreat/canutethegreat-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-15 10:25:45 -0700\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 6}, "causelay": {"quality": "experimental", "status": "unofficial", "name": "causelay", "description": {"en": "Ari Malinen's personal overlay"}, "homepage": "https://github.com/causes-/causelay", "owner": [{"type": "person", "email": "ari.malinen@gmail.com", "name": "Ari Malinen"}], "source": [{"type": "git", "uri": "https://github.com/causes-/causelay.git"}, {"type": "git", "uri": "git@github.com:causes-/causelay.git"}], "feed": ["https://github.com/causes-/causelay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2015-02-08 18:21:31 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 35}, "ceamac": {"quality": "experimental", "status": "unofficial", "name": "ceamac", "description": {"en": "This is a small Gentoo overlay with ebuilds that I could not find elsewhere or that I had to modify for some reason."}, "homepage": "https://github.com/ceamac/overlay", "owner": [{"type": "person", "email": "ceamac.paragon@gmail.com", "name": "Viorel Munteanu"}], "source": [{"type": "git", "uri": "https://github.com/ceamac/overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/ceamac/overlay.git"}], "feed": ["https://github.com/ceamac/overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-09 15:36:32 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 9}, "cg": {"quality": "experimental", "status": "unofficial", "name": "cg", "description": {"en": "Computer graphics ebuilds for gentoo"}, "homepage": "https://github.com/brothermechanic/cg", "owner": [{"type": "person", "email": "brothermechanic@gmail.com"}], "source": [{"type": "git", "uri": "https://github.com/brothermechanic/cg.git"}], "x-state": "BAD_CACHE", "x-timestamp": "2020-10-14 11:49:02 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 137}, "chrisadr": {"quality": "experimental", "status": "unofficial", "name": "chrisadr", "description": {"en": "ChrisADR's personal overlay"}, "homepage": "https://github.com/ChrisADR/chrisadr-overlay", "owner": [{"type": "person", "email": "chrisadr@gentoo.org", "name": "Christopher D\u00edaz Riveros"}], "source": [{"type": "git", "uri": "https://github.com/ChrisADR/chrisadr-overlay.git"}, {"type": "git", "uri": "git@github.com:ChrisADR/chrisadr-overlay.git"}], "feed": ["https://github.com/ChrisADR/chrisadr-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2018-05-17 20:48:42 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 1}, "chrytoo": {"quality": "experimental", "status": "unofficial", "name": "chrytoo", "description": {"en": "Personal overlay for packages that usually aren't in the official repository..."}, "homepage": "https://github.com/chrytoo/gentoo-overlay", "owner": [{"type": "person", "email": "chry7oo@gmail.com", "name": "Milo\u0161 \u0110. Omeragi\u0107"}], "source": [{"type": "git", "uri": "https://github.com/chrytoo/gentoo-overlay.git"}, {"type": "git", "uri": "git://github.com/chrytoo/gentoo-overlay.git"}, {"type": "git", "uri": "git@github.com:chrytoo/gentoo-overlay.git"}], "feed": ["https://github.com/chrytoo/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2019-08-19 00:07:33 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "chutzpah": {"quality": "experimental", "status": "official", "name": "chutzpah", "description": {"en": "Random stuff I am working on which isn't ready for the tree for some reason"}, "homepage": "https://cgit.gentoo.org/dev/chutzpah.git/", "owner": [{"type": "person", "email": "chutzpah@gentoo.org", "name": "Patrick McLean"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/chutzpah.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/chutzpah"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/chutzpah.git"}], "feed": ["https://cgit.gentoo.org/dev/chutzpah.git/atom/"], "x-state": "BAD_CACHE", "x-timestamp": "2020-09-22 16:29:34 -0700\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 9}, "chymeric": {"quality": "experimental", "status": "unofficial", "name": "chymeric", "description": {"en": "Overlay for scientific software and other utilities"}, "homepage": "https://github.com/TheChymera/overlay", "owner": [{"type": "person", "email": "chr@chymera.eu", "name": "Horea Christian"}], "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"}], "feed": ["https://github.com/TheChymera/overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-21 12:12:25 -0400\n", "x-openpgp-signed": "E", "x-masters": ["gentoo", "science"], "x-ebuild-count": 41}, "cj-overlay": {"quality": "experimental", "status": "official", "name": "cj-overlay", "description": {"en": "Christoph's Overlay"}, "homepage": "https://github.com/junghans/cj-overlay", "owner": [{"type": "person", "email": "junghans@gentoo.org"}], "source": [{"type": "git", "uri": "git://github.com/junghans/cj-overlay"}], "feed": ["https://github.com/junghans/cj-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2017-11-08 11:12:00 -0700\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 7}, "concaveoverlay": {"quality": "experimental", "status": "unofficial", "name": "concaveoverlay", "description": {"en": "concavegit's overlay."}, "homepage": "https://gitlab.com/concavegit/concaveoverlay", "owner": [{"type": "person", "email": "concavemail@gmail.com"}], "source": [{"type": "git", "uri": "https://gitlab.com/concavegit/concaveoverlay.git"}], "feed": ["https://gitlab.com/concavegit/concaveoverlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2019-11-23 19:42:16 +0000\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 23}, "crocket-overlay": {"quality": "experimental", "status": "unofficial", "name": "crocket-overlay", "description": {"en": "crocket's personal overlay"}, "homepage": "https://github.com/crocket/crocket-overlay", "owner": [{"type": "person", "email": "crockabiscuit@gmail.com", "name": "crocket"}], "source": [{"type": "git", "uri": "https://github.com/crocket/crocket-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/crocket/crocket-overlay.git"}], "feed": ["https://github.com/crocket/crocket-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-12 15:21:00 +0900\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 63}, "crossdev": {"quality": "experimental", "status": "unofficial", "name": "crossdev", "description": {"en": "Ebuilds for embedded systems", "ru": "\u041f\u0430\u043a\u0435\u0442\u044b \u0434\u043b\u044f \u0432\u0441\u0442\u0440\u0430\u0438\u0432\u0430\u0435\u043c\u044b\u0445 \u0441\u0438\u0441\u0442\u0435\u043c"}, "homepage": "https://github.com/alphallc/crossdev/", "owner": [{"type": "person", "email": "mva@gentoo.org", "name": "Vadim A. Misbakh-Soloviov"}], "source": [{"type": "git", "uri": "git://github.com/alphallc/crossdev"}], "feed": ["https://github.com/alphallc/crossdev/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2019-06-18 14:39:51 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "cynede": {"quality": "experimental", "status": "unofficial", "name": "cynede", "description": {"en": "Gentoo user overlay"}, "homepage": "https://github.com/Heather/gentoo-cynede", "owner": [{"type": "person", "email": "cynede@gentoo.org", "name": "Mikhail Pukhlikov"}], "source": [{"type": "git", "uri": "https://github.com/Heather/gentoo-cynede.git"}, {"type": "git", "uri": "git://github.com/Heather/gentoo-cynede.git"}, {"type": "git", "uri": "git@github.com:Heather/gentoo-cynede.git"}], "feed": ["https://github.com/Heather/gentoo-cynede/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-08-31 11:44:41 +0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 122}, "dMaggot": {"quality": "experimental", "status": "unofficial", "name": "dMaggot", "description": {"en": "Overlay of David E. Narv\u00e1ez"}, "homepage": "https://cgit.gentoo.org/user/dMaggot.git/", "owner": [{"type": "person", "email": "david.narvaez@computer.org", "name": "David E. Narv\u00e1ez"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/dMaggot.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/dMaggot.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/dMaggot.git"}], "feed": ["https://cgit.gentoo.org/user/dMaggot.git/atom/"], "x-state": "GOOD", "x-timestamp": "2017-06-01 22:09:38 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 8}, "darkelf": {"quality": "experimental", "status": "unofficial", "name": "darkelf", "description": {"en": "Overlay focusing on improved user experience for working in darkness on Xfce or zsh (including vim)"}, "homepage": "https://cgit.gentoo.org/repo/user/darkelf.git", "owner": [{"type": "person", "email": "sur3@gmx.de", "name": "Simon"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/user/darkelf.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/user/darkelf.git"}], "feed": ["https://cgit.gentoo.org/repo/user/darkelf.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-09-21 18:45:53 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 11}, "darthgandalf-overlay": {"quality": "experimental", "status": "unofficial", "name": "darthgandalf-overlay", "description": {"en": "Personal overlay"}, "homepage": "https://github.com/DarthGandalf/gentoo-overlay", "owner": [{"type": "person", "email": "alexey+gentoo@asokolov.org", "name": "Alexey Sokolov"}], "source": [{"type": "git", "uri": "https://github.com/DarthGandalf/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/DarthGandalf/gentoo-overlay.git"}], "feed": ["https://github.com/DarthGandalf/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-03 20:01:01 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "deadbeef-overlay": {"quality": "experimental", "status": "unofficial", "name": "deadbeef-overlay", "description": {"en": "DeaDBeeF player overlay for Gentoo Linux"}, "homepage": "https://github.com/damex/deadbeef-overlay", "owner": [{"type": "person", "email": "damex.pp@gmail.com", "name": "Roman Kuzmitsky"}], "source": [{"type": "git", "uri": "https://github.com/damex/deadbeef-overlay.git"}], "feed": ["https://github.com/damex/deadbeef-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2019-06-06 14:06:08 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 53}, "decent-im": {"quality": "experimental", "status": "unofficial", "name": "decent-im", "description": {"en": "XMPP software overlay maintained by decent.im"}, "homepage": "https://github.com/decent-im/gentoo-overlay", "owner": [{"type": "person", "email": "andrey_utkin@gentoo.org", "name": "Andrey Utkin"}], "source": [{"type": "git", "uri": "https://github.com/decent-im/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/decent-im/gentoo-overlay.git"}], "feed": ["https://github.com/decent-im/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2019-09-17 18:48:52 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 6}, "deepin": {"quality": "experimental", "status": "unofficial", "name": "deepin", "description": {"en": "Gentoo Overlay for Deepin Desktop Environment"}, "homepage": "https://github.com/zhtengw/deepin-overlay", "owner": [{"type": "person", "email": "atenzd@gmail.com", "name": "Aten Zhang"}], "source": [{"type": "git", "uri": "git://github.com/zhtengw/deepin-overlay.git"}], "feed": ["https://github.com/zhtengw/deepin-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-11 19:41:13 +0800\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 171}, "defiance": {"quality": "experimental", "status": "unofficial", "name": "defiance", "description": {"en": "packages for cloud development"}, "homepage": "https://github.com/d3fy/defiance-overlay.git", "owner": [{"type": "person", "email": "dan@d3fy.net", "name": "Dan Molik"}], "source": [{"type": "git", "uri": "https://github.com/d3fy/defiance-overlay.git"}, {"type": "git", "uri": "git://github.com/d3fy/defiance-overlay.git"}, {"type": "git", "uri": "git@github.com:d3fy/defiance-overlay.git"}], "feed": ["https://github.com/d3fy/defiance-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-08-20 11:50:33 -0400\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 74}, "delicious-absurdities": {"quality": "experimental", "status": "unofficial", "name": "delicious-absurdities", "description": {"en": "Personal overlay with delicious absurdities"}, "homepage": "https://github.com/paraenggu/delicious-absurdities-overlay", "owner": [{"type": "person", "email": "c.affolter@purplehaze.ch", "name": "Christian Affolter"}], "source": [{"type": "git", "uri": "https://github.com/paraenggu/delicious-absurdities-overlay.git"}, {"type": "git", "uri": "git://github.com/paraenggu/delicious-absurdities-overlay.git"}, {"type": "git", "uri": "git@github.com:paraenggu/delicious-absurdities-overlay.git"}], "feed": ["https://github.com/paraenggu/delicious-absurdities-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-05-03 12:55:52 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 15}, "deter": {"quality": "experimental", "status": "unofficial", "name": "deter", "description": {"en": "Custom stuff from deterenkelt."}, "homepage": "https://github.com/deterenkelt/deter", "owner": [{"type": "person", "email": "deterenkelt.github@gmail.com", "name": "Deter Enkelt"}], "source": [{"type": "git", "uri": "https://github.com/deterenkelt/deter.git"}, {"type": "git", "uri": "git://github.com/deterenkelt/deter.git"}, {"type": "git", "uri": "git@github.com:deterenkelt/deter.git"}], "feed": ["https://github.com/deterenkelt/deter/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2020-10-08 10:09:05 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 8}, "dev1990-overlay": {"quality": "experimental", "status": "unofficial", "name": "dev1990-overlay", "description": {"en": "Personal overlay focused on Qt application development and 3d-printing."}, "homepage": "https://github.com/dev-0x7C6/dev1990-overlay.git", "owner": [{"type": "person", "email": "dev.strikeu@gmail.com", "name": "Bartlomiej Burdukiewicz"}], "source": [{"type": "git", "uri": "https://github.com/dev-0x7C6/dev1990-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2020-10-15 11:01:17 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 223}, "devpump-gor": {"quality": "experimental", "status": "unofficial", "name": "devpump-gor", "description": {"en": "DevPump Gentoo Overlay"}, "homepage": "https://github.com/DevPump/gentoo-overlay", "owner": [{"type": "person", "email": "devpump@gmail.com", "name": "Matt Fleming"}], "source": [{"type": "git", "uri": "https://github.com/DevPump/gentoo-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2016-07-06 07:57:12 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 13}, "didactic-duck": {"quality": "experimental", "status": "unofficial", "name": "didactic-duck", "description": {"en": "Some ebuilds that might work"}, "homepage": "https://github.com/lucianposton/didactic-duck", "owner": [{"type": "person", "email": "lucianposton@pm.me", "name": "Lucian Poston"}], "source": [{"type": "git", "uri": "https://github.com/lucianposton/didactic-duck.git"}], "feed": ["https://github.com/lucianposton/didactic-duck/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-03-18 22:02:03 -0500\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 80}, "dilfridge": {"quality": "experimental", "status": "official", "name": "dilfridge", "description": {"en": "Dilfridge overlay: experimental ebuilds and lab software"}, "homepage": "https://cgit.gentoo.org/dev/dilfridge.git/", "owner": [{"type": "person", "email": "dilfridge@gentoo.org", "name": "Andreas K. Huettel (dilfridge)"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/dilfridge.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/dilfridge.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/dilfridge.git"}], "feed": ["https://cgit.gentoo.org/dev/dilfridge.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-09-09 20:01:46 +0300\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 16}, "displacer": {"quality": "experimental", "status": "unofficial", "name": "displacer", "description": {"en": "Fixes and new unstable packages"}, "homepage": "https://cgit.gentoo.org/user/displacer.git/", "owner": [{"type": "person", "email": "disinbox@gmail.com", "name": "Igor Ulyanov"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/displacer.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/displacer.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/displacer.git"}], "feed": ["https://cgit.gentoo.org/user/displacer.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-03-03 16:11:39 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 16}, "distros": {"quality": "experimental", "status": "unofficial", "name": "distros", "description": {"en": "Calculate Linux Profiles"}, "homepage": "http://www.calculate-linux.org", "owner": [{"type": "person", "email": "at@calculate.ru"}], "source": [{"type": "git", "uri": "git://git.calculate-linux.org/calculate/distros-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2020-08-05 14:24:19 +0300\n", "x-openpgp-signed": "N", "x-masters": ["calculate", "gentoo"], "x-ebuild-count": 0}, "djc": {"quality": "experimental", "status": "unofficial", "name": "djc", "description": {"en": "Personal overlay; testing and early development"}, "homepage": "https://github.com/djc/djc-overlay", "owner": [{"type": "person", "email": "djc@gentoo.org", "name": "Dirkjan Ochtman"}], "source": [{"type": "git", "uri": "https://github.com/djc/djc-overlay.git"}, {"type": "git", "uri": "git://github.com/djc/djc-overlay.git"}, {"type": "git", "uri": "git@github.com:djc/djc-overlay.git"}], "feed": ["https://github.com/djc/djc-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2017-12-01 14:24:16 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "dlang": {"quality": "experimental", "status": "unofficial", "name": "dlang", "description": {"en": "A collection of ebuilds related to the D programming\n    language."}, "homepage": "https://github.com/gentoo/dlang", "owner": [{"type": "person", "email": "Marco.Leise@gmx.de"}], "source": [{"type": "git", "uri": "https://github.com/gentoo/dlang.git"}, {"type": "git", "uri": "git@github.com:gentoo/dlang.git"}, {"type": "git", "uri": "git://github.com/gentoo/dlang.git"}], "feed": ["https://github.com/gentoo/dlang/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-08-15 19:55:36 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 85}, "dmchurch": {"quality": "experimental", "status": "unofficial", "name": "dmchurch", "description": {"en": "Danielle Church's Portage overlay"}, "homepage": "https://github.com/dmchurch/portage-overlay", "owner": [{"type": "person", "email": "dani.church@gmail.com", "name": "Danielle Church"}], "source": [{"type": "git", "uri": "https://github.com/dmchurch/portage-overlay.git"}, {"type": "git", "uri": "git://github.com/dmchurch/portage-overlay.git"}, {"type": "git", "uri": "git@github.com:dmchurch/portage-overlay.git"}], "feed": ["https://github.com/dmchurch/portage-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-16 15:30:39 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 3}, "docker": {"quality": "experimental", "status": "unofficial", "name": "docker", "description": {"en": "Overlay for docker by dotCloud"}, "homepage": "https://github.com/tianon/docker-overlay", "owner": [{"type": "person", "email": "admwiggin@gmail.com", "name": "Tianon Gravi"}], "source": [{"type": "git", "uri": "https://github.com/tianon/docker-overlay.git"}, {"type": "git", "uri": "git://github.com/tianon/docker-overlay.git"}, {"type": "git", "uri": "git@github.com:tianon/docker-overlay.git"}], "feed": ["https://github.com/tianon/docker-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2019-08-28 15:01:25 -0700\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 300}, "dotnet": {"quality": "experimental", "status": "official", "name": "dotnet", "description": {"en": "Experimental overlay for .NET packages."}, "homepage": "https://github.com/gentoo/dotnet", "owner": [{"type": "project", "email": "dotnet@gentoo.org", "name": "Dotnet team"}], "source": [{"type": "git", "uri": "https://github.com/gentoo/dotnet.git"}, {"type": "git", "uri": "git@github.com:gentoo/dotnet.git"}], "feed": ["https://github.com/gentoo/dotnet/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-15 21:37:41 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 170}, "drdim": {"quality": "experimental", "status": "unofficial", "name": "drdim", "description": {"en": "Gentoo Layman portage repository for Jetbrains Products"}, "homepage": "https://github.com/drdim/layman", "owner": [{"type": "person", "email": "dr.dim.pro@gmail.com", "name": "Dmitriy Bogatkin"}], "source": [{"type": "git", "uri": "https://github.com/drdim/layman.git"}, {"type": "git", "uri": "git://github.com/drdim/layman.git"}, {"type": "git", "uri": "git@github.com:drdim/layman.git"}], "feed": ["https://github.com/drdim/layman/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2016-04-14 05:51:00 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 44}, "dwfreed": {"quality": "experimental", "status": "unofficial", "name": "dwfreed", "description": {"en": "My random Gentoo packages"}, "homepage": "https://bitbucket.org/dwfreed/dwfreed.gentoo/", "owner": [{"type": "person", "email": "dwfreed@mtu.edu", "name": "Douglas Freed"}], "source": [{"type": "git", "uri": "https://bitbucket.org/dwfreed/dwfreed.gentoo"}], "feed": ["https://bitbucket.org/dwfreed/dwfreed.gentoo/rss"], "x-state": "GOOD", "x-timestamp": "2017-04-09 01:17:09 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "dwosky": {"quality": "experimental", "status": "unofficial", "name": "dwosky", "description": {"en": "Dwosky's personal overlay"}, "homepage": "https://github.com/Dwosky/Dwosky-overlay", "owner": [{"type": "person", "email": "dwosky@zoho.com", "name": "Pedro Arizmendi"}], "source": [{"type": "git", "uri": "https://github.com/Dwosky/Dwosky-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/Dwosky/Dwosky-overlay.git"}], "feed": ["https://github.com/Dwosky/Dwosky-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-03-10 18:31:17 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 14}, "earshark": {"quality": "experimental", "status": "unofficial", "name": "earshark", "description": {"en": "personal overlay, mostly games related"}, "homepage": "https://github.com/Chemrat/overlay", "owner": [{"type": "person", "email": "jazzvoid@gmail.com", "name": "Valeriy"}], "source": [{"type": "git", "uri": "https://github.com/Chemrat/overlay.git"}, {"type": "git", "uri": "git://github.com/Chemrat/overlay.git"}], "feed": ["https://github.com/Chemrat/overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-20 10:59:51 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 33}, "eclipse": {"quality": "experimental", "status": "official", "name": "eclipse", "description": {"en": "Community effort at packaging Eclipse Java SDK"}, "homepage": "https://github.com/gentoo/eclipse-overlay", "owner": [{"type": "project", "email": "eclipse@gentoo.org", "name": "Eclipse team"}], "source": [{"type": "git", "uri": "https://github.com/gentoo/eclipse-overlay.git"}, {"type": "git", "uri": "git://github.com/gentoo/eclipse-overlay.git"}, {"type": "git", "uri": "git@github.com:gentoo/eclipse-overlay.git"}], "feed": ["https://github.com/gentoo/eclipse-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2017-06-24 14:34:45 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 13}, "edgets": {"quality": "experimental", "status": "unofficial", "name": "edgets", "description": {"en": "Gentoo overlay that brings you the newest versions of modern software."}, "homepage": "https://github.com/BlueManCZ/edgets", "owner": [{"type": "person", "email": "ivo97@centrum.cz", "name": "Ivo \u0160merek"}], "source": [{"type": "git", "uri": "https://github.com/BlueManCZ/edgets.git"}, {"type": "git", "uri": "git+ssh://git@github.com/BlueManCZ/edgets.git"}], "feed": ["https://github.com/BlueManCZ/edgets/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-20 16:29:51 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 61}, "eigenlay": {"quality": "experimental", "status": "unofficial", "name": "eigenlay", "description": {"en": "Eigenlab Gentoo overlay"}, "homepage": "https://gitlab.com/eigennet/eigenlay", "owner": [{"type": "person", "email": "gio@eigenlab.org", "name": "Gioacchino Mazzurco"}], "source": [{"type": "git", "uri": "https://gitlab.com/eigennet/eigenlay.git"}], "x-state": "GOOD", "x-timestamp": "2020-04-01 16:18:39 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 16}, "einflay": {"quality": "experimental", "status": "unofficial", "name": "einflay", "description": {"en": "Personal overlay"}, "homepage": "https://github.com/EinstokFair/einflay", "owner": [{"type": "person", "email": "einfair@zoho.eu", "name": "Einstok Fair"}], "source": [{"type": "git", "uri": "https://github.com/EinstokFair/einflay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/EinstokFair/einflay.git"}], "feed": ["https://github.com/EinstokFair/einflay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-08-09 18:52:43 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 16}, "ejabberd": {"quality": "experimental", "status": "unofficial", "name": "ejabberd", "description": {"en": "Fresh ejabberd versions and dependencies"}, "homepage": "https://github.com/rion-overlay/ejabberd-overlay", "owner": [{"type": "person", "email": "rion4ik@gmail.com", "name": "Sergey Ilinykh"}], "source": [{"type": "git", "uri": "https://github.com/rion-overlay/ejabberd-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/rion-overlay/ejabberd-overlay.git"}], "feed": ["https://github.com/rion-overlay/ejabberd-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-04-30 13:18:01 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 0}, "elementary": {"quality": "experimental", "status": "unofficial", "name": "elementary", "description": {"en": "The elementary OS experience for Gentoo Linux. "}, "homepage": "https://github.com/pimvullers/elementary", "owner": [{"type": "person", "email": "gentoo.org@vullersmail.nl", "name": "Pim Vullers"}], "source": [{"type": "git", "uri": "https://github.com/pimvullers/elementary.git"}, {"type": "git", "uri": "git://github.com/pimvullers/elementary.git"}], "feed": ["https://github.com/pimvullers/elementary/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-08-03 22:01:16 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 136}, "elopez-r-overlay": {"quality": "experimental", "status": "unofficial", "name": "elopez-r-overlay", "description": {"en": "My Gentoo overlay for Ebuilds"}, "homepage": "https://gitlab.com/libre_hackerman/elopez-r-overlay", "owner": [{"type": "person", "email": "gnu_stallman@protonmail.ch", "name": "Esteban L\u00f3pez Rodr\u00edguez"}], "source": [{"type": "git", "uri": "https://gitlab.com/libre_hackerman/elopez-r-overlay.git"}, {"type": "git", "uri": "git+ssh://git@gitlab.com:libre_hackerman/elopez-r-overlay.git"}], "feed": ["https://gitlab.com/libre_hackerman/elopez-r-overlay/-/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-11 01:24:54 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 23}, "emacs": {"quality": "experimental", "status": "official", "name": "emacs", "description": {"en": "Provide Emacs and XEmacs related ebuilds which are\n    experimental or work-in-progress. Don't rely on them, but don't\n    hesitate to file bugs or write emails."}, "homepage": "https://wiki.gentoo.org/wiki/Project:Emacs/Overlay", "owner": [{"type": "project", "email": "emacs@gentoo.org", "name": "Gentoo Emacs team"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/proj/emacs.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/repo/proj/emacs.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/proj/emacs.git"}], "feed": ["https://cgit.gentoo.org/repo/proj/emacs.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-09-25 19:57:06 +0200\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 32}, "enlightenment-live": {"quality": "experimental", "status": "unofficial", "name": "enlightenment-live", "description": {"en": "Enlightenment WM latest stable version and live ebuilds"}, "homepage": "https://github.com/rafspiny/enlightenment-live", "owner": [{"type": "person", "email": "rafspiny@gmail.com", "name": "Raffaele Spinelli"}], "source": [{"type": "git", "uri": "https://github.com/rafspiny/enlightenment-live.git"}], "feed": ["https://github.com/rafspiny/enlightenment-live/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-08-19 09:54:21 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 22}, "ennui": {"quality": "experimental", "status": "unofficial", "name": "ennui", "description": {"en": "Facilitate running hardened-desktop hybrid system"}, "homepage": "https://gitweb.gentoo.org/user/ennui.git/", "owner": [{"type": "person", "email": "gentoo@seaofdirac.net", "name": "Nicholas Fish"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/ennui.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/ennui.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/ennui.git"}], "feed": ["https://gitweb.gentoo.org/user/ennui.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-04-17 23:15:42 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 40}, "equaeghe": {"quality": "experimental", "status": "unofficial", "name": "equaeghe", "description": {"en": "Erik Quaeghebeur's personal Gentoo overlay"}, "homepage": "https://github.com/equaeghe/gentoo-overlay/", "owner": [{"type": "person", "email": "gentoo@e3q.eu", "name": "Erik Quaeghebeur"}], "source": [{"type": "git", "uri": "https://github.com/equaeghe/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/equaeghe/gentoo-overlay.git"}], "feed": ["https://github.com/equaeghe/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-11 22:11:17 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 9}, "erayd": {"quality": "experimental", "status": "unofficial", "name": "erayd", "description": {"en": "Various personal ebuilds"}, "homepage": "https://github.com/erayd/overlay", "owner": [{"type": "person", "email": "steve@erayd.net", "name": "Steve Gilberd"}], "source": [{"type": "git", "uri": "https://github.com/erayd/overlay.git"}, {"type": "git", "uri": "git://github.com/erayd/overlay.git"}, {"type": "git", "uri": "git@github.com:erayd/overlay.git"}], "feed": ["https://github.com/erayd/overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-07-20 17:20:54 +1200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 9}, "ethereum": {"quality": "experimental", "status": "unofficial", "name": "ethereum", "description": {"en": "The Ethereum blockchain-based distributed computing platform"}, "homepage": "https://github.com/coolparadox/ethereum-gentoo-overlay", "owner": [{"type": "person", "email": "coolparadox@gmail.com", "name": "Rafael Lorandi"}], "source": [{"type": "git", "uri": "https://github.com/coolparadox/ethereum-gentoo-overlay.git"}, {"type": "git", "uri": "git@github.com:coolparadox/ethereum-gentoo-overlay.git"}], "feed": ["https://github.com/coolparadox/ethereum-gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-01-27 18:18:54 -0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 6}, "eugene-bright": {"quality": "experimental", "status": "unofficial", "name": "eugene-bright", "description": {"en": "The personal overlay of Eugene Bright"}, "homepage": "https://github.com/eugene-bright/eugene-bright-overlay", "owner": [{"type": "person", "email": "eugene@bright.gdn", "name": "Eugene Bright"}], "source": [{"type": "git", "uri": "https://github.com/eugene-bright/eugene-bright-overlay.git"}, {"type": "git", "uri": "git@github.com:eugene-bright/eugene-bright-overlay.git"}], "feed": ["https://github.com/eugene-bright/eugene-bright-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-08-18 15:35:56 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "ext-devlibs": {"quality": "experimental", "status": "unofficial", "name": "ext-devlibs", "description": {"en": "Mostly c/c++ and python libraries"}, "homepage": "http://sidvind.com/wiki/Main_Page", "owner": [{"type": "person", "email": "ext@sidvind.com", "name": "David Sveningsson"}], "source": [{"type": "svn", "uri": "svn://sidvind.com/overlays/ext-devlibs"}], "x-state": "GOOD", "x-timestamp": "2020-02-11 17:20:29 +0000\n", "x-masters": ["gentoo"], "x-ebuild-count": 24}, "farmboy0": {"quality": "experimental", "status": "unofficial", "name": "farmboy0", "description": {"en": "Personal overlay of Enrico Horn"}, "homepage": "https://github.com/farmboy0/portage-overlay", "owner": [{"type": "person", "email": "farmboy0@googlemail.com", "name": "Enrico Horn"}], "source": [{"type": "git", "uri": "https://github.com/farmboy0/portage-overlay.git"}, {"type": "git", "uri": "git://github.com/farmboy0/portage-overlay.git"}, {"type": "git", "uri": "git@github.com:farmboy0/portage-overlay.git"}], "feed": ["https://github.com/farmboy0/portage-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-07-20 22:28:52 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 32}, "fem-overlay": {"quality": "experimental", "status": "unofficial", "name": "fem-overlay", "description": {"en": "FeM Gentoo Overlay"}, "homepage": "https://bitbucket.fem.tu-ilmenau.de/projects/GENTOO/repos/fem-overlay/", "owner": [{"type": "person", "email": "frainz@mailbox.org", "name": "Paul Michel"}], "source": [{"type": "git", "uri": "https://bitbucket.fem.tu-ilmenau.de/scm/gentoo/fem-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2020-10-16 20:51:28 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 121}, "ferki": {"quality": "experimental", "status": "unofficial", "name": "ferki", "description": {"en": "Ebuilds used and/or proxy maintained by FErki"}, "homepage": "https://github.com/ferki/gentoo-overlay", "owner": [{"type": "person", "email": "erkiferenc@gmail.com", "name": "Ferenc Erki"}], "source": [{"type": "git", "uri": "https://github.com/ferki/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/ferki/gentoo-overlay.git"}], "feed": ["https://github.com/ferki/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-12 16:04:53 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 22}, "fidonet": {"quality": "experimental", "status": "unofficial", "name": "fidonet", "description": {"en": "Overlay of Benny Pedersen"}, "owner": [{"type": "person", "email": "me@junc.org", "name": "Benny Pedersen"}], "source": [{"type": "rsync", "uri": "rsync://fidonet.overlay.junc.org/fidonet/"}], "x-state": "GOOD", "x-timestamp": "2020-08-14 10:28:43.000000000 +0000\n", "x-masters": ["gentoo"], "x-ebuild-count": 38}, "fkmclane": {"quality": "experimental", "status": "unofficial", "name": "fkmclane", "description": {"en": "Personal overlay of fkmclane containing patched ebuilds and new ebuilds"}, "homepage": "https://github.com/fkmclane/overlay", "owner": [{"type": "person", "email": "fkmclane@gmail.com", "name": "Foster McLane"}], "source": [{"type": "git", "uri": "https://github.com/fkmclane/overlay.git"}, {"type": "git", "uri": "git://github.com/fkmclane/overlay.git"}], "feed": ["https://github.com/fkmclane/overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2020-04-28 18:35:22 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 121}, "flammie": {"quality": "experimental", "status": "unofficial", "name": "flammie", "description": {"en": "An overlay for gentoo for things Flammie's worked on: Apertium, HFST, computational linguistics, spell-checking, obscure languages..."}, "homepage": "https://github.com/flammie/flammie-overlay", "owner": [{"type": "person", "email": "flammie@gentoo.org", "name": "Flammie Pirinen"}], "source": [{"type": "git", "uri": "https://github.com/flammie/flammie-overlay.git"}, {"type": "git", "uri": "git://github.com/flammie/flammie-overlay.git"}], "feed": ["https://github.com/flammie/flammie-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2019-01-22 15:18:57 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 31}, "flavour": {"quality": "experimental", "status": "unofficial", "name": "flavour", "description": {"en": "Personal overlay of Wim Muskee"}, "homepage": "https://github.com/wimmuskee/flavour", "owner": [{"type": "person", "email": "wimmuskee@gmail.com", "name": "Wim Muskee"}], "source": [{"type": "git", "uri": "https://github.com/wimmuskee/flavour.git"}, {"type": "git", "uri": "git://github.com/wimmuskee/flavour.git"}], "x-state": "GOOD", "x-timestamp": "2020-10-18 08:03:17 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 43}, "flewkey-overlay": {"quality": "experimental", "status": "unofficial", "name": "flewkey-overlay", "description": {"en": "Personal Gentoo overlay for flewkey"}, "homepage": "https://git.sdf.org/flewkey/flewkey-overlay", "owner": [{"type": "person", "email": "flewkey@2a03.party", "name": "Ryan Fox"}], "source": [{"type": "git", "uri": "https://git.sdf.org/flewkey/flewkey-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2020-10-05 03:31:01 +0000\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 59}, "flightsim": {"quality": "experimental", "status": "unofficial", "name": "flightsim", "description": {"en": "Overlay with packages for flight simulation, mainly related to X-Plane"}, "homepage": "https://github.com/rafaelmartins/flightsim-overlay", "owner": [{"type": "person", "email": "rafaelmartins@gentoo.org", "name": "Rafael G. Martins"}], "source": [{"type": "git", "uri": "https://github.com/rafaelmartins/flightsim-overlay.git"}, {"type": "git", "uri": "git://github.com/rafaelmartins/flightsim-overlay.git"}, {"type": "git", "uri": "git@github.com:rafaelmartins/flightsim-overlay.git"}], "feed": ["https://github.com/rafaelmartins/flightsim-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2017-05-07 01:00:51 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "floppym": {"quality": "experimental", "status": "unofficial", "name": "floppym", "description": {"en": "floppym's personal overlay"}, "homepage": "https://github.com/floppym/floppym", "owner": [{"type": "person", "email": "floppym@gentoo.org", "name": "Mike Gilbert"}], "source": [{"type": "git", "uri": "https://github.com/floppym/floppym"}], "x-state": "GOOD", "x-timestamp": "2020-06-08 23:59:27 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 8}, "flow": {"quality": "experimental", "status": "unofficial", "name": "flow", "description": {"en": "Ebuilds by Florian Schmaus"}, "homepage": "https://gitlab.com/Flow/flow-s-ebuilds", "owner": [{"type": "person", "email": "flo@geekplace.eu", "name": "Florian Schmaus"}], "source": [{"type": "git", "uri": "https://gitlab.com/Flow/flow-s-ebuilds.git"}], "x-state": "GOOD", "x-timestamp": "2020-09-30 22:27:54 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 108}, "flussence": {"quality": "experimental", "status": "unofficial", "name": "flussence", "description": {"en": "Ant P.'s personal overlay"}, "homepage": "https://repo.or.cz/flussence-overlay.git", "owner": [{"type": "person", "email": "ant+gentoo.bugs@flussence.eu", "name": "Anthony Parsons"}], "source": [{"type": "git", "uri": "https://repo.or.cz/flussence-overlay.git"}, {"type": "git", "uri": "git://repo.or.cz/flussence-overlay.git"}, {"type": "git", "uri": "ssh://git@repo.or.cz/flussence-overlay.git"}], "feed": ["https://repo.or.cz/flussence-overlay.git/atom"], "x-state": "GOOD", "x-timestamp": "2020-10-19 12:03:51 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 53}, "fol4": {"quality": "experimental", "status": "unofficial", "name": "fol4", "description": {"en": "fol4 overlay"}, "homepage": "https://gitlab.com/madsl/fol4", "owner": [{"type": "person", "email": "mads@ab3.no", "name": "Mads"}], "source": [{"type": "git", "uri": "https://gitlab.com/madsl/fol4"}, {"type": "git", "uri": "git+ssh://git@gitlab.com/madsl/fol4.git"}], "feed": ["https://gitlab.com/madsl/fol4/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-13 11:21:33 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 55}, "foo-overlay": {"quality": "experimental", "status": "unofficial", "name": "foo-overlay", "description": {"en": "Piotr's fixes and new packages"}, "homepage": "https://github.com/slashbeast/foo-overlay", "owner": [{"type": "person", "email": "slashbeast@gentoo.org", "name": "Piotr Karbowski"}], "source": [{"type": "git", "uri": "git://github.com/slashbeast/foo-overlay.git"}, {"type": "git", "uri": "https://github.com/slashbeast/foo-overlay.git"}], "feed": ["https://github.com/slashbeast/foo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-01-19 16:39:22 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 12}, "fordfrog": {"quality": "experimental", "status": "official", "name": "fordfrog", "description": {"en": "Developer overlay"}, "homepage": "https://cgit.gentoo.org/dev/fordfrog.git/", "owner": [{"type": "person", "email": "fordfrog@gentoo.org", "name": "Miroslav \u0160ulc"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/fordfrog.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/fordfrog.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/fordfrog.git"}], "feed": ["https://cgit.gentoo.org/dev/fordfrog.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-09-15 19:04:32 +0200\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 286}, "fowlay": {"quality": "experimental", "status": "unofficial", "name": "fowlay", "description": {"en": "Collection of ebuilds"}, "homepage": "https://github.com/fowlay/fowlay-overlay", "owner": [{"type": "person", "email": "rabbe@bahnhof.se", "name": "Rabbe Fogelholm"}], "source": [{"type": "git", "uri": "https://github.com/fowlay/fowlay-overlay.git"}], "feed": ["https://github.com/fowlay/fowlay-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2018-04-07 14:41:09 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 1}, "foxiverlay": {"quality": "experimental", "status": "unofficial", "name": "foxiverlay", "description": {"en": "Personal overlay for unofficial ebuilds"}, "homepage": "https://github.com/Pekkari/foxiverlay", "owner": [{"type": "person", "email": "koalinux@gmail.com", "name": "Jos\u00e9 Pekkarinen"}], "source": [{"type": "git", "uri": "https://github.com/Pekkari/foxiverlay.git"}, {"type": "git", "uri": "git://github.com/Pekkari/foxiverlay.git"}, {"type": "git", "uri": "git@github.com:Pekkari/foxiverlay.git"}], "feed": ["https://github.com/Pekkari/foxiverlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2019-10-26 17:15:39 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 9}, "freeswitch": {"quality": "experimental", "status": "unofficial", "name": "freeswitch", "description": {"en": "Freeswitch Gentoo overlay"}, "homepage": "https://github.com/alphallc/freeswitch/", "owner": [{"type": "person", "email": "mva@gentoo.org", "name": "Vadim A. Misbakh-Soloviov"}], "source": [{"type": "git", "uri": "git://github.com/alphallc/freeswitch"}], "feed": ["https://github.com/alphallc/freeswitch/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2019-05-31 12:46:26 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 31}, "fritteli": {"quality": "experimental", "status": "unofficial", "name": "fritteli", "description": {"en": "fritteli's Gentoo Overlay"}, "homepage": "https://github.com/fritteli/gentoo-overlay", "owner": [{"type": "person", "email": "manuel@fritteli.ch", "name": "Manuel Friedli"}], "source": [{"type": "git", "uri": "https://github.com/fritteli/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/fritteli/gentoo-overlay.git"}], "feed": ["https://github.com/fritteli/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-21 17:25:27 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 36}, "frostyx": {"quality": "experimental", "status": "unofficial", "name": "frostyx", "description": {"en": "FrostyX's personal overlay"}, "homepage": "http://frostyx.cz/", "owner": [{"type": "person", "email": "frostyx@email.cz", "name": "FrostyX"}], "source": [{"type": "git", "uri": "https://github.com/FrostyX/gentoo-overlay.git"}, {"type": "git", "uri": "git://github.com/FrostyX/gentoo-overlay.git"}, {"type": "git", "uri": "git@github.com:FrostyX/gentoo-overlay.git"}], "feed": ["https://github.com/FrostyX/gentoo-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2015-02-09 02:17:56 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 1}, "frr-gentoo": {"quality": "stable", "status": "official", "name": "frr-gentoo", "description": {"en": "Free Range Routing Gentoo Overlay"}, "homepage": "https://frrouting.org/", "owner": [{"type": "person", "email": "f0o@devilcode.org", "name": "Daniel 'f0o' Preussker"}], "source": [{"type": "git", "uri": "https://github.com/FRRouting/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com:FRRouting/gentoo-overlay.git"}], "feed": ["https://github.com/FRRouting/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-09-16 11:18:22 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 46}, "fusion809": {"quality": "experimental", "status": "unofficial", "name": "fusion809", "description": {"en": "Brenton's Portage overlay"}, "homepage": "https://github.com/fusion809/fusion809-overlay", "owner": [{"type": "person", "email": "brentonhorne77@gmail.com", "name": "Brenton Horne"}], "source": [{"type": "git", "uri": "https://github.com/fusion809/fusion809-overlay.git"}, {"type": "git", "uri": "git://github.com/fusion809/fusion809-overlay.git"}], "feed": ["https://github.com/fusion809/fusion809-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-24 03:18:05 +1000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 16}, "fuverlay": {"quality": "experimental", "status": "unofficial", "name": "fuverlay", "description": {"en": "Funkill's overlay"}, "homepage": "https://github.com/funkill/fuverlay", "owner": [{"type": "person", "email": "funkill2@gmail.com", "name": "Funkill"}], "source": [{"type": "git", "uri": "https://github.com/funkill/fuverlay.git"}], "feed": ["https://github.com/funkill/fuverlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2019-02-03 01:49:12 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 7}, "gamarouns": {"quality": "experimental", "status": "unofficial", "name": "gamarouns", "description": {"en": "Bits and pieces missing in gentoo or layman repos I need"}, "homepage": "https://github.com/Amaroun/gamarouns", "owner": [{"type": "person", "email": "vit.kasal@gmail.com", "name": "amaroun"}], "source": [{"type": "git", "uri": "https://github.com/Amaroun/gamarouns.git"}], "x-state": "GOOD", "x-timestamp": "2020-10-16 15:52:12 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 61}, "gambas-overlay": {"quality": "experimental", "status": "unofficial", "name": "gambas-overlay", "description": {"en": "Gambas IDE overlay for Gentoo Linux"}, "homepage": "https://github.com/damex/gambas-overlay", "owner": [{"type": "person", "email": "damex.pp@gmail.com", "name": "Roman Kuzmitsky"}], "source": [{"type": "git", "uri": "https://github.com/damex/gambas-overlay.git"}], "feed": ["https://github.com/damex/gambas-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2016-02-10 01:31:50 +0700\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "gamerlay": {"quality": "experimental", "status": "unofficial", "name": "gamerlay", "description": {"en": "\n      Gamers overlay for all various games. Not related with games team.\n    "}, "homepage": "https://cgit.gentoo.org/proj/gamerlay.git", "owner": [{"type": "person", "email": "mva@gentoo.org", "name": "Vadim A. Misbakh-Soloviov"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/gamerlay.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/gamerlay.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/gamerlay.git"}], "feed": ["https://cgit.gentoo.org/proj/gamerlay.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-06-23 11:32:19 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 105}, "gcarq": {"quality": "experimental", "status": "unofficial", "name": "gcarq", "description": {"en": "Personal overlay"}, "homepage": "https://github.com/gcarq/gcarq-overlay", "owner": [{"type": "person", "email": "michael.egger@tsn.at", "name": "Michael Egger"}], "source": [{"type": "git", "uri": "https://github.com/gcarq/gcarq-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/gcarq/gcarq-overlay.git"}], "feed": ["https://github.com/gcarq/gcarq-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-02 03:28:03 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 8}, "genthree": {"quality": "experimental", "status": "unofficial", "name": "genthree", "description": {"en": "Gentoo overlay from the genthree project"}, "homepage": "https://genthree.io/overlay", "owner": [{"type": "person", "email": "nyronium@genthree.io", "name": "nyronium"}], "source": [{"type": "git", "uri": "https://gitlab.com/genthree/overlay.git"}], "feed": ["https://gitlab.com/genthree/overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-04-18 16:27:50 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 49}, "gentoo": {"quality": "core", "status": "official", "name": "gentoo", "description": {"en": "Official Gentoo ebuild repository"}, "homepage": "https://gentoo.org/", "owner": [{"type": "project", "email": "bug-wranglers@gentoo.org"}], "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"}], "feed": ["https://cgit.gentoo.org/repo/gentoo.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-10-23 19:08:15 +0200\n", "x-openpgp-signed": "U", "x-masters": [], "x-ebuild-count": 30774}, "gentoo-clang": {"quality": "experimental", "status": "unofficial", "name": "gentoo-clang", "description": {"en": "Gentoo overlay providing patches to build entire system with clang"}, "homepage": "https://github.com/BilyakA/gentoo-clang", "owner": [{"type": "person", "email": "bilyak.alexander@gmail.com", "name": "Alexander Bilyak"}], "source": [{"type": "git", "uri": "https://github.com/BilyakA/gentoo-clang.git"}, {"type": "git", "uri": "git://github.com/BilyakA/gentoo-clang.git"}, {"type": "git", "uri": "git@github.com:BilyakA/gentoo-clang.git"}], "feed": ["https://github.com/BilyakA/gentoo-clang/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-05-29 09:13:01 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 12}, "gentoo-mate": {"quality": "experimental", "status": "official", "name": "gentoo-mate", "description": {"en": "Gentoo MATE Desktop Project Repo"}, "homepage": "https://wiki.gentoo.org/wiki/Project:MATE", "owner": [{"type": "project", "email": "mate@gentoo.org", "name": "MATE Desktop Project"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/gentoo-mate.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/gentoo-mate.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/gentoo-mate.git"}], "feed": ["https://cgit.gentoo.org/proj/gentoo-mate.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-09-07 22:21:22 -0400\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 175}, "gentoo-playground": {"quality": "experimental", "status": "unofficial", "name": "gentoo-playground", "description": {"en": "zeq's Playground for experimental ebuilds and eclasses"}, "homepage": "https://github.com/sjnewbury/gentoo-playground", "owner": [{"type": "person", "email": "steve@snewbury.org.uk", "name": "Steven Newbury"}], "source": [{"type": "git", "uri": "https://github.com/sjnewbury/gentoo-playground.git"}, {"type": "git", "uri": "git://github.com/sjnewbury/gentoo-playground.git"}, {"type": "git", "uri": "git@github.com:sjnewbury/gentoo-playground.git"}], "feed": ["https://github.com/sjnewbury/gentoo-playground/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2019-05-24 17:39:11 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 32}, "gentoo-zh": {"quality": "experimental", "status": "unofficial", "name": "gentoo-zh", "description": {"en": "To provide programs useful to Chinese speaking users (merged\n      from gentoo-china and gentoo-taiwan)."}, "homepage": "https://github.com/microcai/gentoo-zh", "owner": [{"type": "person", "email": "microcai@fedoraproject.org"}], "source": [{"type": "git", "uri": "git://github.com/microcai/gentoo-zh.git"}], "feed": ["https://github.com/microcai/gentoo-zh/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-12 11:50:26 +0800\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 503}, "gerislay": {"quality": "experimental", "status": "unofficial", "name": "gerislay", "description": {"en": "A personal overlay with no specific focus (mainly to\n      test ebuilds). Highly experimental. It is meant as a playground for me,\n      but others might be interested."}, "homepage": "https://cgit.gentoo.org/repo/user/gerislay.git", "owner": [{"type": "person", "email": "gerion.entrup@flump.de", "name": "gerion"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/user/gerislay.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/user/gerislay.git"}], "feed": ["https://cgit.gentoo.org/repo/user/gerislay.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-10-23 16:47:58 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 41}, "gig": {"quality": "experimental", "status": "unofficial", "name": "gig", "description": {"en": "Gig OS's Overlay"}, "homepage": "https://github.com/Gig-OS/gig", "owner": [{"type": "person", "email": "yangmame@i2pmail.org"}], "source": [{"type": "git", "uri": "https://github.com/Gig-OS/gig.git"}], "feed": ["https://github.com/Gig-OS/gig/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-08 12:58:57 +0800\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 39}, "gitlab": {"quality": "experimental", "status": "unofficial", "name": "gitlab", "description": {"en": "Unofficial ebuilds for Gitlab"}, "homepage": "https://gitlab.awesome-it.de/overlays/gitlab", "owner": [{"type": "person", "email": "info@awesome-it.de", "name": "Daniel Morlock"}], "source": [{"type": "git", "uri": "https://gitlab.awesome-it.de/overlays/gitlab.git"}], "x-state": "GOOD", "x-timestamp": "2020-10-22 09:38:38 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 13}, "glarbs-overlay": {"quality": "experimental", "status": "unofficial", "name": "glarbs-overlay", "description": {"en": "A Gentoo overlay used by GLARBS.", "sv": "Ett Gentoo \u00f6verl\u00e4gg som anv\u00e4nds av GLARBS."}, "homepage": "https://wiki.gentoo.org/wiki/User:Et-8/GLARBS", "owner": [{"type": "person", "email": "et-8@emiliatrollros.se", "name": "Emilia Trollros"}], "source": [{"type": "git", "uri": "https://gitlab.com/et-8/glarbs-overlay.git"}], "feed": ["https://gitlab.com/et-8/glarbs-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-08-21 20:35:29 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 22}, "glicOne": {"quality": "experimental", "status": "unofficial", "name": "glicOne", "description": {"en": "glicOne Overlay with non existing in layman utils"}, "homepage": "https://gitlab.com/glicOne/glicOne-overlay", "owner": [{"type": "person", "email": "romaniuk.cv@gmail.com", "name": "Vadim Romaniuk"}], "source": [{"type": "git", "uri": "https://gitlab.com/glicOne/glicOne-overlay.git"}, {"type": "git", "uri": "git@gitlab.com:glicOne/glicOne-overlay.git"}], "feed": ["http://github.com/RomaniukVadim/glicOne-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2019-12-26 12:40:44 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 172}, "gnome": {"quality": "experimental", "status": "official", "name": "gnome", "description": {"en": "experimental gnome ebuilds"}, "homepage": "https://cgit.gentoo.org/proj/gnome.git/", "owner": [{"type": "project", "email": "gnome@gentoo.org", "name": "GNOME team"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/gnome.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/gnome.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/gnome.git"}], "feed": ["https://cgit.gentoo.org/proj/gnome.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-07-03 14:43:46 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 124}, "gnome-next": {"quality": "experimental", "status": "unofficial", "name": "gnome-next", "description": {"en": "experimental newer gnome ebuilds"}, "homepage": "https://github.com/Heather/gentoo-gnome", "owner": [{"type": "person", "email": "cynede@gentoo.org", "name": "Mikhail Pukhlikov"}], "source": [{"type": "git", "uri": "https://github.com/Heather/gentoo-gnome.git"}, {"type": "git", "uri": "git@github.com:Heather/gentoo-gnome.git"}], "feed": ["https://github.com/Heather/gentoo-gnome/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-09-21 15:28:48 +0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 194}, "gnuradio": {"quality": "experimental", "status": "unofficial", "name": "gnuradio", "description": {"en": "A repository for GNURadio packages/addons"}, "homepage": "https://github.com/hololeap/gentoo-gnuradio", "owner": [{"type": "person", "email": "hololeap@gmail.com"}], "source": [{"type": "git", "uri": "https://github.com/hololeap/gentoo-gnuradio"}], "feed": ["https://github.com/hololeap/gentoo-gnuradio/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2019-04-01 15:09:34 -0600\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 126}, "gnustep": {"quality": "experimental", "status": "official", "name": "gnustep", "description": {"en": "Experimental ebuilds for GNUstep packages in Gentoo. Comments and bugreports are welcome!"}, "homepage": "https://cgit.gentoo.org/proj/gnustep.git/", "owner": [{"type": "project", "email": "gnustep@gentoo.org"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/gnustep.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/gnustep.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/gnustep.git"}], "feed": ["https://cgit.gentoo.org/proj/gnustep.git/atom/"], "x-state": "GOOD", "x-timestamp": "2019-01-14 17:11:46 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "gnux32": {"quality": "experimental", "status": "unofficial", "name": "gnux32", "description": {"en": "A personal overlay with ebuilds for the x32 ABI"}, "homepage": "https://github.com/1camper/gnux32", "owner": [{"type": "person", "email": "theonetruecamper@gmx.de", "name": "Matthias R\u00e4ncker"}], "source": [{"type": "git", "uri": "https://github.com/1camper/gnux32.git"}, {"type": "git", "uri": "git://github.com/1camper/gnux32.git"}], "feed": ["https://github.com/1camper/gnux32/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-05-24 11:36:38 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 94}, "go-overlay": {"quality": "experimental", "status": "unofficial", "name": "go-overlay", "description": {"en": "Golang related ebuilds"}, "homepage": "https://github.com/Dr-Terrible/go-overlay", "owner": [{"type": "person", "email": "toffanin.mauro@gmail.com", "name": "Mauro Toffanin"}], "source": [{"type": "git", "uri": "https://github.com/Dr-Terrible/go-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2020-10-22 03:07:34 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 244}, "godin": {"quality": "experimental", "status": "unofficial", "name": "godin", "description": {"en": "Godin's Gentoo Overlay"}, "homepage": "https://github.com/Godin/gentoo-overlay", "owner": [{"type": "person", "email": "mandrikov@gmail.com", "name": "Evgeny Mandrikov"}], "source": [{"type": "git", "uri": "https://github.com/Godin/gentoo-overlay.git"}, {"type": "git", "uri": "git://github.com/Godin/gentoo-overlay.git"}], "feed": ["https://github.com/Godin/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-02-20 12:08:54 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 14}, "goris": {"quality": "experimental", "status": "unofficial", "name": "goris", "description": {"en": "Goris overlay"}, "homepage": "https://cgit.gentoo.org/repo/user/goris.git/", "owner": [{"type": "person", "email": "norayr.am@gmail.com", "name": "Norayr Mirakyan"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/user/goris.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/repo/user/goris.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/user/goris.git"}], "feed": ["https://cgit.gentoo.org/repo/user/goris.git/atom/"], "x-state": "GOOD", "x-timestamp": "2015-10-16 19:37:55 +0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 8}, "graaff": {"quality": "experimental", "status": "official", "name": "graaff", "description": {"en": "Developer overlay of Hans de Graaff with mostly ruby and\n    xemacs ebuilds, and a few assorted other goodies."}, "homepage": "http://moving-innovations.com/blog/", "owner": [{"type": "person", "email": "graaff@gentoo.org", "name": "Hans de Graaff"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/graaff.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/graaff.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/graaff.git"}], "feed": ["https://cgit.gentoo.org/dev/graaff.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-10-22 06:39:53 +0200\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 430}, "grub2-themes": {"quality": "experimental", "status": "official", "name": "grub2-themes", "description": {"en": "Overlay dedicated to Grub2 themes (of any distribution)"}, "homepage": "https://gitweb.gentoo.org/repo/proj/grub2-themes.git/", "owner": [{"type": "person", "email": "sping@gentoo.org", "name": "Sebastian Pipping"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/proj/grub2-themes.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/proj/grub2-themes.git"}], "feed": ["https://gitweb.gentoo.org/repo/proj/grub2-themes.git/atom/?h=master"], "x-state": "GOOD", "x-timestamp": "2015-07-19 17:38:24 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 24}, "gsview-overlay": {"quality": "experimental", "status": "unofficial", "name": "gsview-overlay", "description": {"en": "Overlay for the gsview and some other plotting/scientific soft"}, "homepage": "https://github.com/uleysky/gsview-overlay", "owner": [{"type": "person", "email": "uleysky@gmail.com", "name": "Michael Uleysky"}], "source": [{"type": "git", "uri": "https://github.com/uleysky/gsview-overlay.git"}, {"type": "git", "uri": "git://github.com/uleysky/gsview-overlay.git"}, {"type": "git", "uri": "git@github.com:uleysky/gsview-overlay.git"}], "feed": ["https://github.com/uleysky/gsview-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-21 12:19:15 +1000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 12}, "guru": {"quality": "experimental", "status": "official", "name": "guru", "description": {"en": "GURU: Ebuild repository entirely maintained by Gentoo users"}, "homepage": "https://wiki.gentoo.org/wiki/Project:GURU", "owner": [{"type": "project", "email": "guru@gentoo.org", "name": "GURU"}], "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"}], "feed": ["https://cgit.gentoo.org/repo/proj/guru.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-10-23 16:51:34 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 611}, "haarp": {"quality": "experimental", "status": "unofficial", "name": "haarp", "description": {"en": "misc ebuilds that aren't in the main tree"}, "homepage": "https://cgit.gentoo.org/user/haarp.git/", "owner": [{"type": "person", "email": "main.haarp@gmail.com", "name": "haarp"}], "source": [{"type": "git", "uri": "git://anongit.gentoo.org/user/haarp.git"}], "x-state": "GOOD", "x-timestamp": "2020-10-19 23:13:58 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 48}, "hamper-overlay": {"quality": "experimental", "status": "unofficial", "name": "hamper-overlay", "description": {"en": "User overlay"}, "homepage": "https://github.com/hamper/hamper-overlay", "owner": [{"type": "person", "email": "hamper.nhs@gmail.com", "name": "Alexander Pilipenko"}], "source": [{"type": "git", "uri": "https://github.com/Hamper/hamper-overlay.git"}, {"type": "git", "uri": "git://github.com/hamper/hamper-overlay.git"}], "feed": ["https://github.com/hamper/hamper-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-16 19:48:27 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 19}, "han": {"quality": "experimental", "status": "unofficial", "name": "han", "description": {"en": "Han's personal ebuild repository"}, "homepage": "https://github.com/hanmertens/han-overlay", "owner": [{"type": "person", "email": "hanmertens@outlook.com", "name": "Han Mertens"}], "source": [{"type": "git", "uri": "https://github.com/hanmertens/han-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/hanmertens/han-overlay.git"}], "feed": ["https://github.com/hanmertens/han-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-14 19:26:48 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 8}, "hangul-typing": {"quality": "experimental", "status": "unofficial", "name": "hangul-typing", "description": {"en": "It contains hangul-typing tutors."}, "homepage": "https://gitlab.com/espresso.tiger/hangul-typing", "owner": [{"type": "person", "email": "espresso.tiger@gmail.com", "name": "espresso tiger"}], "source": [{"type": "git", "uri": "https://gitlab.com/espresso.tiger/hangul-typing.git"}, {"type": "git", "uri": "git+ssh://git@gitlab.com/espresso.tiger/hangul-typing.git"}], "feed": ["https://gitlab.com/espresso.tiger/hangul-typing/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2018-12-23 22:47:42 +0900\n", "x-openpgp-signed": "N", "x-masters": ["gentoo", "haskell"], "x-ebuild-count": 3}, "haskell": {"quality": "experimental", "status": "official", "name": "haskell", "description": {"en": "The Official Gentoo Haskell overlay."}, "homepage": "https://github.com/gentoo-haskell", "owner": [{"type": "project", "email": "haskell@gentoo.org"}], "source": [{"type": "git", "uri": "https://github.com/gentoo-haskell/gentoo-haskell.git"}, {"type": "git", "uri": "git://github.com/gentoo-haskell/gentoo-haskell.git"}, {"type": "git", "uri": "https://github.com/gentoo-haskell/gentoo-haskell.git"}], "feed": ["https://github.com/gentoo-haskell/gentoo-haskell/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-23 16:44:09 +1100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 2630}, "heindsight": {"quality": "experimental", "status": "unofficial", "name": "heindsight", "description": {"en": "heindsight's personal overlay"}, "homepage": "https://github.com/heindsight/gentoo_overlay", "owner": [{"type": "person", "email": "heindsight@kruger.dev", "name": "Heinrich Kruger"}], "source": [{"type": "git", "uri": "https://github.com/heindsight/gentoo_overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/heindsight/gentoo_overlay.git"}], "feed": ["https://github.com/heindsight/gentoo_overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-06-27 14:51:21 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "hering-overlay": {"quality": "experimental", "status": "unofficial", "name": "hering-overlay", "description": {"en": "Richard Hering's gentoo overlay"}, "homepage": "https://github.com/internethering/hering-overlay", "owner": [{"type": "person", "email": "richard@internethering.de", "name": "Richard Hering"}], "source": [{"type": "git", "uri": "https://github.com/internethering/hering-overlay.git"}], "feed": ["https://github.com/internethering/hering-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-07-02 12:40:16 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 45}, "hexedit-overlay": {"quality": "experimental", "status": "unofficial", "name": "hexedit-overlay", "description": {"en": "Ebuilds for infrastructure-related packages and my own projects"}, "homepage": "http://hexedit.me/gentoo/", "owner": [{"type": "person", "email": "hexedit@ifproject.ru", "name": "Timofey Negrebetsky"}], "source": [{"type": "git", "uri": "https://git.ifproject.ru/hexedit/gentoo-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2020-02-27 10:06:44 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 18}, "hhvm": {"quality": "experimental", "status": "unofficial", "name": "hhvm", "description": {"en": "hhvm gentoo overlay"}, "homepage": "https://github.com/reanimus/hhvm-overlay", "owner": [{"type": "person", "email": "alex@guzman.io", "name": "Alex Guzman"}], "source": [{"type": "git", "uri": "https://github.com/reanimus/hhvm-overlay.git"}, {"type": "git", "uri": "git://github.com/reanimus/hhvm-overlay.git"}], "feed": ["https://github.com/reanimus/hhvm-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2016-08-10 00:36:19 -0700\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 3}, "hibiscus": {"quality": "experimental", "status": "unofficial", "name": "hibiscus", "description": {"en": "Hibiscus homebanking overlay"}, "homepage": "https://cgit.gentoo.org/user/hibiscus.git/", "owner": [{"type": "person", "email": "gentoo@posteo.de", "name": "Fabian K\u00f6ster"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/hibiscus.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/hibiscus.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/hibiscus.git"}], "feed": ["https://cgit.gentoo.org/user/hibiscus.git/atom/"], "x-state": "GOOD", "x-timestamp": "2015-10-28 17:09:06 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 22}, "holgersson-overlay": {"quality": "experimental", "status": "unofficial", "name": "holgersson-overlay", "description": {"en": "Nils \"holgersson\" Freydank's personal overlay"}, "homepage": "https://git.holgersson.xyz", "owner": [{"type": "person", "email": "holgersson@posteo.de", "name": "Nils Freydank"}], "source": [{"type": "git", "uri": "https://git.holgersson.xyz/foss/holgersson-overlay"}], "x-state": "GOOD", "x-timestamp": "2020-10-23 10:47:50 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 26}, "hossie": {"quality": "experimental", "status": "unofficial", "name": "hossie", "description": {"en": "gentoo-overlay from hossie"}, "homepage": "https://git.hossie.de/projects/GEN/repos/gentoo-overlay/browse", "owner": [{"type": "person", "email": "hossie@hossie.de"}], "source": [{"type": "git", "uri": "https://git.hossie.de/scm/gen/gentoo-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2020-08-24 14:56:19 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 84}, "ikelos": {"quality": "experimental", "status": "unofficial", "name": "ikelos", "description": {"en": "Ikelos's hospice for broken and damaged ebuilds."}, "homepage": "https://cgit.gentoo.org/dev/ikelos.git/", "owner": [{"type": "person", "email": "ikelos@gentoo.org", "name": "Mike Auty"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/ikelos.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/ikelos.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/ikelos.git"}], "feed": ["https://cgit.gentoo.org/dev/ikelos.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-10-09 16:31:17 +0100\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 123}, "imaging": {"quality": "experimental", "status": "unofficial", "name": "imaging", "description": {"en": "Gentoo overlay for image processing and visualization"}, "homepage": "https://github.com/gerddie/gentoo-imaging", "owner": [{"type": "person", "email": "gw.fossdev@gmail.com"}], "source": [{"type": "git", "uri": "https://github.com/gerddie/gentoo-imaging.git"}], "x-state": "GOOD", "x-timestamp": "2020-02-13 19:29:18 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 44}, "interactive-fiction": {"quality": "experimental", "status": "unofficial", "name": "interactive-fiction", "description": {"en": "Packages for players and authors of interactive\n    fiction"}, "owner": [{"type": "person", "email": "levertond@googlemail.com"}], "source": [{"type": "git", "uri": "git://repo.or.cz/gentoo-interactive-fiction.git"}], "feed": ["http://repo.or.cz/w/gentoo-interactive-fiction.git?a=rss"], "x-state": "GOOD", "x-timestamp": "2020-02-22 15:48:44 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 30}, "ixit": {"quality": "experimental", "status": "unofficial", "name": "ixit", "description": {"en": "iXit overlay"}, "homepage": "https://github.com/okias/ixit", "owner": [{"type": "person", "email": "david@ixit.cz", "name": "David Heidelberger"}], "source": [{"type": "git", "uri": "https://github.com/okias/ixit.git"}, {"type": "git", "uri": "git://github.com/okias/ixit.git"}, {"type": "git", "uri": "git@github.com:okias/ixit.git"}], "feed": ["https://github.com/okias/ixit/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-09-11 15:08:56 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 7}, "jacendi-overlay": {"quality": "experimental", "status": "unofficial", "name": "jacendi-overlay", "description": {"en": "id Software games overlay"}, "homepage": "https://bitbucket.org/jacendi/jacendi-overlay", "owner": [{"type": "person", "email": "jacendi@protonmail.com", "name": "Vladimir Gavrilov"}], "source": [{"type": "git", "uri": "https://bitbucket.org/jacendi/jacendi-overlay"}], "feed": ["https://bitbucket.org/jacendi/jacendi-overlay/atom"], "x-state": "GOOD", "x-timestamp": "2019-07-09 12:35:42 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 14}, "jamesbroadhead": {"quality": "experimental", "status": "unofficial", "name": "jamesbroadhead", "description": {"en": "James Broadhead's personal overlay and pre-sunrise testing ground"}, "homepage": "https://cgit.gentoo.org/user/jamesbroadhead.git/", "owner": [{"type": "person", "email": "jamesbroadhead@gmail.com", "name": "James Broadhead"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/jamesbroadhead.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/jamesbroadhead.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/jamesbroadhead.git"}], "feed": ["https://cgit.gentoo.org/user/jamesbroadhead.git/atom/"], "x-state": "GOOD", "x-timestamp": "2017-02-25 09:15:45 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 3}, "java": {"quality": "experimental", "status": "official", "name": "java", "description": {"en": "Java overlay"}, "homepage": "https://cgit.gentoo.org/proj/java.git/", "owner": [{"type": "project", "email": "java@gentoo.org", "name": "Gentoo Java team"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/java.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/java.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/java.git"}], "feed": ["https://cgit.gentoo.org/proj/java.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-09-20 14:09:18 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 137}, "jboro-overlay": {"quality": "experimental", "status": "unofficial", "name": "jboro-overlay", "description": {"en": "personal experimental ebuilds"}, "homepage": "https://github.com/JBoro/portage", "owner": [{"type": "person", "email": "justin.borodinsky@gmail.com", "name": "justin borodinsky"}], "source": [{"type": "git", "uri": "https://github.com/JBoro/portage.git"}], "x-state": "GOOD", "x-timestamp": "2015-08-08 11:25:17 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "jkolo": {"quality": "experimental", "status": "unofficial", "name": "jkolo", "description": {"en": "Jerzy Kolosowski's Gentoo overlay"}, "homepage": "https://git.kolosowscy.pl/jurek/gentoo-overlay", "owner": [{"type": "person", "email": "jerzy@kolosowscy.pl", "name": "Jerzy Kolosowski"}], "source": [{"type": "git", "uri": "https://git.kolosowscy.pl/jurek/gentoo-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2020-07-18 01:05:16 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 29}, "jm-overlay": {"quality": "experimental", "status": "unofficial", "name": "jm-overlay", "description": {"en": "Personal overlay with more or less random ebuilds"}, "homepage": "https://github.com/Jannis234/jm-overlay", "owner": [{"type": "person", "email": "jannis@ctrl-c.xyz", "name": "Jannis234"}], "source": [{"type": "git", "uri": "https://github.com/Jannis234/jm-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2020-10-11 23:47:11 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 888}, "jmbsvicetto": {"quality": "experimental", "status": "official", "name": "jmbsvicetto", "description": {"en": "Jorge Manuel B. S. Vicetto developer overlay"}, "homepage": "https://cgit.gentoo.org/dev/jmbsvicetto.git", "owner": [{"type": "person", "email": "jmbsvicetto@gentoo.org", "name": "Jorge Manuel B. S. Vicetto"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/jmbsvicetto.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/jmbsvicetto.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/jmbsvicetto.git"}], "feed": ["https://cgit.gentoo.org/dev/jmbsvicetto.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-10-14 16:01:24 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 79}, "jmesmon": {"quality": "experimental", "status": "unofficial", "name": "jmesmon", "description": {"en": "miscellanious fixes, modifications, and newer versions of ebuilds"}, "homepage": "https://github.com/jmesmon/overlay", "owner": [{"type": "person", "email": "jmesmon@gmail.com", "name": "Cody Schafer"}], "source": [{"type": "git", "uri": "git://github.com/jmesmon/overlay.git"}], "x-state": "BAD_CACHE", "x-timestamp": "2019-02-01 17:27:57 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 28}, "johnmh": {"quality": "experimental", "status": "unofficial", "name": "johnmh", "description": {"en": "Personal overlay of johnmh"}, "homepage": "https://cgit.gentoo.org/repo/user/johnmh.git/", "owner": [{"type": "person", "email": "johnmh@openblox.org", "name": "John Harris"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/user/johnmh.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/repo/user/johnmh"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/user/johnmh.git"}], "feed": ["https://cgit.gentoo.org/repo/user/johnmh.git/atom/"], "x-state": "GOOD", "x-timestamp": "2016-10-15 23:51:35 -0400\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "johu": {"quality": "experimental", "status": "official", "name": "johu", "description": {"en": "Johannes Huber developer overlay"}, "homepage": "https://cgit.gentoo.org/dev/johu.git", "owner": [{"type": "person", "email": "johu@gentoo.org", "name": "Johannes Huber"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/johu.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/johu.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/johu.git"}], "feed": ["https://cgit.gentoo.org/dev/johu.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-04-18 11:42:18 +0200\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "jollheef-overlay": {"quality": "experimental", "status": "unofficial", "name": "jollheef-overlay", "description": {"en": "Collection of various ebuilds"}, "homepage": "https://github.com/jollheef/jollheef-overlay", "owner": [{"type": "person", "email": "jollheef@riseup.net", "name": "Mikhail Klementyev"}], "source": [{"type": "git", "uri": "https://github.com/jollheef/jollheef-overlay.git"}, {"type": "git", "uri": "git://github.com/jollheef/jollheef-overlay.git"}, {"type": "git", "uri": "git@github.com:jollheef/jollheef-overlay.git"}], "feed": ["https://github.com/jollheef/jollheef-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2018-12-24 18:49:16 +0000\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 17}, "jorgicio": {"quality": "experimental", "status": "unofficial", "name": "jorgicio", "description": {"en": "Gentoo repository made by Jorgicio."}, "homepage": "https://github.com/jorgicio/jorgicio-gentoo", "owner": [{"type": "person", "email": "jpizarrocallejas@gmail.com", "name": "Jorge Pizarro Callejas"}], "source": [{"type": "git", "uri": "https://github.com/jorgicio/jorgicio-gentoo.git"}, {"type": "git", "uri": "git://github.com/jorgicio/jorgicio-gentoo.git"}, {"type": "git", "uri": "git@github.com:jorgicio/jorgicio-gentoo.git"}], "feed": ["https://github.com/jorgicio/jorgicio-gentoo/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-22 17:33:44 -0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 537}, "jsteward": {"quality": "experimental", "status": "unofficial", "name": "jsteward", "description": {"en": "jsteward's personal overlay"}, "homepage": "https://github.com/KireinaHoro/jsteward", "owner": [{"type": "person", "email": "i@jsteward.moe", "name": "KireinaHoro"}], "source": [{"type": "git", "uri": "https://github.com/KireinaHoro/jsteward.git"}, {"type": "git", "uri": "git://github.com/KireinaHoro/jsteward.git"}, {"type": "git", "uri": "git@github.com:KireinaHoro/jsteward.git"}], "feed": ["https://github.com/KireinaHoro/jsteward/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-01-25 14:30:10 +0800\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 20}, "junkdrawer": {"quality": "experimental", "status": "unofficial", "name": "junkdrawer", "description": {"en": "Various development tools, libraries, and patches not in Gentoo (yet)"}, "homepage": "https://github.com/doctaweeks/junkdrawer-overlay", "owner": [{"type": "person", "email": "dan@danweeks.net", "name": "Daniel M. Weeks"}], "source": [{"type": "git", "uri": "https://github.com/doctaweeks/junkdrawer-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2020-08-26 11:49:21 -0400\n", "x-openpgp-signed": "N", "x-masters": ["dlang", "gentoo"], "x-ebuild-count": 466}, "k_f": {"quality": "experimental", "status": "unofficial", "name": "k_f", "description": {"en": "K_F's personal overlay"}, "homepage": "http://git.sumptuouscapital.com/?p=portage-overlay.git;a=summary", "owner": [{"type": "person", "email": "k_f@gentoo.org", "name": "Kristian Fiskerstrand"}], "source": [{"type": "git", "uri": "git://git.sumptuouscapital.com/portage-overlay.git"}], "feed": ["http://git.sumptuouscapital.com/?p=portage-overlay.git;a=atom"], "x-state": "BAD_CACHE", "x-timestamp": "2018-10-15 22:19:22 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 47}, "kaa": {"quality": "experimental", "status": "unofficial", "name": "kaa", "description": {"en": "Kaa's experimental overlay"}, "homepage": "http://www.kaa.org.ua", "owner": [{"type": "person", "email": "oleg@kaa.org.ua", "name": "Oleg Kravchenko"}], "source": [{"type": "git", "uri": "https://github.com/Oleh-Kravchenko/kaa-layman.git"}], "x-state": "GOOD", "x-timestamp": "2020-10-22 22:38:40 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 25}, "kde": {"quality": "experimental", "status": "official", "name": "kde", "description": {"en": "Official KDE team's testing overlay."}, "homepage": "https://kde.gentoo.org", "owner": [{"type": "project", "email": "kde@gentoo.org", "name": "KDE Team"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/kde.git"}, {"type": "git", "uri": "https://github.com/gentoo/kde.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/kde.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/kde.git"}], "feed": ["https://cgit.gentoo.org/proj/kde.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-10-21 23:09:36 +0200\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 782}, "keepbot-overlay": {"quality": "experimental", "status": "unofficial", "name": "keepbot-overlay", "description": {"en": "keepbot's personal ebuild repository"}, "homepage": "https://github.com/d-k-ivanov/gentoo-overlay.git", "owner": [{"type": "person", "email": "d.k.ivanov@live.com", "name": "Dmitry Ivanov"}], "source": [{"type": "git", "uri": "https://github.com/d-k-ivanov/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/d-k-ivanov/gentoo-overlay.git"}], "feed": ["https://github.com/d-k-ivanov/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-07-03 15:17:56 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 7}, "khoverlay": {"quality": "experimental", "status": "unofficial", "name": "khoverlay", "description": {"en": "Khumba's overlay, mainly Haskell packages"}, "homepage": "https://gitlab.com/khumba/khoverlay", "owner": [{"type": "person", "email": "bog@khumba.net", "name": "Bryan Gardiner"}], "source": [{"type": "git", "uri": "https://gitlab.com/khumba/khoverlay.git"}, {"type": "git", "uri": "git+ssh://git@gitlab.com/khumba/khoverlay.git"}], "feed": ["https://gitlab.com/khumba/khoverlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-12 14:44:52 -0700\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 93}, "klondike": {"quality": "experimental", "status": "unofficial", "name": "klondike", "description": {"en": "Ebuilds made and modified by klondike, mainly sound and virtualization"}, "homepage": "https://cgit.gentoo.org/user/klondike.git/", "owner": [{"type": "person", "email": "klondike@gentoo.org", "name": "Francisco Blas Izquierdo Riera"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/klondike.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/klondike.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/klondike.git"}], "feed": ["https://cgit.gentoo.org/user/klondike.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-08-22 16:55:03 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 26}, "konsolebox": {"quality": "experimental", "status": "unofficial", "name": "konsolebox", "description": {"en": "konsolebox's overlay"}, "homepage": "https://github.com/konsolebox/overlay", "owner": [{"type": "person", "email": "konsolebox@gmail.com", "name": "konsolebox"}], "source": [{"type": "git", "uri": "https://github.com/konsolebox/overlay.git"}], "feed": ["https://github.com/konsolebox/overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-06-20 01:31:57 +0800\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 36}, "lacimarsik-overlay": {"quality": "experimental", "status": "unofficial", "name": "lacimarsik-overlay", "description": {"en": "Various patches and improvements on Gentoo Linux ebuilds"}, "homepage": "https://github.com/lacimarsik/lacimarsik-overlay", "owner": [{"type": "person", "email": "laci.marsik@gmail.com", "name": "Ladislav Marsik"}], "source": [{"type": "git", "uri": "https://github.com/lacimarsik/lacimarsik-overlay.git"}], "feed": ["https://github.com/lacimarsik/lacimarsik-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2017-05-25 13:39:59 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 1}, "lanodanOverlay": {"quality": "experimental", "status": "unofficial", "name": "lanodanOverlay", "description": {"en": "Additionnal goals; experiments, necromancy, portability, diversity, \u2026", "fr": "Buts additionnels; Exp\u00e9rimentations, n\u00e9cromancie, portabilit\u00e9e, diversit\u00e9e, \u2026"}, "homepage": "https://hacktivis.me/git/overlay", "owner": [{"type": "person", "email": "contact@hacktivis.me", "name": "Haelwenn (lanodan) Monnier"}], "source": [{"type": "git", "uri": "https://hacktivis.me/git/overlay.git"}, {"type": "git", "uri": "https://gitlab.com/lanodan/overlay.git"}, {"type": "git", "uri": "git://hacktivis.me/git/overlay.git"}, {"type": "git", "uri": "git://gitlab.com/lanodan/overlay.git"}], "feed": ["https://hacktivis.me/git/overlay/atom.xml"], "x-state": "GOOD", "x-timestamp": "2020-10-21 20:53:05 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo", "lua"], "x-ebuild-count": 255}, "laurentb": {"quality": "experimental", "status": "unofficial", "name": "laurentb", "description": {"en": "Various packages"}, "homepage": "https://github.com/laurentb/gentoo-overlay", "owner": [{"type": "person", "email": "laurent@bachelier.name", "name": "Laurent Bachelier"}], "source": [{"type": "git", "uri": "git://github.com/laurentb/gentoo-overlay.git"}, {"type": "git", "uri": "https://github.com/laurentb/gentoo-overlay.git"}], "feed": ["https://github.com/feeds/laurentb/commits/gentoo-overlay/master"], "x-state": "GOOD", "x-timestamp": "2020-03-27 20:38:31 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 71}, "leechcraft": {"quality": "experimental", "status": "unofficial", "name": "leechcraft", "description": {"en": "Overlay with LeechCraft ebuilds"}, "homepage": "https://github.com/0xd34df00d/leechcraft-overlay", "owner": [{"type": "person", "email": "0xd34df00d@gmail.com", "name": "Georg Rudoy"}], "source": [{"type": "git", "uri": "https://github.com/0xd34df00d/leechcraft-overlay.git"}, {"type": "git", "uri": "git://github.com/0xd34df00d/leechcraft-overlay.git"}], "feed": ["https://github.com/0xd34df00d/leechcraft-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-10 10:48:51 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 18}, "leio": {"quality": "experimental", "status": "official", "name": "leio", "description": {"en": "Mart Raudsepp developer overlay"}, "homepage": "https://cgit.gentoo.org/dev/leio.git", "owner": [{"type": "person", "email": "leio@gentoo.org", "name": "Mart Raudsepp"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/leio.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/leio.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/leio.git"}], "feed": ["https://cgit.gentoo.org/dev/leio.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-02-22 13:57:49 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 9}, "leonardohn": {"quality": "experimental", "status": "unofficial", "name": "leonardohn", "description": {"en": "leonardohn personal overlay"}, "homepage": "https://github.com/leonardohn/gentoo-overlay", "owner": [{"type": "person", "email": "leonardohn@null.net", "name": "Leonardo Neumann"}], "source": [{"type": "git", "uri": "https://github.com/leonardohn/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/leonardohn/gentoo-overlay.git"}], "feed": ["https://github.com/leonardohn/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-20 00:26:30 -0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 6}, "levenkov": {"quality": "experimental", "status": "unofficial", "name": "levenkov", "description": {"en": "levenkov personal overlay"}, "homepage": "https://cgit.gentoo.org/user/levenkov.git", "owner": [{"type": "person", "email": "artem@levenkov.org", "name": "Artem Levenkov"}], "source": [{"type": "git", "uri": "git://anongit.gentoo.org/user/levenkov.git"}, {"type": "git", "uri": "http://cgit.gentooexperimental.org/user/levenkov.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/levenkov.git"}], "x-state": "GOOD", "x-timestamp": "2015-02-20 13:13:52 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 3}, "librepilot": {"quality": "experimental", "status": "unofficial", "name": "librepilot", "description": {"en": "Librepilot flight control software overlay"}, "homepage": "https://github.com/paul-jewell/librepilot-overlay", "owner": [{"type": "person", "email": "paul@teulu.org", "name": "Paul Jewell"}], "source": [{"type": "git", "uri": "https://github.com/paul-jewell/librepilot-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/paul-jewell/librepilot-overlay.git"}], "feed": ["https://github.com/paul-jewell/librepilot-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-08-04 06:46:55 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 7}, "libressl": {"quality": "experimental", "status": "official", "name": "libressl", "description": {"en": "LibreSSL ebuilds testing repository"}, "homepage": "https://wiki.gentoo.org/wiki/Project:LibreSSL", "owner": [{"type": "project", "email": "libressl@gentoo.org"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/proj/libressl.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/proj/libressl.git"}], "feed": ["https://cgit.gentoo.org/repo/proj/libressl.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-07-16 10:53:29 +0300\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 11}, "linux-be": {"quality": "experimental", "status": "unofficial", "name": "linux-be", "description": {"en": "Port of Boot Environments for GNU/Linux"}, "homepage": "https://gitlab.com/linux-be", "owner": [{"type": "person", "email": "vitaut.bayaryn@gmail.com", "name": "Witaut Bajaryn"}, {"type": "person", "email": "a.mistewicz@gmail.com", "name": "Aleksander Mistewicz"}], "source": [{"type": "git", "uri": "https://gitlab.com/linux-be/overlay.git"}, {"type": "git", "uri": "git+ssh://git@gitlab.com/linux-be/overlay.git"}], "feed": ["https://gitlab.com/linux-be/overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-01-31 22:55:30 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 8}, "linuxunderground-overlay": {"quality": "experimental", "status": "unofficial", "name": "linuxunderground-overlay", "description": {"en": "experimental ebuilds from linuxunderground.be"}, "homepage": "https://github.com/linuxunderground/gentoo.overlay", "owner": [{"type": "person", "email": "vincent.hardy.be@gmail.com", "name": "linuxunderground"}], "source": [{"type": "git", "uri": "git://github.com/linuxunderground/gentoo.overlay.git"}, {"type": "git", "uri": "https://github.com/linuxunderground/gentoo.overlay.git"}], "x-state": "GOOD", "x-timestamp": "2020-10-17 20:56:12 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 154}, "linxon": {"quality": "experimental", "status": "unofficial", "name": "linxon", "description": {"en": "linxon personal overlay"}, "homepage": "https://github.com/linxon/gentoo-overlay", "owner": [{"type": "person", "email": "email@linxon.ru", "name": "linxon"}], "source": [{"type": "git", "uri": "https://github.com/linxon/gentoo-overlay.git"}], "feed": ["https://github.com/linxon/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-09-24 16:43:15 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 222}, "lisp": {"quality": "experimental", "status": "official", "name": "lisp", "description": {"en": "Common Lisp/Scheme development, recruitment and live overlay.\n    Support and feedback in `#gentoo-lisp' and via\n    `gentoo-lisp@lists.gentoo.org'."}, "homepage": "https://cgit.gentoo.org/proj/lisp.git", "owner": [{"type": "project", "email": "lisp@gentoo.org"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/lisp.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/lisp.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/lisp.git"}], "feed": ["https://cgit.gentoo.org/proj/lisp.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-07-03 13:34:17 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 382}, "lmiphay": {"quality": "experimental", "status": "unofficial", "name": "lmiphay", "description": {"en": "Personal overlay of Paul Healy"}, "homepage": "https://cgit.gentoo.org/user/lmiphay.git/", "owner": [{"type": "person", "email": "lmiphay@gmail.com", "name": "Paul Healy"}], "source": [{"type": "git", "uri": "git://anongit.gentoo.org/user/lmiphay.git"}], "x-state": "GOOD", "x-timestamp": "2020-10-14 10:31:22 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 279}, "lordvan": {"quality": "experimental", "status": "unofficial", "name": "lordvan", "description": {"en": "LordVan's Developer overlay"}, "homepage": "https://cgit.gentoo.org/dev/lordvan.git", "owner": [{"type": "person", "email": "lordvan@gentoo.org", "name": "Thomas Raschbacher"}], "source": [{"type": "git", "uri": "git://anongit.gentoo.org/dev/lordvan.git"}, {"type": "git", "uri": "https://anongit.gentoo.org/git/dev/lordvan.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/lordvan.git"}], "feed": ["https://cgit.gentoo.org/dev/lordvan.git/atom/"], "x-state": "BAD_CACHE", "x-timestamp": "2018-05-08 08:47:52 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 12}, "lto-overlay": {"quality": "experimental", "status": "unofficial", "name": "lto-overlay", "description": {"en": "A Portage configuration for O3, Graphite, and LTO system-wide"}, "homepage": "https://github.com/InBetweenNames/gentooLTO", "owner": [{"type": "person", "email": "lookatyouhacker@gmail.com", "name": "Shane Peelar"}], "source": [{"type": "git", "uri": "https://github.com/InBetweenNames/gentooLTO.git"}, {"type": "git", "uri": "git+ssh://git@github.com:InBetweenNames/gentooLTO.git"}], "feed": ["https://github.com/InBetweenNames/gentooLTO/commits/master"], "x-state": "GOOD", "x-timestamp": "2020-10-21 13:34:43 -0400\n", "x-openpgp-signed": "E", "x-masters": ["gentoo", "mv"], "x-ebuild-count": 10}, "lua": {"quality": "experimental", "status": "official", "name": "lua", "description": {"en": "Lua development overlay"}, "homepage": "https://cgit.gentoo.org/proj/lua.git/", "owner": [{"type": "person", "email": "rafaelmartins@gentoo.org", "name": "Rafael G. Martins"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/lua.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/lua.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/lua.git"}], "feed": ["https://cgit.gentoo.org/proj/lua.git/atom/"], "x-state": "GOOD", "x-timestamp": "2019-07-14 18:49:25 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 165}, "luke-jr": {"quality": "experimental", "status": "unofficial", "name": "luke-jr", "description": {"en": "Misc ebuilds by Luke-Jr"}, "homepage": "http://luke.dashjr.org", "owner": [{"type": "person", "email": "luke-jr+gentoobugs@utopios.org"}], "source": [{"type": "git", "uri": "https://scm.dashjr.org/scmroot/git/portage-overlays/luke-jr"}], "x-state": "GOOD", "x-timestamp": "2020-10-19 00:40:04 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 155}, "luxifer": {"quality": "experimental", "status": "unofficial", "name": "luxifer", "description": {"en": "Personal Overlay, contains stoken ebuilds"}, "homepage": "https://github.com/luxifr/olgentoo", "owner": [{"type": "person", "email": "dhertel@gmail.com", "name": "Dominik Keil"}], "source": [{"type": "git", "uri": "https://github.com/luxifr/olgentoo.git"}], "feed": ["https://github.com/luxifr/olgentoo/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2016-04-04 07:38:43 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "lxde-gtk3": {"quality": "experimental", "status": "unofficial", "name": "lxde-gtk3", "description": {"en": "lxde-gtk3 overlay"}, "homepage": "https://github.com/rilian-la-te/lxde-gtk3-overlay", "owner": [{"type": "person", "email": "ria.freelander@gmail.com", "name": "Konstantin"}], "source": [{"type": "git", "uri": "https://github.com/rilian-la-te/lxde-gtk3-overlay.git"}, {"type": "git", "uri": "git://github.com/rilian-la-te/lxde-gtk3-overlay.git"}, {"type": "git", "uri": "git@github.com:rilian-la-te/lxde-gtk3-overlay.git"}], "feed": ["https://github.com/rilian-la-te/lxde-gtk3-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2020-02-12 16:03:52 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 25}, "maekke": {"quality": "experimental", "status": "official", "name": "maekke", "description": {"en": "Markus Meier developer overlay"}, "homepage": "https://cgit.gentoo.org/dev/maekke.git", "owner": [{"type": "person", "email": "maekke@gentoo.org", "name": "Markus Meier"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/maekke.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/maekke.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/maekke.git"}], "feed": ["https://cgit.gentoo.org/dev/maekke.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-08-10 19:49:27 +0200\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 20}, "maggu2810-overlay": {"quality": "experimental", "status": "unofficial", "name": "maggu2810-overlay", "description": {"en": "maggu2810's Gentoo portage overlay."}, "homepage": "https://github.com/maggu2810/maggu2810-overlay", "owner": [{"type": "person", "email": "maggu2810@gmail.com", "name": "Markus Rathgeb"}], "source": [{"type": "git", "uri": "git://github.com/maggu2810/maggu2810-overlay.git"}, {"type": "git", "uri": "https://github.com/maggu2810/maggu2810-overlay.git"}], "feed": ["https://github.com/feeds/maggu2810/commits/maggu2810-overlay/master"], "x-state": "GOOD", "x-timestamp": "2020-08-29 18:09:14 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 38}, "mate-de-gentoo": {"quality": "experimental", "status": "unofficial", "name": "mate-de-gentoo", "description": {"en": "Updated ebuilds for mate-desktop environment"}, "homepage": "https://github.com/oz123/mate-de-gentoo", "owner": [{"type": "person", "email": "oz.tiram@gmail.com", "name": "OzTiram"}], "source": [{"type": "git", "uri": "https://github.com/oz123/mate-de-gentoo.git"}], "x-state": "GOOD", "x-timestamp": "2020-09-24 15:34:40 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 265}, "matrix": {"quality": "experimental", "status": "official", "name": "matrix", "description": {"en": "Overlay containing clients, servers and services for the Matrix protocol", "nl": "Overlay met clients, servers en services voor het Matrix protocol"}, "homepage": "https://github.com/gentoo/matrix", "owner": [{"type": "person", "email": "steils@gentoo.org", "name": "Stefan Strogin"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/proj/matrix.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/proj/matrix.git"}], "feed": ["https://cgit.gentoo.org/repo/proj/matrix.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-10-15 18:52:27 +0300\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 18}, "megacoffee": {"quality": "experimental", "status": "unofficial", "name": "megacoffee", "description": {"en": "Mixed ebuilds from various sources: self-written missing ebuilds, more current ebuilds, ebuilds that just needed a slight update from official portage, ebuilds others posted on Gentoo Bugzilla, ebuilds with added patches, old ebuilds that were removed from official portage etc.", "de": "Verschiedene ebuilds aus verschiedenen Quellen: selbsterstellte ebuilds, ebuilds mit geringf\u00fcgigen \u00c4nderungen, gegen\u00fcber dem aktuellen Baum, ebuilds aus Gentoos Bugzilla, ebuilds mit erweiterten patches, alte ebuilds die nicht mehr im offiziellen Baum existieren, etc."}, "homepage": "http://gentoo-overlay.megacoffee.net", "owner": [{"type": "person", "email": "gentoo-overlay@megacoffee.net", "name": "MegaCoffee"}], "source": [{"type": "git", "uri": "https://gitlab.megacoffee.net/gentoo-overlay/megacoffee-overlay.git"}], "feed": ["https://gitlab.megacoffee.net/gentoo-overlay/megacoffee-overlay/-/commits/master?format=atom"], "x-state": "GOOD", "x-timestamp": "2020-08-08 14:26:11 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo", "go-overlay"], "x-ebuild-count": 41}, "menelkir": {"quality": "experimental", "status": "unofficial", "name": "menelkir", "description": {"en": "Various ebuilds from different sources"}, "homepage": "https://gitlab.com/menelkir/gentoo-overlay", "owner": [{"type": "person", "email": "menelkir@itroll.org", "name": "Daniel Menelkir"}], "source": [{"type": "git", "uri": "https://gitlab.com/menelkir/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@gitlab.com/menelkir/gentoo-overlay.git"}], "feed": ["https://gitlab.com/menelkir/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-14 09:42:36 -0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 418}, "metahax": {"quality": "experimental", "status": "unofficial", "name": "metahax", "description": {"en": "Some ebuilds that didn't seem to exist yet."}, "homepage": "https://github.com/metafarion/metahax", "owner": [{"type": "person", "email": "miles@ctrl-shift.net", "name": "Miles V."}], "source": [{"type": "git", "uri": "https://github.com/metafarion/metahax.git"}], "feed": ["https://github.com/metafarion/metahax/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-09-06 14:32:04 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 16}, "mgorny": {"quality": "experimental", "status": "official", "name": "mgorny", "description": {"en": "Micha\u0142 G\u00f3rny developer overlay"}, "homepage": "https://cgit.gentoo.org/repo/dev/mgorny.git", "owner": [{"type": "person", "email": "mgorny@gentoo.org", "name": "Micha\u0142 G\u00f3rny"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/dev/mgorny.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/repo/dev/mgorny.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/dev/mgorny.git"}], "feed": ["https://cgit.gentoo.org/repo/dev/mgorny.git/atom/"], "x-state": "GOOD", "x-timestamp": "2019-12-15 05:36:44 +0100\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "milos-rs": {"quality": "experimental", "status": "unofficial", "name": "milos-rs", "description": {"en": "A pocket repository for few unavailable packages"}, "homepage": "https://github.com/milos-rs/gentoo-overlay", "owner": [{"type": "person", "email": "milos.om.dj@gmail.com", "name": "Milo\u0161 E. \u0110ur\u0111evi\u0107"}], "source": [{"type": "git", "uri": "https://github.com/milos-rs/gentoo-overlay.git"}], "feed": ["https://github.com/milos-rs/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-09-09 04:50:35 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "miramir": {"quality": "experimental", "status": "unofficial", "name": "miramir", "description": {"en": "Miramir repository"}, "homepage": "https://github.com/miramir/miramir-layman", "owner": [{"type": "person", "email": "gmiramir@gmail.com"}], "source": [{"type": "git", "uri": "https://github.com/miramir/miramir-layman.git"}], "feed": ["https://github.com/miramir/miramir-layman/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-15 16:35:57 +0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 47}, "mkeyoverlay": {"quality": "experimental", "status": "unofficial", "name": "mkeyoverlay", "description": {"en": "Overlay of Markus Knetschke"}, "homepage": "https://bitbucket.org/mknjc/mkeyoverlay", "owner": [{"type": "person", "email": "markus.knetschke@gmail.com", "name": "Markus Knetschke"}], "source": [{"type": "mercurial", "uri": "https://bitbucket.org/mknjc/mkeyoverlay"}, {"type": "mercurial", "uri": "ssh://hg@bitbucket.org/mknjc/mkeyoverlay"}], "feed": ["https://bitbucket.org/mknjc/mkeyoverlay/atom", "https://bitbucket.org/mknjc/mkeyoverlay/rss"], "x-timestamp-command": ["hg", "log", "-l", "1", "--template={date|isodatesec}"], "x-state": "SYNC_FAIL"}, "mklich": {"quality": "experimental", "status": "unofficial", "name": "mklich", "description": {"en": "For learning purposes."}, "homepage": "https://cgit.gentoo.org/user/mklich.git/", "owner": [{"type": "person", "email": "michal@michalklich.com", "name": "Micha\u0142 Klich"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/mklich.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/mklich.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/mklich.git"}], "feed": ["https://cgit.gentoo.org/user/mklich.git/atom/"], "x-state": "GOOD", "x-timestamp": "2015-09-24 07:21:41 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "mkr-overlay": {"quality": "experimental", "status": "unofficial", "name": "mkr-overlay", "description": {"en": "MalakymR's overlay"}, "homepage": "https://github.com/MalakymR/mkr-overlay", "owner": [{"type": "person", "email": "MalakymR@esdf.uk"}], "source": [{"type": "git", "uri": "https://github.com/MalakymR/mkr-overlay.git"}, {"type": "git", "uri": "git://github.com/MalakymR/mkr-overlay.git"}, {"type": "git", "uri": "git@github.com:MalakymR/mkr-overlay.git"}], "feed": ["https://github.com/MalakymR/mkr-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2019-03-12 11:24:30 +0000\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "moaxcp": {"quality": "experimental", "status": "unofficial", "name": "moaxcp", "description": {"en": "gentoo overlay for packages"}, "homepage": "https://github.com/moaxcp/moaxcp-gentoo-overlay", "owner": [{"type": "person", "email": "moaxcp@gmail.com", "name": "John Mercier"}], "source": [{"type": "git", "uri": "https://github.com/moaxcp/moaxcp-gentoo-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2015-08-11 18:15:55 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 1}, "moexiami": {"quality": "testing", "status": "unofficial", "name": "moexiami", "description": {"en": "Contains updated ebuilds (w/ more feature/control)\n      for packages in the Gentoo tree, latest version ebuilds and newpackages\n      not yet in the tree. Targeting high-quality for production use."}, "homepage": "https://github.com/Xiami2012/moexiami-ovl-dev", "owner": [{"type": "person", "email": "i@f2light.com", "name": "Xiami"}], "source": [{"type": "git", "uri": "https://github.com/Xiami2012/moexiami-ovl-sync.git"}, {"type": "git", "uri": "git+ssh://git@github.com/Xiami2012/moexiami-ovl-sync.git"}], "x-state": "GOOD", "x-timestamp": "2019-02-07 11:48:24 +0800\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 8}, "moltonel": {"quality": "experimental", "status": "unofficial", "name": "moltonel", "description": {"en": "Vincent de Phily's private overlay"}, "homepage": "https://github.com/vincentdephily/moltonel-ebuilds/", "owner": [{"type": "person", "email": "moltonel@gmail.com", "name": "Vincent de Phily"}], "source": [{"type": "git", "uri": "git://github.com/vincentdephily/moltonel-ebuilds.git"}], "x-state": "GOOD", "x-timestamp": "2020-10-19 22:18:57 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 12}, "monero": {"quality": "experimental", "status": "unofficial", "name": "monero", "description": {"en": "Ebuilds for the Monero cryptocurrency and\n      related software."}, "homepage": "https://github.com/gentoo-monero/gentoo-monero", "owner": [{"type": "person", "email": "matt@offtopica.uk", "name": "Matt Smith"}], "source": [{"type": "git", "uri": "https://github.com/gentoo-monero/gentoo-monero.git"}, {"type": "git", "uri": "git+ssh://git@github.com/gentoo-monero/gentoo-monero.git"}], "feed": ["https://github.com/gentoo-monero/gentoo-monero/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-19 09:21:08 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 14}, "mozilla": {"quality": "experimental", "status": "official", "name": "mozilla", "description": {"en": "New mozilla development that is not yet in tree"}, "homepage": "https://cgit.gentoo.org/proj/mozilla.git", "owner": [{"type": "project", "email": "mozilla@gentoo.org"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/mozilla.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/mozilla.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/mozilla.git"}], "feed": ["https://cgit.gentoo.org/proj/mozilla.git/atom/"], "x-state": "BAD_CACHE", "x-timestamp": "2020-05-03 19:48:39 +0200\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 6}, "mschiff": {"quality": "experimental", "status": "official", "name": "mschiff", "description": {"en": "Developer overlay"}, "homepage": "https://cgit.gentoo.org/dev/mschiff.git/", "owner": [{"type": "person", "email": "mschiff@gentoo.org", "name": "Marc Schiffbauer"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/mschiff.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/mschiff.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/mschiff.git"}], "feed": ["https://cgit.gentoo.org/dev/mschiff.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-09-08 01:02:40 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 9}, "multilib-portage": {"quality": "experimental", "status": "official", "name": "multilib-portage", "description": {"en": "multilib-overlay: emul-linux-x86 must die ;)"}, "homepage": "https://cgit.gentoo.org/proj/multilib-portage.git/", "owner": [{"type": "person", "email": "tommy@gentoo.org", "name": "Thomas Sachau"}], "source": [{"type": "git", "uri": "git://anongit.gentoo.org/proj/multilib-portage.git"}], "x-state": "GOOD", "x-timestamp": "2020-08-23 14:27:50 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 35}, "musl": {"quality": "experimental", "status": "official", "name": "musl", "description": {"en": "musl development overlay"}, "homepage": "https://cgit.gentoo.org/proj/musl.git/", "owner": [{"type": "project", "email": "musl@gentoo.org", "name": "Gentoo musl team"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/musl.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/musl.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/musl.git"}], "feed": ["https://cgit.gentoo.org/proj/musl.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-10-09 20:01:52 -0500\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 187}, "musl-clang": {"quality": "experimental", "status": "unofficial", "name": "musl-clang", "description": {"en": "musl clang/libc++ overlay"}, "homepage": "https://github.com/karlguy/musl-clang/", "owner": [{"type": "person", "email": "bjornpagen@gmail.com", "name": "Bjorn Pagen"}], "source": [{"type": "git", "uri": "https://github.com/karlguy/musl-clang"}, {"type": "git", "uri": "git://github.com/karlguy/musl-clang"}], "feed": ["https://github.com/karlguy/musl-clang/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2018-03-01 16:56:29 -0500\n", "x-openpgp-signed": "E", "x-masters": ["musl", "gentoo"], "x-ebuild-count": 1}, "mv": {"quality": "experimental", "status": "unofficial", "name": "mv", "description": {"en": "Ebuilds for packages not in the Gentoo tree\n        (lack of maintainer or too experimental) and live ebuilds\n        or extensions/bugfixes for packages in the tree"}, "homepage": "https://cgit.gentoo.org/user/mv.git", "owner": [{"type": "person", "email": "martin@mvath.de", "name": "Martin V\u00e4th"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/mv.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/mv.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/mv.git"}], "feed": ["https://cgit.gentoo.org/user/mv.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-10-17 18:03:14 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 162}, "mva": {"quality": "experimental", "status": "unofficial", "name": "mva", "description": {"en": "mva's sandbox overlay"}, "homepage": "https://github.com/msva/mva-overlay/", "owner": [{"type": "person", "email": "mva@gentoo.org", "name": "Vadim A. Misbakh-Soloviov"}], "source": [{"type": "git", "uri": "https://github.com/msva/mva-overlay"}, {"type": "git", "uri": "git://github.com/msva/mva-overlay"}], "feed": ["https://github.com/msva/mva-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2020-10-17 13:21:04 +0700\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 554}, "myov": {"quality": "experimental", "status": "unofficial", "name": "myov", "description": {"en": "My Overlay - custom Gentoo overlay from XGQT"}, "homepage": "https://gitlab.com/xgqt/myov.git", "owner": [{"type": "person", "name": "XGQT", "email": "xgqt@protonmail.com"}], "source": [{"type": "git", "uri": "https://gitlab.com/xgqt/myov.git"}, {"type": "git", "uri": "git+ssh://git@gitlab.com/xgqt/myov.git"}], "feed": ["https://gitlab.com/xgqt/myov/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-21 14:25:15 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 19}, "mysql": {"quality": "experimental", "status": "official", "name": "mysql", "description": {"en": "Gentoo MySQL overlay"}, "homepage": "https://cgit.gentoo.org/proj/mysql.git/", "owner": [{"type": "project", "email": "mysql-bugs@gentoo.org", "name": "MySQL Team"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/mysql.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/mysql.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/mysql.git"}], "feed": ["https://cgit.gentoo.org/proj/mysql.git/atom/"], "x-state": "GOOD", "x-timestamp": "2019-08-26 10:13:26 -0400\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 39}, "nelson-graca": {"quality": "experimental", "status": "unofficial", "name": "nelson-graca", "description": {"en": "Nelson Gra\u00e7a personal Overlay"}, "homepage": "https://github.com/nelsongraca/gentoo-overlay", "owner": [{"type": "person", "email": "graca.nelson@gmail.com", "name": "Nelson Gra\u00e7a"}], "source": [{"type": "git", "uri": "https://github.com/nelsongraca/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/nelsongraca/gentoo-overlay.git"}], "feed": ["https://github.com/nelsongraca/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-01 13:55:44 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 31}, "nest": {"quality": "experimental", "status": "unofficial", "name": "nest", "description": {"en": "Personal Gentoo overlay"}, "homepage": "https://github.com/SpiderX/portage-overlay", "owner": [{"type": "person", "email": "spiderx@spiderx.dp.ua", "name": "Vladimir Pavljuchenkov"}], "source": [{"type": "git", "uri": "https://github.com/SpiderX/portage-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/SpiderX/portage-overlay.git"}], "feed": ["https://github.com/SpiderX/portage-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-20 00:13:04 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 913}, "nextoo": {"quality": "experimental", "status": "unofficial", "name": "nextoo", "description": {"en": "Nextoo (\"Next Gentoo\") overlay"}, "homepage": "https://github.com/nextoo/portage-overlay", "owner": [{"type": "person", "email": "gentoo-bugzilla@aarontc.com", "name": "Aaron Ten Clay"}], "source": [{"type": "git", "uri": "https://github.com/nextoo/portage-overlay.git"}, {"type": "git", "uri": "git://github.com/nextoo/portage-overlay.git"}, {"type": "git", "uri": "git@github.com:nextoo/portage-overlay.git"}], "feed": ["https://github.com/nextoo/portage-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2017-02-20 15:50:13 -0800\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 21}, "nico": {"quality": "experimental", "status": "unofficial", "name": "nico", "description": {"en": "various ebuilds"}, "homepage": "https://cgit.gentoo.org/user/nico.git/", "owner": [{"type": "person", "email": "nico@overninethousand.de", "name": "Nico Suhl"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/nico.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/nico.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/nico.git"}], "feed": ["https://cgit.gentoo.org/user/nico.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-02-25 19:06:03 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 0}, "nix-guix": {"quality": "experimental", "status": "official", "name": "nix-guix", "description": {"en": "Overlay for nix anf guix functional package managers"}, "homepage": "https://github.com/trofi/nix-guix-gentoo", "owner": [{"type": "person", "email": "slyfox@gentoo.org", "name": "Sergei Trofimovich"}], "source": [{"type": "git", "uri": "https://github.com/trofi/nix-guix-gentoo.git"}], "feed": ["https://github.com/trofi/nix-guix-gentoo/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-07-08 21:39:25 +0100\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 9}, "np-hardass-overlay": {"quality": "experimental", "status": "unofficial", "name": "np-hardass-overlay", "description": {"en": "NP-Hardass's Personal Overlay"}, "homepage": "https://github.com/np-hardass/np-hardass-overlay", "owner": [{"type": "person", "email": "NP-Hardass@gentoo.org", "name": "NP-Hardass"}], "source": [{"type": "git", "uri": "https://github.com/np-hardass/np-hardass-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2020-02-03 17:47:49 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 38}, "nx": {"quality": "experimental", "status": "official", "name": "nx", "description": {"en": "Overlay for the NX/FreeNX packages for Gentoo."}, "homepage": "https://cgit.gentoo.org/proj/nx.git/", "owner": [{"type": "project", "email": "nx@gentoo.org"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/nx.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/nx.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/nx.git"}], "feed": ["https://cgit.gentoo.org/proj/nx.git/atom/"], "x-state": "GOOD", "x-timestamp": "2018-08-08 21:48:58 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "oboeverlay": {"quality": "experimental", "status": "unofficial", "name": "oboeverlay", "description": {"en": "ChrisOboe's overlay"}, "homepage": "https://github.com/ChrisOboe/oboeverlay", "owner": [{"type": "person", "email": "ChrisOboe@eml.cc", "name": "Chris Oboe"}], "source": [{"type": "git", "uri": "https://github.com/ChrisOboe/oboeverlay.git"}, {"type": "git", "uri": "git://github.com/ChrisOboe/oboeverlay.git"}, {"type": "git", "uri": "git@github.com:ChrisOboe/oboeverlay.git"}], "feed": ["https://github.com/ChrisOboe/oboeverlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2020-04-14 16:50:35 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 64}, "observer": {"quality": "experimental", "status": "unofficial", "name": "observer", "description": {"en": "Contains ebuilds I need, but not in Gentoo portage tree yet."}, "homepage": "https://github.com/meng89/observer", "owner": [{"type": "person", "email": "ObserverChan@gmail.com", "name": "Chen Meng"}], "source": [{"type": "git", "uri": "https://github.com/meng89/observer.git"}], "x-state": "GOOD", "x-timestamp": "2020-03-16 07:19:25 +0800\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 21}, "octave": {"quality": "experimental", "status": "unofficial", "name": "octave", "description": {"en": "octave-forge packages"}, "homepage": "https://github.com/rafaelmartins/octave-overlay", "owner": [{"type": "person", "email": "rafaelmartins@gentoo.org", "name": "Rafael G. Martins"}], "source": [{"type": "git", "uri": "https://github.com/rafaelmartins/octave-overlay.git"}, {"type": "git", "uri": "git://github.com/rafaelmartins/octave-overlay.git"}], "feed": ["https://github.com/rafaelmartins/octave-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2015-02-16 12:10:26 -0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 278}, "octopus": {"quality": "experimental", "status": "unofficial", "name": "octopus", "description": {"en": "Own and claimed ebuilds"}, "homepage": "https://github.com/Bfgeshka/octopus", "owner": [{"type": "person", "email": "bfg@derpy.ru", "name": "Bfgeshka"}], "source": [{"type": "git", "uri": "https://github.com/Bfgeshka/octopus.git"}], "feed": ["https://github.com/Bfgeshka/octopus/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-03-19 00:19:32 +0900\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 32}, "oddlama": {"quality": "experimental", "status": "unofficial", "name": "oddlama", "description": {"en": "oddlama's gentoo overlay"}, "homepage": "https://github.com/oddlama/overlay", "owner": [{"type": "person", "email": "overlay@oddlama.org", "name": "oddlama"}], "source": [{"type": "git", "uri": "https://github.com/oddlama/overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/oddlama/overlay.git"}], "feed": ["https://github.com/oddlama/overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-23 18:04:27 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 6}, "olifre": {"quality": "experimental", "status": "unofficial", "name": "olifre", "description": {"en": "Personal overlay of Oliver Freyermuth."}, "homepage": "https://github.com/olifre/olifre-portage", "owner": [{"type": "person", "email": "o.freyermuth@googlemail.com", "name": "Oliver Freyermuth"}], "source": [{"type": "git", "uri": "https://github.com/olifre/olifre-portage.git"}, {"type": "git", "uri": "git://github.com/olifre/olifre-portage.git"}, {"type": "git", "uri": "git@github.com:olifre/olifre-portage.git"}], "feed": ["https://github.com/olifre/olifre-portage/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-09-08 00:01:29 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 9}, "openclonk": {"quality": "experimental", "status": "unofficial", "name": "openclonk", "description": {"en": "Overlay for the game OpenClonk"}, "homepage": "http://www.openclonk.org/", "owner": [{"type": "person", "email": "gentoobug@liftm.de", "name": "Julius Michaelis"}], "source": [{"type": "git", "uri": "https://github.com/jcaesar/openclonk-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/jcaesar/openclonk-overlay.git"}], "feed": ["https://github.com/jcaesar/openclonk-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-07-30 23:29:47 +0900\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "openwrt": {"quality": "experimental", "status": "unofficial", "name": "openwrt", "description": {"en": "Overlay for network configuration packages found in OpenWRT"}, "homepage": "https://github.com/pavlix/gentoo-openwrt", "owner": [{"type": "person", "email": "pavlix@pavlix.net", "name": "Pavel \u0160imerda"}], "source": [{"type": "git", "uri": "https://github.com/pavlix/gentoo-openwrt"}], "x-state": "GOOD", "x-timestamp": "2016-09-14 11:46:36 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 8}, "optmzr": {"quality": "experimental", "status": "unofficial", "name": "optmzr", "description": {"en": "Overlay with some goodies not found elsewhere"}, "homepage": "https://github.com/optmzr/gentoo-overlay", "owner": [{"type": "person", "email": "william@optmzr.se", "name": "William Wennerstr\u00f6m"}], "source": [{"type": "git", "uri": "https://github.com/optmzr/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/optmzr/gentoo-overlay.git"}], "feed": ["https://github.com/optmzr/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-03-19 12:26:26 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 7}, "oubliette": {"quality": "experimental", "status": "unofficial", "name": "oubliette", "description": {"en": "personal overlay of forgotten ebuilds"}, "homepage": "https://github.com/nabbi/oubliette-overlay", "owner": [{"type": "person", "email": "nic@boet.cc", "name": "nic"}], "source": [{"type": "git", "uri": "https://github.com/nabbi/oubliette-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/nabbi/oubliette-overlay.git"}], "feed": ["https://github.com/nabbi/oubliette-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-20 22:54:34 -0500\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 48}, "palemoon": {"quality": "experimental", "status": "unofficial", "name": "palemoon", "description": {"en": "Unofficial Gentoo overlay for the Pale Moon (http://www.palemoon.org/) web browser."}, "homepage": "https://github.com/deu/palemoon-overlay", "owner": [{"type": "person", "email": "de@uio.re", "name": "deu"}], "source": [{"type": "git", "uri": "https://github.com/deu/palemoon-overlay.git"}, {"type": "git", "uri": "git://github.com/deu/palemoon-overlay.git"}, {"type": "git", "uri": "git@github.com:deu/palemoon-overlay.git"}], "feed": ["https://github.com/deu/palemoon-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-06 16:15:47 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 7}, "palmer": {"quality": "experimental", "status": "unofficial", "name": "palmer", "description": {"en": "User overlay"}, "homepage": "https://cgit.gentoo.org/user/palmer.git/", "owner": [{"type": "person", "email": "palmer@dabbelt.com", "name": "Palmer Dabbelt"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/palmer.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/palmer.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/palmer.git"}], "feed": ["https://cgit.gentoo.org/user/palmer.git/atom/"], "x-state": "BAD_CACHE", "x-timestamp": "2019-09-03 17:07:10 -0700\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 65}, "panther": {"quality": "experimental", "status": "unofficial", "name": "panther", "description": {"en": "Fun useful packages not found elsewhere"}, "homepage": "https://github.com/orangeturtle739/panther", "owner": [{"type": "person", "email": "swimgiraffe435@gmail.com", "name": "Jacob Glueck"}], "source": [{"type": "git", "uri": "https://github.com/orangeturtle739/panther.git"}, {"type": "git", "uri": "git+ssh://git@github.com/orangeturtle739/panther.git"}], "feed": ["https://github.com/orangeturtle739/panther/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-09-11 16:52:39 -0400\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 26}, "pdilung": {"quality": "experimental", "status": "unofficial", "name": "pdilung", "description": {"en": "Personal Gentoo overlay of Pavol Dilung"}, "homepage": "https://github.com/pdilung/gentoo-overlay/", "owner": [{"type": "person", "email": "pavol.dilung@gmail.com", "name": "Pavol Dilung"}], "source": [{"type": "git", "uri": "https://github.com/pdilung/gentoo-overlay.git"}, {"type": "git", "uri": "git://github.com/pdilung/gentoo-overlay.git"}, {"type": "git", "uri": "git@github.com:pdilung/gentoo-overlay.git"}], "feed": ["https://github.com/pdilung/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2016-09-25 19:28:59 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 1}, "pentoo": {"quality": "experimental", "status": "official", "name": "pentoo", "description": {"en": "The overlay contains new or updated security tools."}, "homepage": "http://www.pentoo.ch", "owner": [{"type": "person", "email": "zerochaos@gentoo.org"}], "source": [{"type": "git", "uri": "https://github.com/pentoo/pentoo-overlay.git"}, {"type": "git", "uri": "git://github.com/pentoo/pentoo-overlay.git"}, {"type": "git", "uri": "git@github.com:pentoo/pentoo-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2020-10-23 12:18:41 -0400\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 1249}, "perl-experimental": {"quality": "experimental", "status": "official", "name": "perl-experimental", "description": {"en": "Experimental ebuilds for Perl packages in Gentoo. Comments and\n    bugreports are welcome!"}, "homepage": "https://cgit.gentoo.org/proj/perl-overlay.git/", "owner": [{"type": "project", "email": "perl@gentoo.org", "name": "Perl Team"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/perl-overlay.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/perl-overlay.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/perl-overlay.git"}], "feed": ["https://cgit.gentoo.org/proj/perl-overlay.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-08-26 10:49:03 +1200\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 761}, "perl-experimental-snapshots": {"quality": "experimental", "status": "unofficial", "name": "perl-experimental-snapshots", "description": {"en": "Unofficial mirror of overlay \"perl-experimental\" with metadata cache"}, "homepage": "https://github.com/gentoo-perl/perl-experimental-snapshots", "owner": [{"type": "person", "email": "kentnl@gentoo.org", "name": "Kent Fredric"}], "source": [{"type": "git", "uri": "https://github.com/gentoo-perl/perl-experimental-snapshots.git"}, {"type": "git", "uri": "git://github.com/gentoo-perl/perl-experimental-snapshots.git"}], "feed": ["https://github.com/gentoo-perl/perl-experimental-snapshots/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-08-26 11:01:24 +1200\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 761}, "petkovich": {"quality": "experimental", "status": "unofficial", "name": "petkovich", "description": {"en": "Personal overlay of Jean-Christophe Petkovich"}, "homepage": "https://github.com/jcpetkovich/overlay-petkovich", "owner": [{"type": "person", "email": "jcpetkovich@gmail.com", "name": "Jean-Christophe Petkovich"}], "source": [{"type": "git", "uri": "https://github.com/jcpetkovich/overlay-petkovich.git"}, {"type": "git", "uri": "git://github.com/jcpetkovich/overlay-petkovich.git"}, {"type": "git", "uri": "git@github.com:jcpetkovich/overlay-petkovich.git"}], "feed": ["https://github.com/jcpetkovich/overlay-petkovich/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-09-07 20:32:33 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 58}, "pf4public": {"quality": "experimental", "status": "unofficial", "name": "pf4public", "description": {"en": "Personal overlay"}, "homepage": "https://github.com/PF4Public/gentoo-overlay", "owner": [{"type": "person", "email": "PF4Public@mail.ru", "name": "PF4Public"}], "source": [{"type": "git", "uri": "https://github.com/PF4Public/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/PF4Public/gentoo-overlay.git"}], "feed": ["https://github.com/PF4Public/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-22 10:59:22 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 56}, "pg_overlay": {"quality": "experimental", "status": "unofficial", "name": "pg_overlay", "description": {"en": "User overlay"}, "homepage": "https://gitlab.com/Perfect_Gentleman/PG_Overlay", "owner": [{"type": "person", "email": "perfect007gentleman@gmail.com", "name": "Perfect Gentleman"}], "source": [{"type": "git", "uri": "https://gitlab.com/Perfect_Gentleman/PG_Overlay.git"}], "feed": ["https://gitlab.com/Perfect_Gentleman/PG_Overlay/-/commits/master?format=atom"], "x-state": "GOOD", "x-timestamp": "2020-10-23 20:15:14 +0700\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 275}, "phackerlay": {"quality": "experimental", "status": "unofficial", "name": "phackerlay", "description": {"en": "Overlay for phackers"}, "homepage": "https://gitlab.phys-el.ru/ustinov/phackerlay", "owner": [{"type": "person", "email": "ustinov@phys-el.ru", "name": "Alexander B. Ustinov"}], "source": [{"type": "git", "uri": "https://gitlab.phys-el.ru/ustinov/phackerlay.git"}], "feed": ["https://gitlab.phys-el.ru/ustinov/phackerlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-08-05 19:18:50 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 50}, "pholthaus-overlay": {"quality": "experimental", "status": "unofficial", "name": "pholthaus-overlay", "description": {"en": "pholthaus' personal overlay"}, "homepage": "https://github.com/pholthau/pholthaus-overlay", "owner": [{"type": "person", "email": "patrick.holthaus@googlemail.com", "name": "Patrick Holthaus"}], "source": [{"type": "git", "uri": "https://github.com/pholthau/pholthaus-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/pholthau/pholthaus-overlay.git"}], "feed": ["https://github.com//pholthau/pholthaus-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2018-12-06 08:32:49 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 6}, "pica-pica": {"quality": "experimental", "status": "unofficial", "name": "pica-pica", "description": {"en": "Pica Pica ebuilds"}, "homepage": "https://github.com/antonsviridenko/pica-pica-gentoo-overlay", "owner": [{"type": "person", "email": "anton@picapica.im", "name": "Anton Sviridenko"}], "source": [{"type": "git", "uri": "https://github.com/antonsviridenko/pica-pica-gentoo-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2020-02-12 19:28:26 +0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "picarica-overlay": {"quality": "experimental", "status": "unofficial", "name": "picarica-overlay", "description": {"en": "Gentoo overlay for apps that dont exist or are unmaintaned"}, "homepage": "https://gitlab.com/picarica/picarica-overlay", "owner": [{"type": "person", "email": "dohaje@azet.sk", "name": "George Bucek"}], "source": [{"type": "git", "uri": "https://gitlab.com/picarica/picarica-overlay.git"}, {"type": "git", "uri": "git+ssh://git@gitlab.com/picarica/picarica-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2020-03-21 15:52:44 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 14}, "pigfoot": {"quality": "experimental", "status": "unofficial", "name": "pigfoot", "description": {"en": "Ebuilds for experimental packages and chinese patches"}, "homepage": "https://cgit.gentoo.org/user/pigfoot.git/", "owner": [{"type": "person", "email": "pigfoot@gmail.com", "name": "pigfoot"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/pigfoot.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/pigfoot.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/pigfoot.git"}], "feed": ["https://cgit.gentoo.org/user/pigfoot.git/atom/"], "x-state": "BAD_CACHE", "x-timestamp": "2020-06-03 17:44:22 +0800\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 68}, "piniverlay": {"quality": "experimental", "status": "unofficial", "name": "piniverlay", "description": {"en": "Various packages and patches for developers"}, "homepage": "https://github.com/pinicarus/gentoo-overlay", "owner": [{"type": "person", "email": "pini@tuxfamily.org", "name": "Pierre-Nicolas Clauss"}], "source": [{"type": "git", "uri": "https://github.com/pinicarus/gentoo-overlay.git"}, {"type": "git", "uri": "git://github.com/pinicarus/gentoo-overlay.git"}, {"type": "git", "uri": "git@github.com:pinicarus/gentoo-overlay.git"}], "feed": ["https://github.com/pinicarus/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-09-30 20:06:18 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "pinkbyte": {"quality": "experimental", "status": "official", "name": "pinkbyte", "description": {"en": "Pinkbyte's developer overlay"}, "homepage": "https://github.com/Pinkbyte/pinkbyte-overlay", "owner": [{"type": "person", "email": "pinkbyte@gentoo.org", "name": "Sergey Popov"}], "source": [{"type": "git", "uri": "https://github.com/Pinkbyte/pinkbyte-overlay.git"}, {"type": "git", "uri": "git://github.com/Pinkbyte/pinkbyte-overlay.git"}], "feed": ["https://github.com/Pinkbyte/pinkbyte-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-07-13 12:49:15 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 32}, "pixlra": {"quality": "experimental", "status": "unofficial", "name": "pixlra", "description": {"en": "Pixlra collaborative overlay"}, "homepage": "https://cgit.gentoo.org/user/carreira.git/", "owner": [{"type": "person", "email": "jfmcarreira@gmail.com", "name": "Joao Carreira"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/carreira.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/carreira.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/carreira.git"}, {"type": "git", "uri": "https://github.com/pixlra/pixlra-gentoo-overlay.git"}], "feed": ["https://cgit.gentoo.org/user/carreira.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-04-27 02:04:11 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 19}, "pkalin": {"quality": "experimental", "status": "unofficial", "name": "pkalin", "description": {"en": "My Gentoo overlay, somewhat regularly maintained"}, "homepage": "https://github.com/thinrope/pkalin", "owner": [{"type": "person", "email": "kalin@ThinRope.net", "name": "Kalin KOZHUHAROV"}], "source": [{"type": "git", "uri": "https://github.com/thinrope/pkalin.git"}, {"type": "git", "uri": "git+ssh://git@github.com/thinrope/pkalin.git"}], "feed": ["https://github.com/thinrope/pkalin/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-09-24 01:20:19 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 97}, "plex-overlay": {"quality": "experimental", "status": "unofficial", "name": "plex-overlay", "description": {"en": "Personal overlay of comio containing Plex related ebuilds"}, "homepage": "https://github.com/comio/plex-overlay", "owner": [{"type": "person", "email": "luigi.mantellini@gmail.com", "name": "Luigi Mantellini"}], "source": [{"type": "git", "uri": "https://github.com/comio/plex-overlay.git"}], "feed": ["https://github.com/comio/plex-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-23 19:21:42 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 13}, "poly-c": {"quality": "experimental", "status": "official", "name": "poly-c", "description": {"en": "Polynomial-C's overlay"}, "homepage": "http://www.gentoofan.org/gentoo/", "owner": [{"type": "person", "email": "polynomial-c@gentoo.org", "name": "Lars Wendler"}], "source": [{"type": "rsync", "uri": "rsync://rsync.gentoofan.org/poly-c"}], "x-state": "GOOD", "x-timestamp": "2020-09-20 19:47:04.000000000 +0000\n", "x-masters": ["gentoo"], "x-ebuild-count": 294}, "posativ": {"quality": "experimental", "status": "unofficial", "name": "posativ", "description": {"en": "Overlay of Martin Zimmermann"}, "homepage": "https://github.com/posativ/overlay", "owner": [{"type": "person", "email": "info@posativ.org", "name": "Martin Zimmermann"}], "source": [{"type": "git", "uri": "https://github.com/posativ/overlay.git"}, {"type": "git", "uri": "git://github.com/posativ/overlay.git"}, {"type": "git", "uri": "git@github.com:posativ/overlay.git"}], "feed": ["https://github.com/posativ/overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2017-12-14 22:17:44 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 20}, "powerman": {"quality": "experimental", "status": "unofficial", "name": "powerman", "description": {"en": "Overlay of Alex Efros"}, "homepage": "https://github.com/powerman/powerman-overlay", "owner": [{"type": "person", "email": "powerman-asdf@yandex.ru", "name": "Alex Efros"}], "source": [{"type": "git", "uri": "https://github.com/powerman/powerman-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2020-09-27 22:54:30 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 125}, "ppfeufer-gentoo-overlay": {"quality": "experimental", "status": "unofficial", "name": "ppfeufer-gentoo-overlay", "description": {"en": "ppfeufer's personal overlay."}, "homepage": "https://github.com/ppfeufer/gentoo-overlay", "owner": [{"type": "person", "email": "info@ppfeufer.de", "name": "Peter Pfeufer"}], "source": [{"type": "git", "uri": "https://github.com/ppfeufer/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/ppfeufer/gentoo-overlay.git"}], "feed": ["https://github.com/ppfeufer/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-21 17:39:22 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 37}, "pross": {"quality": "experimental", "status": "unofficial", "name": "pross", "description": {"en": "Up to date ck-sources"}, "homepage": "https://github.com/Pross/pross-overlay", "owner": [{"type": "person", "email": "pross@pross.org.uk", "name": "Simon Prosser"}], "source": [{"type": "git", "uri": "https://github.com/Pross/pross-overlay.git"}], "feed": ["https://github.com/Pross/pross-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2020-10-21 17:25:35 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 10}, "pyfa": {"quality": "experimental", "status": "unofficial", "name": "pyfa", "description": {"en": "Newest versions of Pyfa (Python fitting assistant for EVE Online)"}, "homepage": "https://github.com/ZeroPointEnergy/gentoo-pyfa-overlay", "owner": [{"type": "person", "email": "a.zuber@gmx.ch", "name": "Andreas Zuber"}], "source": [{"type": "git", "uri": "https://github.com/ZeroPointEnergy/gentoo-pyfa-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/ZeroPointEnergy/gentoo-pyfa-overlay.git"}], "feed": ["https://github.com/ZeroPointEnergy/gentoo-pyfa-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-13 22:55:07 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 6}, "python": {"quality": "experimental", "status": "official", "name": "python", "description": {"en": "Python project repository"}, "homepage": "https://cgit.gentoo.org/proj/python.git/", "owner": [{"type": "project", "email": "python@gentoo.org", "name": "Gentoo Python project"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/python.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/python.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/python.git"}], "feed": ["https://cgit.gentoo.org/proj/python.git/atom/"], "x-state": "GOOD", "x-timestamp": "2019-12-29 12:56:32 +0100\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "qemu-init": {"quality": "experimental", "status": "official", "name": "qemu-init", "description": {"en": "qemu init script and tools"}, "homepage": "https://cgit.gentoo.org/dev/qiaomuf.git/", "owner": [{"type": "person", "email": "dolsen@gentoo.org", "name": "Brian Dolbec"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/kvm-tools.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/kvm-tools.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/kvm-tools.git"}], "feed": ["https://cgit.gentoo.org/proj/kvm-tools.git/atom/"], "x-state": "GOOD", "x-timestamp": "2016-03-23 10:53:56 -0700\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 1}, "qgp": {"quality": "experimental", "status": "unofficial", "name": "qgp", "description": {"en": "qgp overlay (mostly computing and HEP)"}, "homepage": "https://github.com/qgp/gentoo-qgp", "owner": [{"type": "person", "email": "qgp1024@gmail.com", "name": "Jochen Klein"}], "source": [{"type": "git", "uri": "https://github.com/qgp/gentoo-qgp.git"}, {"type": "git", "uri": "git://github.com/qgp/gentoo-qgp.git"}, {"type": "git", "uri": "git+ssh://git@github.com:qgp/gentoo-qgp.git"}], "feed": ["https://github.com/qgp/gentoo-qgp/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-08-11 19:51:33 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 14}, "qownnotes-overlay": {"quality": "experimental", "status": "unofficial", "name": "qownnotes-overlay", "description": {"en": "QOwnNotes overlay"}, "homepage": "http://www.qownnotes.org", "owner": [{"type": "person", "email": "patrizio@bekerle.com", "name": "Patrizio Bekerle"}], "source": [{"type": "git", "uri": "https://github.com/qownnotes/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/qownnotes/gentoo-overlay.git"}], "feed": ["https://github.com/qownnotes/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-22 18:04:52 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 512}, "qsx": {"quality": "experimental", "status": "unofficial", "name": "qsx", "description": {"en": "qsx\u2019 ebuilds"}, "homepage": "https://github.com/qsuscs/gentoo-overlay", "owner": [{"type": "person", "email": "qsx@chaotikum.eu", "name": "Thomas Schneider"}], "source": [{"type": "git", "uri": "https://github.com/qsuscs/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/qsuscs/gentoo-overlay.git"}], "feed": ["https://github.com/qsuscs/gentoo-overlay/commits/main.atom"], "x-state": "GOOD", "x-timestamp": "2020-07-18 15:15:16 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 17}, "qt": {"quality": "experimental", "status": "official", "name": "qt", "description": {"en": "Official testing overlay for Qt and related packages, provided\n    by Gentoo's Qt team. Contains ebuilds for Qt4 and Qt5 prereleases and live ebuilds,\n    plus various (non-KDE) applications and utilities that use Qt."}, "homepage": "https://github.com/gentoo/qt", "owner": [{"type": "project", "email": "qt@gentoo.org", "name": "Qt Team"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/qt.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/qt.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/qt.git"}], "feed": ["https://cgit.gentoo.org/proj/qt.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-10-18 22:44:21 +0200\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 86}, "quarks": {"quality": "experimental", "status": "unofficial", "name": "quarks", "description": {"en": "Quarks's overlay; needful things around Security, Penetration Testing and gaming"}, "homepage": "https://git.zero-downtime.net/quark", "owner": [{"type": "person", "email": "it@startux.de", "name": "Stefan Reimer"}], "source": [{"type": "git", "uri": "https://git.zero-downtime.net/quark/quarks.git"}], "x-state": "GOOD", "x-timestamp": "2020-09-26 10:33:21 -0700\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 41}, "qwin-overlay": {"quality": "experimental", "status": "unofficial", "name": "qwin-overlay", "description": {"en": "Gentoo overlay with some patched packages."}, "homepage": "https://github.com/Flex1911/", "owner": [{"type": "person", "email": "dedsa2002@gmail.com"}], "source": [{"type": "git", "uri": "git://github.com/Flex1911/qwin-overlay.git"}], "x-state": "BAD_CACHE", "x-timestamp": "2017-10-21 16:11:32 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 6}, "rafaelmartins": {"quality": "experimental", "status": "official", "name": "rafaelmartins", "description": {"en": "Rafael Martins' Gentoo overlay"}, "homepage": "https://github.com/rafaelmartins/gentoo-overlay", "owner": [{"type": "person", "email": "rafaelmartins@gentoo.org", "name": "Rafael G. Martins"}], "source": [{"type": "git", "uri": "https://github.com/rafaelmartins/gentoo-overlay.git"}, {"type": "git", "uri": "git://github.com/rafaelmartins/gentoo-overlay.git"}], "feed": ["https://github.com/rafaelmartins/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2015-10-19 20:09:06 -0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 27}, "rage": {"quality": "experimental", "status": "unofficial", "name": "rage", "description": {"en": "rage's personal overlay"}, "homepage": "https://gitlab.com/oxr463/overlay", "owner": [{"type": "person", "email": "ramage.lucas@protonmail.com", "name": "Lucas Ramage"}], "source": [{"type": "git", "uri": "https://gitlab.com/oxr463/overlay.git"}, {"type": "git", "uri": "git+ssh://git@gitlab.com/oxr463/overlay.git"}], "feed": ["https://gitlab.com/oxr463/overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-06-24 07:51:33 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 48}, "raiagent": {"quality": "experimental", "status": "unofficial", "name": "raiagent", "description": {"en": "Well-documented ebuilds en-route to a bandersnatch near you"}, "homepage": "https://github.com/leycec/raiagent", "owner": [{"type": "person", "email": "leycec@gmail.com", "name": "Cecil Curry"}], "source": [{"type": "git", "uri": "https://github.com/leycec/raiagent"}, {"type": "git", "uri": "git://github.com/leycec/raiagent.git"}], "x-state": "GOOD", "x-timestamp": "2020-10-10 22:37:43 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 114}, "rasdark": {"quality": "experimental", "status": "unofficial", "name": "rasdark", "description": {"en": "rasdark personal overlay"}, "homepage": "https://github.com/rasdark/overlay", "owner": [{"type": "person", "email": "andrew.senik@gmail.com", "name": "Andrey Senik"}], "source": [{"type": "git", "uri": "https://github.com/rasdark/overlay"}, {"type": "git", "uri": "git://github.com/rasdark/overlay.git"}], "x-state": "GOOD", "x-timestamp": "2020-08-20 13:33:03 +0300\n", "x-openpgp-signed": "N", "x-masters": ["calculate", "gentoo"], "x-ebuild-count": 71}, "raw": {"quality": "experimental", "status": "unofficial", "name": "raw", "description": {"en": "some raw stuff"}, "homepage": "https://github.com/mahatma-kaganovich/raw", "owner": [{"type": "person", "email": "mahatma@eu.by", "name": "Denis Kaganovich (aka Dzianis Kahanovich)"}], "source": [{"type": "git", "uri": "https://github.com/mahatma-kaganovich/raw.git"}], "feed": ["https://github.com/mahatma-kaganovich/raw/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2020-10-23 06:12:17 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 57}, "rdnetto-overlay": {"quality": "experimental", "status": "unofficial", "name": "rdnetto-overlay", "description": {"en": "Personal Overlay"}, "homepage": "https://github.com/rdnetto/rdnetto-overlay", "owner": [{"type": "person", "email": "rdnetto@gmail.com", "name": "Reuben D'Netto"}], "source": [{"type": "git", "uri": "https://github.com/rdnetto/rdnetto-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com:rdnetto/rdnetto-overlay.git"}], "feed": ["https://github.com/rdnetto/rdnetto-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-09 17:40:49 +1100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 94}, "reagentoo": {"quality": "experimental", "status": "unofficial", "name": "reagentoo", "description": {"en": "reagentoo's overlay"}, "homepage": "https://github.com/reagentoo/gentoo-overlay", "owner": [{"type": "person", "email": "reagentoo@gmail.com"}], "source": [{"type": "git", "uri": "https://github.com/reagentoo/gentoo-overlay.git"}, {"type": "git", "uri": "git://github.com/reagentoo/gentoo-overlay.git"}, {"type": "git", "uri": "git@github.com:reagentoo/gentoo-overlay.git"}], "feed": ["https://github.com/reagentoo/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-07 19:00:25 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 80}, "rebutia": {"quality": "experimental", "status": "unofficial", "name": "rebutia", "description": {"en": "Rebutia overlay"}, "homepage": "https://cgit.gentoo.org/user/rebutia.git/", "owner": [{"type": "person", "email": "ps@twin.jikos.cz", "name": "Pavel Sanda"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/rebutia.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/rebutia.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/rebutia.git"}], "feed": ["https://cgit.gentoo.org/user/rebutia.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-08-15 22:02:08 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 28}, "regina-gentoo": {"quality": "experimental", "status": "unofficial", "name": "regina-gentoo", "description": {"en": "Regina packages for Gentoo"}, "homepage": "https://github.com/WPettersson/regina-gentoo/", "owner": [{"type": "person", "email": "william@ewpettersson.se", "name": "William Pettersson"}], "source": [{"type": "git", "uri": "git://github.com/WPettersson/regina-gentoo.git"}], "feed": ["https://github.com/WPettersson/regina-gentoo/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-01-19 11:59:50 +0000\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 3}, "ricerlay": {"quality": "experimental", "status": "unofficial", "name": "ricerlay", "description": {"en": "Overlay for ricing enthusiasts"}, "homepage": "https://github.com/azahi/ricerlay", "owner": [{"type": "person", "email": "azahi@teknik.io", "name": "azahi"}], "source": [{"type": "git", "uri": "https://github.com/azahi/ricerlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/azahi/ricerlay.git"}], "feed": ["https://github.com/azahi/ricerlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-10 13:24:39 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 82}, "rich0": {"quality": "experimental", "status": "official", "name": "rich0", "description": {"en": "Rich0's developer overlay"}, "homepage": "https://github.com/rich0/rich0-overlay", "owner": [{"type": "person", "email": "rich0@gentoo.org", "name": "Richard Freeman"}], "source": [{"type": "git", "uri": "git://github.com/rich0/rich0-overlay.git"}], "feed": ["https://github.com/rich0/rich0-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-08-24 09:39:37 -0400\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 56}, "ring-overlay": {"quality": "experimental", "status": "unofficial", "name": "ring-overlay", "description": {"en": "Ring is free software for universal communication which respects freedoms and privacy of its users."}, "homepage": "https://github.com/stefan-langenmaier/ring-overlay", "owner": [{"type": "person", "email": "stefan.langenmaier+gentoo@gmail.com", "name": "Stefan Langenmaier"}], "source": [{"type": "git", "uri": "https://github.com/stefan-langenmaier/ring-overlay.git"}, {"type": "git", "uri": "git://github.com/stefan-langenmaier/ring-overlay.git"}, {"type": "git", "uri": "git@github.com:stefan-langenmaier/ring-overlay.git"}], "feed": ["https://github.com/stefan-langenmaier/ring-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-04-17 10:23:59 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 55}, "rion": {"quality": "experimental", "status": "unofficial", "name": "rion", "description": {"en": "Russian overlay with a some patched and specific\n    software"}, "homepage": "https://github.com/rion-overlay", "owner": [{"type": "person", "email": "rion4ik@gmail.com", "name": "Sergey Ilinykh"}], "source": [{"type": "git", "uri": "https://github.com/rion-overlay/rion-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/rion-overlay/rion-overlay.git"}], "feed": ["https://github.com/rion-overlay/rion-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-21 10:37:12 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 113}, "riru": {"quality": "experimental", "status": "unofficial", "name": "riru", "description": {"en": "Home overlay for development, patches and live ebuilds", "ru": "\u0414\u043e\u043c\u0430\u0448\u043d\u0438\u0439 \u043e\u0432\u0435\u0440\u043b\u0435\u0439 \u0434\u043b\u044f \u0440\u0430\u0437\u0440\u0430\u0431\u043e\u0442\u043a\u0438, \u043f\u0430\u0442\u0447\u0435\u0439 \u0438 \u043b\u0430\u0439\u0432 \u0435\u0431\u0438\u043b\u0434\u043e\u0432"}, "homepage": "https://github.com/pkulev/riru", "owner": [{"type": "person", "email": "kulyov.pavel@gmail.com", "name": "Pavel Kulyov"}], "source": [{"type": "git", "uri": "https://github.com/pkulev/riru.git"}, {"type": "git", "uri": "git://github.com/pkulev/riru.git"}, {"type": "git", "uri": "git@github.com:pkulev/riru.git"}], "feed": ["https://github.com/pkulev/riru/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-02-11 13:37:10 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 23}, "robert7k": {"quality": "experimental", "status": "unofficial", "name": "robert7k", "description": {"en": "personal overlay of robert7k"}, "homepage": "https://github.com/robert7k/gentoo-overlay", "owner": [{"type": "person", "email": "gentoo.2019@r123.de"}], "source": [{"type": "git", "uri": "https://github.com/robert7k/gentoo-overlay.git"}], "feed": ["https://github.com/robert7k/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-22 23:42:07 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 40}, "ros-overlay": {"quality": "experimental", "status": "unofficial", "name": "ros-overlay", "description": {"en": "Ebuilds for the Robot Operating System (ROS)."}, "homepage": "https://github.com/ros/ros-overlay", "owner": [{"type": "person", "email": "wayne@neverfear.org"}], "source": [{"type": "git", "uri": "git://github.com/ros/ros-overlay.git"}], "feed": ["https://github.com/ros/ros-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-07-19 10:32:45 -0400\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 7439}, "roslin": {"quality": "experimental", "status": "unofficial", "name": "roslin", "description": {"en": "This is roslin, my small overlay. Enjoy! (:"}, "homepage": "https://gitlab.com/roslin-uberlay/roslin", "owner": [{"type": "person", "email": "szarpaj@grubelek.pl", "name": "Piotr Szymaniak"}, {"type": "person", "email": "mziab@o2.pl", "name": "Micha\u0142 Zi\u0105bkowski"}], "source": [{"type": "git", "uri": "https://gitlab.com/roslin-uberlay/roslin.git"}], "x-state": "GOOD", "x-timestamp": "2020-02-10 23:34:19 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 206}, "rpm": {"quality": "experimental", "status": "unofficial", "name": "rpm", "description": {"en": "Overlay for RPM packagers targeting Fedora, EPEL, CentOS and similar distros"}, "homepage": "https://github.com/pavlix/gentoo-rpm", "owner": [{"type": "person", "email": "pavlix@pavlix.net", "name": "Pavel \u0160imerda"}], "source": [{"type": "git", "uri": "https://github.com/pavlix/gentoo-rpm.git"}], "x-state": "GOOD", "x-timestamp": "2017-02-16 11:49:24 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 37}, "ruby": {"quality": "experimental", "status": "official", "name": "ruby", "description": {"en": "Experimental ebuilds from the Ruby edge."}, "homepage": "https://cgit.gentoo.org/proj/ruby", "owner": [{"type": "project", "email": "ruby@gentoo.org", "name": "Ruby Team"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/ruby-overlay.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/ruby-overlay.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/ruby-overlay.git"}], "feed": ["https://cgit.gentoo.org/proj/ruby-overlay.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-09-15 09:39:31 +0200\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 7}, "rukruk": {"quality": "experimental", "status": "unofficial", "name": "rukruk", "description": {"en": "some packages not found in other overlays, for issues create ticket in github"}, "homepage": "https://github.com/Atoms/rukruk", "owner": [{"type": "person", "email": "atoms@tups.lv", "name": "Aivars Sterns"}], "source": [{"type": "git", "uri": "https://github.com/Atoms/rukruk.git"}, {"type": "git", "uri": "git://github.com/Atoms/rukruk.git"}, {"type": "git", "uri": "git@github.com:Atoms/rukruk.git"}], "feed": ["https://github.com/Atoms/rukruk/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2019-04-05 10:07:56 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 20}, "rust": {"quality": "experimental", "status": "unofficial", "name": "rust", "description": {"en": "rust modules and tools"}, "homepage": "https://github.com/gentoo/gentoo-rust", "owner": [{"type": "project", "email": "rust@gentoo.org", "name": "Rust Team"}], "source": [{"type": "git", "uri": "https://github.com/gentoo/gentoo-rust.git"}, {"type": "git", "uri": "git://github.com/gentoo/gentoo-rust.git"}, {"type": "git", "uri": "git@github.com:gentoo/gentoo-rust.git"}], "feed": ["https://github.com/gentoo/gentoo-rust/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-09 15:21:38 +0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 55}, "sabayon": {"quality": "experimental", "status": "unofficial", "name": "sabayon", "description": {"en": "Sabayon ebuilds that could be upstreamed to\n    Gentoo (or just being useful for Gentoo users as well):\n    hot fixes, ebuild updates, etc.\n    For Sabayon-only ebuilds, please use the sabayon-distro overlay.\n    Bugs to http://bugs.sabayon.org"}, "homepage": "http://sabayon.org", "owner": [{"type": "person", "email": "joost.ruis@sabayonlinux.org"}], "source": [{"type": "git", "uri": "git://github.com/Sabayon/for-gentoo.git"}], "feed": ["https://github.com/feeds/Sabayon/commits/for-gentoo/master"], "x-state": "GOOD", "x-timestamp": "2020-10-20 22:52:15 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 211}, "sabayon-distro": {"quality": "experimental", "status": "unofficial", "name": "sabayon-distro", "description": {"en": "Sabayon related ebuilds such as artwork, kernel binaries,\n    split packages, etc.\n    Bugs to http://bugs.sabayon.org"}, "homepage": "http://sabayon.org", "owner": [{"type": "person", "email": "joost.ruis@sabayonlinux.org"}], "source": [{"type": "git", "uri": "git://github.com/Sabayon/sabayon-distro.git"}], "feed": ["https://github.com/feeds/Sabayon/commits/sabayon-distro/master"], "x-state": "GOOD", "x-timestamp": "2020-10-21 19:55:41 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 663}, "sage-on-gentoo": {"quality": "experimental", "status": "unofficial", "name": "sage-on-gentoo", "description": {"en": "Split ebuilds for the Sage computer algebra system"}, "homepage": "https://github.com/cschwan/sage-on-gentoo", "owner": [{"type": "person", "email": "frp.bissey@gmail.com", "name": "Francois Bissey"}], "source": [{"type": "git", "uri": "git://github.com/cschwan/sage-on-gentoo.git"}, {"type": "git", "uri": "https://github.com/cschwan/sage-on-gentoo.git"}], "feed": ["https://github.com/feeds/cschwan/commits/sage-on-gentoo/master"], "x-state": "GOOD", "x-timestamp": "2020-10-21 14:26:00 +1300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 252}, "salfter": {"quality": "experimental", "status": "unofficial", "name": "salfter", "description": {"en": "Scott Alfter's ebuilds"}, "homepage": "https://gitlab.com/salfter/portage", "owner": [{"type": "person", "email": "scott@alfter.us", "name": "Scott Alfter"}], "source": [{"type": "git", "uri": "https://gitlab.com/salfter/portage.git"}], "x-state": "BAD_CACHE", "x-timestamp": "2020-10-06 13:00:29 -0700\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 187}, "sam_c": {"quality": "experimental", "status": "unofficial", "name": "sam_c", "description": {"en": "sam_c's personal overlay"}, "homepage": "https://github.com/thesamesam/overlay", "owner": [{"type": "person", "email": "sam@cmpct.info", "name": "Sam James"}], "source": [{"type": "git", "uri": "https://github.com/thesamesam/overlay"}, {"type": "git", "uri": "git+ssh://git@github.com/thesamesam/overlay.git"}], "feed": ["https://github.com/thesamesam/overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-08-21 14:41:15 +0000\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 8}, "sarnex-overlay": {"quality": "experimental", "status": "unofficial", "name": "sarnex-overlay", "description": {"en": "Sarnex's personal overlay"}, "homepage": "https://github.com/sarnex/sarnex-overlay.git", "owner": [{"type": "person", "email": "commendsarnex@gmail.com", "name": "Nick Sarnie"}], "source": [{"type": "git", "uri": "https://github.com/sarnex/sarnex-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/sarnex/sarnex-overlay.git"}], "feed": ["https://github.com/sarnex/sarnex-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2017-10-01 00:04:35 -0400\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "sattvik": {"quality": "experimental", "status": "unofficial", "name": "sattvik", "description": {"en": "sattvik's overlay with personalized bug fixes and tweaks"}, "homepage": "https://cgit.gentoo.org/user/sattvik.git/", "owner": [{"type": "person", "email": "gentoo@sattvik.com", "name": "Daniel Solano Gomez"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/sattvik.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/sattvik.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/sattvik.git"}], "feed": ["https://cgit.gentoo.org/user/sattvik.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-10-16 11:15:26 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 37}, "science": {"quality": "experimental", "status": "official", "name": "science", "description": {"en": "The Gentoo Science Overlay is intended as a place to work\n    outside of the main portage tree on experimental ebuilds. Our aim is to\n    increase the rate of development of scientific packages for Gentoo, but\n    ebuilds in this repository are by their very nature more experimental. If\n    you wish to use them you should be willing to help test and report\n    bugs. For contribution read https://wiki.gentoo.org/wiki/Project:Science/Contributing\n    "}, "homepage": "https://wiki.gentoo.org/wiki/Project:Science", "owner": [{"type": "project", "email": "sci@gentoo.org", "name": "sci"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/sci.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/sci.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/sci.git"}, {"type": "git", "uri": "https://github.com/gentoo-science/sci.git"}, {"type": "git", "uri": "git://github.com/gentoo-science/sci.git"}, {"type": "git", "uri": "git@github.com:gentoo-science/sci.git"}], "feed": ["https://cgit.gentoo.org/proj/sci.git/atom/", "https://github.com/gentoo-science/sci/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-22 13:04:16 +0000\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 845}, "scrill": {"quality": "experimental", "status": "unofficial", "name": "scrill", "description": {"en": "Some admin tools"}, "homepage": "https://github.com/scrill/scrill-overlay", "owner": [{"type": "person", "email": "sergey.zhuga@gmail.com", "name": "Sergey Zhuga"}], "source": [{"type": "git", "uri": "git://github.com/scrill/scrill-overlay.git"}], "feed": ["https://github.com/scrill/scrill-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-06-26 15:18:11 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 25}, "seadep": {"quality": "experimental", "status": "unofficial", "name": "seadep", "description": {"en": "just a few ebuilds, I couldn't find elsewhere"}, "homepage": "https://github.com/Keepco/gentoo-overlay-seadep", "owner": [{"type": "person", "email": "Rasmus.thomsen@live.de", "name": "Rasmus Thomsen"}], "source": [{"type": "git", "uri": "https://github.com/Keepco/gentoo-overlay-seadep.git"}, {"type": "git", "uri": "git://github.com/Keepco/gentoo-overlay-seadep.git"}, {"type": "git", "uri": "git@github.com:Keepco/gentoo-overlay-seadep.git"}], "feed": ["https://github.com/Keepco/gentoo-overlay-seadep/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2017-11-25 19:15:52 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 6}, "seden": {"quality": "experimental", "status": "unofficial", "name": "seden", "description": {"en": "Experimental ebuilds that are still unmaintained"}, "homepage": "https://cgit.gentoo.org/user/seden.git/", "owner": [{"type": "person", "email": "yamakuzure@gmx.net", "name": "Sven Eden"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/seden.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/seden.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/seden.git"}], "feed": ["https://cgit.gentoo.org/user/seden.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-10-20 13:53:17 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 41}, "seeds": {"quality": "experimental", "status": "unofficial", "name": "seeds", "description": {"en": "Overlay for Gentoo from vonavi"}, "homepage": "https://github.com/vonavi/", "owner": [{"type": "person", "email": "ivvl82@gmail.com", "name": "Vladimir Ivanov"}], "source": [{"type": "git", "uri": "git://github.com/vonavi/seeds.git"}], "feed": ["ttps://github.com/vonavi/seeds/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2019-03-23 08:55:45 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 25}, "setkeh": {"quality": "experimental", "status": "unofficial", "name": "setkeh", "description": {"en": "setkeh maintained ebuilds"}, "homepage": "https://github.com/setkeh/Portage-Overlay", "owner": [{"type": "person", "email": "setkeh@gmail.com", "name": "James (setkeh) Griffis"}], "source": [{"type": "git", "uri": "https://github.com/setkeh/Portage-Overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com:setkeh/Portage-Overlay.git"}], "feed": ["https://github.com/setkeh/Portage-Overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-05-19 14:57:04 +1000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "sevcsik": {"quality": "experimental", "status": "unofficial", "name": "sevcsik", "description": {"en": "Mainly cryptocurrency/blockchain related ebuilds"}, "homepage": "https://github.com/sevcsik/overlay", "owner": [{"type": "person", "email": "sevcsik@sevdev.hu", "name": "Andras Sevcsik"}], "source": [{"type": "git", "uri": "https://github.com/sevcsik/overlay.git"}, {"type": "git", "uri": "git://github.com/sevcsik/overlay.git"}, {"type": "git", "uri": "git@github.com:sevcsik/overlay.git"}], "feed": ["https://github.com/sevcsik/overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2017-08-29 00:43:36 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 8}, "sft": {"quality": "experimental", "status": "unofficial", "name": "sft", "description": {"en": "SFT Technologies gentoo overlay"}, "homepage": "https://github.com/SFTtech/gentoo-overlay", "owner": [{"type": "person", "email": "jj@stusta.net", "name": "Jonas Jelten"}], "source": [{"type": "git", "uri": "https://github.com/SFTtech/gentoo-overlay.git"}], "feed": ["https://github.com/SFTtech/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-21 15:39:54 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 30}, "sgs": {"quality": "experimental", "status": "unofficial", "name": "sgs", "description": {"en": "Simeon Simeonov's personal Gentoo overlay"}, "homepage": "https://github.com/blackm0re/sgs-overlay", "owner": [{"type": "person", "email": "sgs@pichove.org", "name": "Simeon Simeonov"}], "source": [{"type": "git", "uri": "https://github.com/blackm0re/sgs-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com:blackm0re/sgs-overlay.git"}], "feed": ["https://github.com/blackm0re/sgs-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-07 10:10:58 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "shnurise": {"quality": "experimental", "status": "unofficial", "name": "shnurise", "description": {"en": "packages for mono environment and other", "ru": "\u043f\u0430\u043a\u0435\u0442\u044b \u0434\u043b\u044f \u043c\u043e\u043d\u043e \u0438 \u0440\u0430\u0437\u043d\u043e\u0435 \u043f\u0440\u043e\u0447\u0435\u0435"}, "homepage": "https://github.com/ArsenShnurkov/shnurise", "owner": [{"type": "person", "email": "Arsen.Shnurkov@gmail.com", "name": "Arsen Shnurkov"}], "source": [{"type": "git", "uri": "https://github.com/ArsenShnurkov/shnurise.git"}, {"type": "git", "uri": "git://github.com/ArsenShnurkov/shnurise.git"}, {"type": "git", "uri": "git@github.com:ArsenShnurkov/shnurise.git"}], "feed": ["https://github.com/ArsenShnurkov/shnurise/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2020-10-23 18:33:19 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 39}, "sihnon": {"quality": "experimental", "status": "unofficial", "name": "sihnon", "description": {"en": "optiz0r's sihnon overlay"}, "homepage": "https://github.com/optiz0r/gentoo-overlay", "owner": [{"type": "person", "email": "optiz0r@gmail.com", "name": "optiz0r"}], "source": [{"type": "git", "uri": "https://github.com/optiz0r/gentoo-overlay.git"}, {"type": "git", "uri": "git://github.com/optiz0r/gentoo-overlay.git"}, {"type": "git", "uri": "git@github.com:optiz0r/gentoo-overlay.git"}], "feed": ["https://github.com/optiz0r/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-09-21 21:47:58 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 10}, "simonvanderveldt": {"quality": "experimental", "status": "unofficial", "name": "simonvanderveldt", "description": {"en": "Personal Gentoo overlay focused on music production and engineering applications"}, "homepage": "https://github.com/simonvanderveldt/simonvanderveldt-overlay", "owner": [{"type": "person", "email": "simon.vanderveldt@gmail.com", "name": "Simon van der Veldt"}], "source": [{"type": "git", "uri": "https://github.com/simonvanderveldt/simonvanderveldt-overlay.git"}, {"type": "git", "uri": "git://github.com/simonvanderveldt/simonvanderveldt-overlay.git"}, {"type": "git", "uri": "git@github.com:simonvanderveldt/simonvanderveldt-overlay.git"}], "feed": ["https://github.com/simonvanderveldt/simonvanderveldt-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-03-20 18:00:48 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 10}, "sinustrom": {"quality": "experimental", "status": "unofficial", "name": "sinustrom", "description": {"en": "Sinustrom Gentoo Overlay"}, "homepage": "https://github.com/zpuskas/sinustrom-gentoo-overlay", "owner": [{"type": "person", "email": "zoltan@sinustrom.info", "name": "Zoltan Puskas"}], "source": [{"type": "git", "uri": "https://github.com/zpuskas/sinustrom-gentoo-overlay.git"}, {"type": "git", "uri": "git://github.com/zpuskas/sinustrom-gentoo-overlay.git"}, {"type": "git", "uri": "git@github.com:zpuskas/sinustrom-gentoo-overlay.git"}], "feed": ["https://github.com/zpuskas/sinustrom-gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-11 18:42:56 -0700\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 15}, "sk-overlay": {"quality": "experimental", "status": "unofficial", "name": "sk-overlay", "description": {"en": "The Scriptkitties overlay for additional ebuilds"}, "homepage": "https://github.com/scriptkitties/overlay", "owner": [{"type": "person", "email": "p.spek@tyil.work", "name": "Patrick Spek"}], "source": [{"type": "git", "uri": "https://github.com/scriptkitties/overlay.git"}, {"type": "git", "uri": "git://github.com/scriptkitties/overlay.git"}, {"type": "git", "uri": "git@github.com:scriptkitties/overlay.git"}], "feed": ["https://github.com/scriptkitties/overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-07-23 10:01:16 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 51}, "slonko": {"quality": "experimental", "status": "unofficial", "name": "slonko", "description": {"en": "Personal portage overlay"}, "homepage": "https://slonko.net/portage", "owner": [{"type": "person", "email": "marcin.deranek@slonko.net", "name": "Marcin Deranek"}], "source": [{"type": "git", "uri": "https://slonko.net/git/portage"}], "feed": ["https://slonko.net/git/portage/atom/"], "x-state": "GOOD", "x-timestamp": "2020-10-17 17:10:05 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 22}, "slyfox": {"quality": "experimental", "status": "official", "name": "slyfox", "description": {"en": "slyfox's ebuild den"}, "homepage": "https://github.com/trofi/slyfox-gentoo", "owner": [{"type": "person", "email": "slyfox@gentoo.org", "name": "Sergei Trofimovich"}], "source": [{"type": "git", "uri": "https://github.com/trofi/slyfox-gentoo"}], "feed": ["https://github.com/trofi/slyfox-gentoo/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-03 21:54:55 +0100\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 22}, "snapd": {"quality": "experimental", "status": "unofficial", "name": "snapd", "description": {"en": "ebuilds for canaonicals snapd"}, "homepage": "https://github.com/zigford/snapd", "owner": [{"type": "person", "email": "zigford@gmail.com", "name": "Jesse Harris"}], "source": [{"type": "git", "uri": "https://github.com/zigford/snapd.git"}], "feed": ["https://github.com/zigford/snapd/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-19 21:12:07 +1000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 3}, "soft": {"quality": "experimental", "status": "unofficial", "name": "soft", "description": {"en": "Soft's personal overlay for miscellaneous ebuilds"}, "homepage": "https://bitbucket.org/Soft/overlay", "owner": [{"type": "person", "email": "samuel.lauren@iki.fi", "name": "Samuel Laur\u00e9n"}], "source": [{"type": "mercurial", "uri": "https://bitbucket.org/Soft/overlay"}], "x-timestamp-command": ["hg", "log", "-l", "1", "--template={date|isodatesec}"], "x-state": "SYNC_FAIL"}, "sogo-connector": {"quality": "experimental", "status": "unofficial", "name": "sogo-connector", "description": {"en": "SOGO connector overlay"}, "homepage": "https://cgit.gentoo.org/repo/user/sogo-connector.git/", "owner": [{"type": "person", "email": "gentoo@posteo.de", "name": "Fabian K\u00f6ster"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/user/sogo-connector.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/repo/user/sogo-connector.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/user/sogo-connector.git"}], "feed": ["https://cgit.gentoo.org/repo/user/sogo-connector.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-04-02 11:14:25 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 1}, "soltys": {"quality": "experimental", "status": "unofficial", "name": "soltys", "description": {"en": "tools usefull on CTFs and things that aren't in the portage tristelune"}, "homepage": "https://github.com/soltysek/soltys-overlay", "owner": [{"type": "person", "email": "bgo@soltys.info", "name": "Krzysztof Koro\u015bcik"}], "source": [{"type": "git", "uri": "https://github.com/soltysek/soltys-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/soltysek/soltys-overlay.git"}], "feed": ["https://github.com/soltysek/soltys-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-09-14 10:47:46 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 31}, "sorinp": {"quality": "experimental", "status": "unofficial", "name": "sorinp", "description": {"en": "A collection of ebuilds that are missing or outdated or incomplete on the Gentoo portage official repository.."}, "homepage": "https://github.com/psihozefir/sorinp-gentoo-overlay", "owner": [{"type": "person", "email": "sorin.panca@gmail.com", "name": "Sorin Panca"}], "source": [{"type": "git", "uri": "https://github.com/psihozefir/sorinp-gentoo-overlay"}], "x-state": "GOOD", "x-timestamp": "2016-11-20 14:11:02 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "sorrow": {"quality": "experimental", "status": "unofficial", "name": "sorrow", "description": {"en": "Ebuilds for some wayland-related software and some other stuff"}, "homepage": "https://gitlab.com/eternal-sorrow/gentoo-local", "owner": [{"type": "person", "email": "sergamena@inbox.ru", "name": "sorrow"}], "source": [{"type": "git", "uri": "https://gitlab.com/eternal-sorrow/gentoo-local.git"}, {"type": "git", "uri": "git+ssh://git@gitlab.com:eternal-sorrow/gentoo-local.git"}], "feed": ["https://gitlab.com/eternal-sorrow/gentoo-local/commits/master?format=atom"], "x-state": "GOOD", "x-timestamp": "2020-10-22 13:50:44 +1000\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 17}, "sortsmill": {"quality": "experimental", "status": "unofficial", "name": "sortsmill", "description": {"en": "Personal overlay of Barry Schwartz for font projects"}, "homepage": "https://bitbucket.org/sortsmill/sortsmill-gentoo-overlay", "owner": [{"type": "person", "email": "chemoelectric@chemoelectric.org", "name": "Barry Schwartz"}], "source": [{"type": "mercurial", "uri": "https://bitbucket.org/sortsmill/sortsmill-gentoo-overlay"}, {"type": "mercurial", "uri": "ssh://hg@bitbucket.org/sortsmill/sortsmill-gentoo-overlay"}], "feed": ["https://bitbucket.org/sortsmill/sortsmill-gentoo-overlay/atom", "https://bitbucket.org/sortsmill/sortsmill-gentoo-overlay/rss"], "x-timestamp-command": ["hg", "log", "-l", "1", "--template={date|isodatesec}"], "x-state": "SYNC_FAIL"}, "spikyatlinux": {"quality": "experimental", "status": "unofficial", "name": "spikyatlinux", "description": {"en": "Here are some of my own or modified ebuilds. Also some of them I've found in the web."}, "homepage": "https://github.com/spikyatlinux/ebuilds_for_gentoo", "owner": [{"type": "person", "email": "spikyatlinux@gmail.com", "name": "SpikyAtLinux"}], "source": [{"type": "git", "uri": "https://github.com/spikyatlinux/ebuilds_for_gentoo.git"}], "x-state": "GOOD", "x-timestamp": "2020-10-21 20:39:57 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 34}, "sping": {"quality": "experimental", "status": "official", "name": "sping", "description": {"en": "Overlay of Gentoo developer Sebastian Pipping; for issues, please open tickets at GitHub"}, "homepage": "https://github.com/hartwork/gentoo-overlay-sping", "owner": [{"type": "person", "email": "sping@gentoo.org", "name": "Sebastian Pipping"}], "source": [{"type": "git", "uri": "https://github.com/hartwork/gentoo-overlay-sping.git"}, {"type": "git", "uri": "git://github.com/hartwork/gentoo-overlay-sping.git"}, {"type": "git", "uri": "git@github.com:hartwork/gentoo-overlay-sping.git"}], "feed": ["https://github.com/hartwork/gentoo-overlay-sping/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2017-03-18 17:47:33 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 3}, "squeezebox": {"quality": "experimental", "status": "unofficial", "name": "squeezebox", "description": {"en": "Packages for the Squeezebox network audio player from Logitech"}, "homepage": "https://cgit.gentoo.org/user/squeezebox.git/", "owner": [{"type": "person", "email": "stuart@hickinbottom.com", "name": "Stuart Hickinbottom"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/squeezebox.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/squeezebox.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/squeezebox.git"}], "feed": ["https://cgit.gentoo.org/user/squeezebox.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-01-08 18:40:26 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 16}, "src_prepare-overlay": {"quality": "experimental", "status": "unofficial", "name": "src_prepare-overlay", "description": {"en": "src_prepare group's Gentoo overlay"}, "homepage": "https://gitlab.com/src_prepare/src_prepare-overlay.git", "owner": [{"type": "person", "name": "XGQT", "email": "xgqt@protonmail.com"}], "source": [{"type": "git", "uri": "https://gitlab.com/src_prepare/src_prepare-overlay.git"}, {"type": "git", "uri": "git+ssh://git@gitlab.com/src_prepare/src_prepare-overlay.git"}], "feed": ["https://gitlab.com/src_prepare/src_prepare-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2020-10-23 16:40:04 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 185}, "ssnb": {"quality": "experimental", "status": "unofficial", "name": "ssnb", "description": {"en": "Gentoo repository made by ssnb"}, "homepage": "https://cgit.gentoo.org/repo/user/ssnb.git/", "owner": [{"type": "person", "email": "samuelbernardo.mail@gmail.com", "name": "Samuel Bernardo"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/user/ssnb.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/repo/user/ssnb"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/user/ssnb.git"}], "feed": ["https://cgit.gentoo.org/repo/user/ssnb.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-10-18 21:07:18 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 365}, "sspreitz": {"quality": "experimental", "status": "unofficial", "name": "sspreitz", "description": {"en": "My Gentoo repository and ebuilds"}, "homepage": "https://github.com/sspreitzer/gentoo-repo", "owner": [{"type": "person", "email": "sspreitz@redhat.com", "name": "Sascha Spreitzer"}], "source": [{"type": "git", "uri": "https://github.com/sspreitzer/gentoo-repo.git"}, {"type": "git", "uri": "git+ssh://git@github.com/sspreitzer/gentoo-repo.git"}, {"type": "git", "uri": "git@github.com:sspreitzer/gentoo-repo.git"}], "feed": ["https://github.com/sspreitzer/gentoo-repo/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-09-24 10:35:30 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 24}, "steam-overlay": {"quality": "experimental", "status": "unofficial", "name": "steam-overlay", "description": {"en": "Gentoo overlay for Valve's Steam client and Steam-based games"}, "homepage": "https://github.com/anyc/steam-overlay", "owner": [{"type": "person", "email": "dev@kicherer.org", "name": "Mario Kicherer"}], "source": [{"type": "git", "uri": "https://github.com/anyc/steam-overlay.git"}, {"type": "git", "uri": "git://github.com/anyc/steam-overlay.git"}, {"type": "git", "uri": "git@github.com:anyc/steam-overlay.git"}], "feed": ["https://github.com/anyc/steam-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-11 12:34:45 +0100\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 12}, "stefantalpalaru": {"quality": "experimental", "status": "unofficial", "name": "stefantalpalaru", "description": {"en": "Gentoo overlay with ebuilds by Stefan Talpalaru that are not in the tree"}, "homepage": "https://github.com/stefantalpalaru/gentoo-overlay", "owner": [{"type": "person", "email": "stefantalpalaru@yahoo.com", "name": "Stefan Talpalaru"}], "source": [{"type": "git", "uri": "https://github.com/stefantalpalaru/gentoo-overlay.git"}, {"type": "git", "uri": "git://github.com/stefantalpalaru/gentoo-overlay.git"}, {"type": "git", "uri": "git@github.com:stefantalpalaru/gentoo-overlay.git"}], "feed": ["https://github.com/stefantalpalaru/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-18 21:05:01 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 967}, "stha09": {"quality": "experimental", "status": "unofficial", "name": "stha09", "description": {"en": "stha09's personal overlay"}, "homepage": "https://github.com/stha09/gpo-stha09", "owner": [{"type": "person", "email": "sultan@gentoo.org", "name": "Stephan Hartmann"}], "source": [{"type": "git", "uri": "https://github.com/stha09/gpo-stha09.git"}, {"type": "git", "uri": "git://github.com:stha09/gpo-stha09.git"}, {"type": "git", "uri": "git@github.com:stha09/gpo-stha09.git"}], "feed": ["https://github.com/stha09/gpo-stha09/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-17 10:33:55 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 7}, "stowe-verlay": {"quality": "experimental", "status": "unofficial", "name": "stowe-verlay", "description": {"en": "Few things that have either broken elsewhere or fallen unmaintained, such as winexe, a source-based version of logitech media server, a patched version of dansguardian"}, "homepage": "https://github.com/mwstowe/stowe-verlay", "owner": [{"type": "person", "email": "mstowe@chicago.us.mensa.org", "name": "Michael Stowe"}], "source": [{"type": "git", "uri": "https://github.com/mwstowe/stowe-verlay.git"}], "feed": ["https://github.com/mwstowe/stowe-verlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-19 18:49:47 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 48}, "strohel": {"quality": "experimental", "status": "unofficial", "name": "strohel", "description": {"en": "strohel's overlay"}, "homepage": "https://github.com/strohel/strohel-overlay", "owner": [{"type": "person", "email": "matej@laitl.cz", "name": "Mat\u011bj Laitl"}], "source": [{"type": "git", "uri": "https://strohel@github.com/strohel/strohel-overlay.git"}, {"type": "git", "uri": "git://github.com/strohel/strohel-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com:strohel/strohel-overlay.git"}], "feed": ["https://github.com/strohel/strohel-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-02-15 11:27:29 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "stuff": {"quality": "experimental", "status": "unofficial", "name": "stuff", "description": {"en": "stuff"}, "homepage": "https://github.com/istitov/stuff", "owner": [{"type": "person", "email": "iohann.s.titov@gmail.com"}], "source": [{"type": "git", "uri": "https://github.com/istitov/stuff.git"}], "feed": ["https://github.com/istitov/stuff/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-15 10:58:49 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 286}, "sublime-text": {"quality": "experimental", "status": "unofficial", "name": "sublime-text", "description": {"en": "Collection of ebuilds to install Sublime Text 2 or Sublime Text 3"}, "homepage": "https://github.com/DamnWidget/sublime-text", "owner": [{"type": "person", "email": "oscar.campos@member.fsf.org", "name": "Oscar Campos"}], "source": [{"type": "git", "uri": "https://github.com/DamnWidget/sublime-text.git"}, {"type": "git", "uri": "git://github.com/DamnWidget/sublime-text.git"}, {"type": "git", "uri": "git@github.com:DamnWidget/sublime-text.git"}], "feed": ["https://github.com/DamnWidget/sublime-text/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2019-04-08 13:16:10 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 19}, "superposition": {"quality": "experimental", "status": "unofficial", "name": "superposition", "description": {"en": "Phil's overlay"}, "homepage": "https://cgit.gentoo.org/repo/user/superposition.git/", "owner": [{"type": "person", "email": "Phil_miess@yahoo.com", "name": "Philip Miess"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/user/superposition.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/repo/user/superposition.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/user/superposition.git"}], "feed": ["https://cgit.gentoo.org/repo/user/superposition.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-04-24 06:36:55 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 61}, "swegener": {"quality": "experimental", "status": "official", "name": "swegener", "description": {"en": "This overlay contains some experimental stuff, but mostly\n    stuff I quickly wrote an ebuild for or grabed it from bugzilla and did not\n    have the time to commit it to the official tree or do not consider it ready\n    for it."}, "homepage": "https://dev.gentoo.org/~swegener/", "owner": [{"type": "person", "email": "swegener@gentoo.org"}], "source": [{"type": "rsync", "uri": "rsync://rsync.gentoo.stealer.net/swegener-overlay/"}], "x-state": "GOOD", "x-timestamp": "2018-11-19 10:32:42.000000000 +0000\n", "x-masters": ["gentoo"], "x-ebuild-count": 33}, "tabinol": {"quality": "experimental", "status": "unofficial", "name": "tabinol", "description": {"en": "Tabinol personal overlay with no special focus"}, "homepage": "https://github.com/Tabinol/tabinol-overlay", "owner": [{"type": "person", "email": "mblanchet@fastmail.com", "name": "Michel Blanchet"}], "source": [{"type": "git", "uri": "https://github.com/Tabinol/tabinol-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/Tabinol/tabinol-overlay.git"}], "feed": ["https://github.com/Tabinol/tabinol-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2019-02-25 22:30:56 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 6}, "tamiko": {"quality": "experimental", "status": "unofficial", "name": "tamiko", "description": {"en": "Developer overlay"}, "homepage": "https://cgit.gentoo.org/repo/dev/tamiko.git/", "owner": [{"type": "person", "email": "tamiko@gentoo.org", "name": "Matthias Maier"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/dev/tamiko.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/repo/dev/tamiko.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/dev/tamiko.git"}], "feed": ["https://cgit.gentoo.org/repo/dev/tamiko.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-05-18 02:59:08 -0500\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 9}, "tante": {"quality": "experimental", "status": "unofficial", "name": "tante", "description": {"en": "Overlay of tante"}, "homepage": "https://github.com/tante/overlay", "owner": [{"type": "person", "email": "tante@tante.cc"}], "source": [{"type": "git", "uri": "https://github.com/tante/overlay.git"}], "x-state": "GOOD", "x-timestamp": "2017-02-26 14:13:35 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "tarantool": {"quality": "experimental", "status": "unofficial", "name": "tarantool", "description": {"en": "Tarantool Gentoo Overlay"}, "homepage": "https://github.com/tarantool/gentoo-overlay", "owner": [{"type": "person", "email": "totktonada.ru@gmail.com", "name": "Alexander Turenko"}], "source": [{"type": "git", "uri": "https://github.com/tarantool/gentoo-overlay.git"}, {"type": "git", "uri": "git://github.com/tarantool/gentoo-overlay.git"}, {"type": "git", "uri": "git@github.com:tarantool/gentoo-overlay.git"}], "feed": ["https://github.com/tarantool/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-09-14 10:50:49 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 49}, "tastytea": {"quality": "experimental", "status": "unofficial", "name": "tastytea", "description": {"en": "Overlay of tastytea"}, "homepage": "https://schlomp.space/tastytea/overlay", "owner": [{"type": "person", "email": "gentoo@tastytea.de", "name": "tastytea"}], "source": [{"type": "git", "uri": "https://schlomp.space/tastytea/overlay.git"}], "x-state": "GOOD", "x-timestamp": "2020-10-23 19:23:23 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 50}, "telans": {"quality": "experimental", "status": "unofficial", "name": "telans", "description": {"en": "Overlay from telans - gaming/misc"}, "homepage": "https://github.com/telans/EBUILDS", "owner": [{"type": "person", "email": "telans@posteo.de", "name": "telans"}], "source": [{"type": "git", "uri": "https://github.com/telans/EBUILDS.git"}], "feed": ["https://github.com/telans/EBUILDS/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-23 22:16:00 +1300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 28}, "tengine-overlay": {"quality": "experimental", "status": "unofficial", "name": "tengine-overlay", "description": {"en": "Tengine overlay for Gentoo Linux"}, "homepage": "https://github.com/damex/tengine-overlay", "owner": [{"type": "person", "email": "damex.pp@gmail.com", "name": "Roman Kuzmitsky"}], "source": [{"type": "git", "uri": "https://github.com/damex/tengine-overlay.git"}], "feed": ["https://github.com/damex/tengine-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2017-11-29 08:54:54 -0800\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 6}, "tf201": {"quality": "experimental", "status": "unofficial", "name": "tf201", "description": {"en": "TF201 (Asus Transformer Prime) overlay for Gentoo"}, "homepage": "https://github.com/Tux1c/tf201-overlay", "owner": [{"type": "person", "email": "tux1cc@gmail.com", "name": "Yan A."}], "source": [{"type": "git", "uri": "https://github.com/Tux1c/tf201-overlay"}], "x-state": "GOOD", "x-timestamp": "2015-04-11 16:03:12 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "tgbugs-overlay": {"quality": "experimental", "status": "unofficial", "name": "tgbugs-overlay", "description": {"en": "tgbugs portage overlay for custom ebuilds"}, "homepage": "https://github.com/tgbugs/tgbugs-overlay", "owner": [{"type": "person", "email": "tgbugs@gmail.com", "name": "Tom Gillespie"}], "source": [{"type": "git", "uri": "https://github.com/tgbugs/tgbugs-overlay.git"}, {"type": "git", "uri": "git://github.com/tgbugs/tgbugs-overlay.git"}, {"type": "git", "uri": "git@github.com:tgbugs/tgbugs-overlay.git"}], "feed": ["https://github.com/tgbugs/tgbugs-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-02 13:43:40 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 348}, "thabairne": {"quality": "experimental", "status": "unofficial", "name": "thabairne", "description": {"en": "ntnn's Overlay"}, "homepage": "https://github.com/ntnn/gentoo-thabairne", "owner": [{"type": "person", "email": "nelo@wallus.de", "name": "Nelo-Thara Wallus"}], "source": [{"type": "git", "uri": "https://github.com/ntnn/gentoo-thabairne.git"}], "feed": ["https://github.com/ntnn/gentoo-thabairne/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-22 20:38:59 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 15}, "thegreatmcpain": {"quality": "experimental", "status": "unofficial", "name": "thegreatmcpain", "description": {"en": "TheGreatMcPain's personal ebuild overlay"}, "homepage": "https://gitlab.com/TheGreatMcPain/thegreatmcpain-overlay", "owner": [{"type": "person", "email": "sixsupersonic@gmail.com", "name": "James McClain"}], "source": [{"type": "git", "uri": "https://gitlab.com/TheGreatMcPain/thegreatmcpain-overlay.git"}, {"type": "git", "uri": "git@gitlab.com:TheGreatMcPain/thegreatmcpain-overlay.git"}], "feed": ["https://gitlab.com/TheGreatMcPain/thegreatmcpain-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-21 21:46:14 -0500\n", "x-openpgp-signed": "E", "x-masters": ["gentoo", "bobwya"], "x-ebuild-count": 96}, "timboudreau": {"quality": "experimental", "status": "unofficial", "name": "timboudreau", "description": {"en": "Tim Boudreau's Overlay"}, "homepage": "https://github.com/timboudreau/gentoo", "owner": [{"type": "person", "email": "tim@timboudreau.com", "name": "Tim Boudreau"}], "source": [{"type": "git", "uri": "https://github.com/timboudreau/gentoo.git"}, {"type": "git", "uri": "git://github.com/timboudreau/gentoo.git"}, {"type": "git", "uri": "git@github.com:timboudreau/gentoo.git"}], "feed": ["https://github.com/timboudreau/gentoo/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2020-07-18 13:58:40 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 30}, "tmacedo": {"quality": "experimental", "status": "unofficial", "name": "tmacedo", "description": {"en": "User Overlay"}, "homepage": "https://github.com/tmacedo/portage", "owner": [{"type": "person", "email": "tftfmacedo@gmail.com", "name": "Tiago Macedo"}], "source": [{"type": "git", "uri": "git://github.com/tmacedo/portage.git"}], "feed": ["https://github.com/tmacedo/portage/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-08-23 16:37:57 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 24}, "tocaro": {"quality": "experimental", "status": "unofficial", "name": "tocaro", "description": {"en": "tocaro personnal o.g.o"}, "homepage": "https://cgit.gentoo.org/user/tocaro.git/", "owner": [{"type": "person", "email": "tocaro@thocar.org", "name": "Thomas Carri\u00e9"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/tocaro.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/tocaro.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/tocaro.git"}], "feed": ["https://cgit.gentoo.org/user/tocaro.git/atom/"], "x-state": "GOOD", "x-timestamp": "2015-03-28 19:02:11 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 7}, "toniz4-overlay": {"quality": "experimental", "status": "unofficial", "name": "toniz4-overlay", "description": {"en": "Useful packages for your person use"}, "owner": [{"type": "person", "email": "cassioavila@yandex.com", "name": "C\u00e1ssio Ribeiro Alves de \u00c1vila"}], "source": [{"type": "git", "uri": "https://github.com/toniz4/toniz4-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2020-10-19 22:10:29 -0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "toolchain": {"quality": "experimental", "status": "official", "name": "toolchain", "description": {"en": "Toolchain ebuilds that are unsuitable for the tree. Snapshots,\n    unstable versions, etc..."}, "homepage": "https://cgit.gentoo.org/proj/toolchain.git/", "owner": [{"type": "project", "email": "toolchain@gentoo.org"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/toolchain.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/toolchain.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/toolchain.git"}], "feed": ["https://cgit.gentoo.org/proj/toolchain.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-02-22 09:39:04 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 0}, "torbrowser": {"quality": "experimental", "status": "unofficial", "name": "torbrowser", "description": {"en": "Tor Browser related ebuilds"}, "homepage": "https://github.com/MeisterP/torbrowser-overlay", "owner": [{"type": "person", "email": "poncho@spahan.ch", "name": "MeisterP"}], "source": [{"type": "git", "uri": "https://github.com/MeisterP/torbrowser-overlay.git"}, {"type": "git", "uri": "git://github.com/MeisterP/torbrowser-overlay.git"}, {"type": "git", "uri": "git@github.com:MeisterP/torbrowser-overlay.git"}], "feed": ["https://github.com/MeisterP/torbrowser-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-20 21:16:22 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 7}, "tranquility": {"quality": "experimental", "status": "official", "name": "tranquility", "description": {"en": "Developer overlay"}, "homepage": "https://gitweb.gentoo.org/repo/dev/tranquility.git/", "owner": [{"type": "person", "email": "tranquility@gentoo.org", "name": "Ole Reifschneider"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/dev/tranquility.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/repo/dev/tranquility.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/dev/tranquility.git"}], "feed": ["https://gitweb.gentoo.org/repo/dev/tranquility.git/atom/"], "x-state": "GOOD", "x-timestamp": "2016-10-13 10:48:40 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "triquetra": {"quality": "experimental", "status": "unofficial", "name": "triquetra", "description": {"en": "User overlay"}, "homepage": "https://cgit.gentoo.org/user/triquetra.git/", "owner": [{"type": "person", "email": "david@triquetradevelopment.com", "name": "David Crandall"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/triquetra.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/triquetra.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/triquetra.git"}], "feed": ["https://cgit.gentoo.org/user/triquetra.git/atom/"], "x-state": "BAD_CACHE", "x-timestamp": "2016-01-30 16:36:07 -0600\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "trolltoo": {"quality": "experimental", "status": "unofficial", "name": "trolltoo", "description": {"en": "An ebuild overlay for Gentoo."}, "homepage": "https://github.com/dallenwilson/trolltoo", "owner": [{"type": "person", "email": "dallen.wilson@gmail.com", "name": "Dallen Wilson"}], "source": [{"type": "git", "uri": "https://github.com/dallenwilson/trolltoo.git"}, {"type": "git", "uri": "git+ssh://git@github.com/dallenwilson/trolltoo.git"}], "feed": ["https://github.com/dallenwilson/trolltoo/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-08-25 09:05:29 -0600\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 34}, "tryton": {"quality": "experimental", "status": "unofficial", "name": "tryton", "description": {"en": "Tryton"}, "homepage": "http://www.tryton.org/", "owner": [{"type": "person", "email": "cedk@gentoo.org"}], "source": [{"type": "mercurial", "uri": "https://hg.tryton.org/tryton-overlay"}], "x-state": "GOOD", "x-timestamp": "2020-10-18 21:44:56 +0200", "x-masters": ["gentoo"], "x-ebuild-count": 612}, "twister": {"quality": "experimental", "status": "unofficial", "name": "twister", "description": {"en": "Unoffical gentoo overlay for twister"}, "homepage": "https://github.com/ddorian1/gentoo-twister-overlay", "owner": [{"type": "person", "email": "mail@jschwab.org", "name": "Johannes Schwab"}], "source": [{"type": "git", "uri": "https://github.com/ddorian1/gentoo-twister-overlay.git"}, {"type": "git", "uri": "git://github.com/ddorian1/gentoo-twister-overlay.git"}, {"type": "git", "uri": "git@github.com:ddorian1/gentoo-twister-overlay.git"}], "feed": ["https://github.com/ddorian1/gentoo-twister-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2018-01-06 12:40:31 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "twitch153": {"quality": "experimental", "status": "unofficial", "name": "twitch153", "description": {"en": "Experimental ebuilds"}, "homepage": "https://github.com/twitch153/ebuilds", "owner": [{"type": "person", "email": "twitch153@gentoo.org", "name": "Devan Franchini"}], "source": [{"type": "git", "uri": "git://github.com/twitch153/ebuilds.git"}], "feed": ["https://github.com/twitch153/ebuilds/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2016-12-27 15:19:28 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 3}, "ulm": {"quality": "experimental", "status": "official", "name": "ulm", "description": {"en": "Developer overlay"}, "homepage": "https://cgit.gentoo.org/repo/dev/ulm.git/", "owner": [{"type": "person", "email": "ulm@gentoo.org", "name": "Ulrich M\u00fcller"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/dev/ulm.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/repo/dev/ulm.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/dev/ulm.git"}], "feed": ["https://cgit.gentoo.org/repo/dev/ulm.git/atom/"], "x-state": "GOOD", "x-timestamp": "2019-04-03 19:22:11 +0200\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 9}, "ultrabug": {"quality": "experimental", "status": "official", "name": "ultrabug", "description": {"en": "Developer Overlay"}, "homepage": "https://cgit.gentoo.org/dev/ultrabug.git/", "owner": [{"type": "person", "email": "ultrabug@gentoo.org", "name": "Alexys Jacob"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/ultrabug.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/ultrabug.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/ultrabug.git"}], "feed": ["https://cgit.gentoo.org/dev/ultrabug.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-10-13 16:49:30 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 41}, "unity-gentoo": {"quality": "experimental", "status": "unofficial", "name": "unity-gentoo", "description": {"en": "Overlay to install the Unity desktop"}, "homepage": "https://github.com/shiznix/unity-gentoo", "owner": [{"type": "person", "email": "rickfharris@yahoo.com.au", "name": "Rick Harris"}], "source": [{"type": "git", "uri": "https://github.com/shiznix/unity-gentoo"}, {"type": "git", "uri": "git://github.com/shiznix/unity-gentoo.git"}], "feed": ["https://github.com/feeds/shiznix/commits/unity-gentoo/master"], "x-state": "GOOD", "x-timestamp": "2020-10-22 02:42:09 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 162}, "usenet-overlay": {"quality": "experimental", "status": "unofficial", "name": "usenet-overlay", "description": {"en": "Personal Overlay for Lidarr, Radarr and Sonarr "}, "homepage": "https://github.com/xartin/gentoo-overlay", "owner": [{"type": "person", "email": "mcrawford@eliteitminds.com", "name": "Michael Crawford"}], "source": [{"type": "git", "uri": "https://github.com/xartin/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/xartin/gentoo-overlay.git"}], "feed": ["https://github.com/xartin/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-07-06 21:14:05 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 18}, "vaca": {"quality": "experimental", "status": "unofficial", "name": "vaca", "description": {"en": "Just another personal Gentoo overlay"}, "homepage": "https://github.com/hashashin/gentoo-vaca-overlay", "owner": [{"type": "person", "email": "gentoo.power@gmail.com", "name": "hashashin"}], "source": [{"type": "git", "uri": "https://github.com/hashashin/gentoo-vaca-overlay"}, {"type": "git", "uri": "git://github.com/hashashin/gentoo-vaca-overlay.git"}], "feed": ["https://github.com/hashashin/gentoo-vaca-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2018-08-19 13:48:20 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 32}, "vampire": {"quality": "experimental", "status": "unofficial", "name": "vampire", "description": {"en": "A personal repository. So much bleeding edge, you would bet a vampire was involved."}, "homepage": "https://github.com/TheCrueltySage/vampire-overlay", "owner": [{"type": "person", "email": "miltenfiremage@gmail.com", "name": "TheCrueltySage"}], "source": [{"type": "git", "uri": "https://github.com/TheCrueltySage/vampire-overlay.git"}, {"type": "git", "uri": "git://github.com/TheCrueltySage/vampire-overlay.git"}], "feed": ["https://github.com/TheCrueltySage/vampire-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-06-20 15:41:07 +0700\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 22}, "vapoursynth": {"quality": "experimental", "status": "unofficial", "name": "vapoursynth", "description": {"en": "Unofficial repository with all vapoursynth related ebuilds"}, "homepage": "https://github.com/4re/vapoursynth-portage", "owner": [{"type": "person", "email": "surukko@gmail.com"}], "source": [{"type": "git", "uri": "https://github.com/4re/vapoursynth-portage.git"}], "x-state": "GOOD", "x-timestamp": "2020-08-24 13:02:09 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 313}, "vayerx": {"quality": "experimental", "status": "unofficial", "name": "vayerx", "description": {"en": "Personal overlay of Vasiliy Yeremeyev"}, "homepage": "https://github.com/vayerx/vayerx-gentoo/", "owner": [{"type": "person", "email": "vayerx@gmail.com", "name": "Vasiliy Yeremeyev"}], "source": [{"type": "git", "uri": "https://github.com/vayerx/vayerx-gentoo.git"}, {"type": "git", "uri": "git://github.com/vayerx/vayerx-gentoo.git"}, {"type": "git", "uri": "git@github.com:vayerx/vayerx-gentoo.git"}], "feed": ["https://github.com/vayerx/vayerx-gentoo/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2020-06-25 19:26:34 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 94}, "vdr-devel": {"quality": "experimental", "status": "official", "name": "vdr-devel", "description": {"en": "Overlay for VDR, that contains ebuilds for development version\n    of VDR, and specific plugins for that version."}, "homepage": "https://cgit.gentoo.org/proj/vdr/devel.git/", "owner": [{"type": "project", "email": "vdr@gentoo.org"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/vdr/devel.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/vdr/devel.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/vdr/devel.git"}], "feed": ["https://cgit.gentoo.org/proj/vdr/devel.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-08-27 20:54:04 +0200\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 37}, "vifino-overlay": {"quality": "experimental", "status": "unofficial", "name": "vifino-overlay", "description": {"en": "vifino's personal overlay"}, "homepage": "https://github.com/vifino/vifino-overlay", "owner": [{"type": "person", "email": "vifino@tty.sh", "name": "Adrian \"vifino\" Pistol"}], "source": [{"type": "git", "uri": "https://github.com/vifino/vifino-overlay.git"}, {"type": "git", "uri": "git://github.com/vifino/vifino-overlay.git"}, {"type": "git", "uri": "git@github.com:vifino/vifino-overlay.git"}], "feed": ["https://github.com/vifino/vifino-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-09-14 17:17:25 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 51}, "vklimovs": {"quality": "experimental", "status": "unofficial", "name": "vklimovs", "description": {"en": "vklimovs' personal portage overlay"}, "homepage": "https://github.com/vklimovs/portage-overlay", "owner": [{"type": "person", "email": "vklimovs@gmail.com", "name": "Vjaceslavs Klimovs"}], "source": [{"type": "git", "uri": "https://github.com/vklimovs/portage-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/vklimovs/portage-overlay.git"}], "feed": ["https://github.com/vklimovs/portage-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-18 22:02:49 -0700\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 20}, "vmacs": {"quality": "experimental", "status": "unofficial", "name": "vmacs", "description": {"en": "VMACS Personal Gentoo Overlay"}, "homepage": "https://cgit.gentoo.org/user/vmacs.git/", "owner": [{"type": "person", "email": "vance.m.allen@gmail.com", "name": "Vance M. Allen"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/vmacs.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/vmacs.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/vmacs.git"}], "feed": ["https://cgit.gentoo.org/user/vmacs.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-08-01 15:59:07 -0600\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 6}, "vortex": {"quality": "experimental", "status": "unofficial", "name": "vortex", "description": {"en": "Personal overlay"}, "homepage": "https://github.com/nE0sIghT/vortex-overlay", "owner": [{"type": "person", "email": "ykonotopov@gnome.org", "name": "Yuri 'nE0sIghT' Konotopov"}], "source": [{"type": "git", "uri": "https://github.com/nE0sIghT/vortex-overlay.git"}, {"type": "git", "uri": "git://github.com/nE0sIghT/vortex-overlay.git"}], "feed": ["https://github.com/nE0sIghT/vortex-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-06-24 19:41:04 +0400\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 75}, "vowstar": {"quality": "experimental", "status": "unofficial", "name": "vowstar", "description": {"en": "Ebuilds from vowstar's git"}, "homepage": "https://github.com/vowstar/vowstar-overlay", "owner": [{"type": "person", "email": "vowstar@gmail.com"}], "source": [{"type": "git", "uri": "https://github.com/vowstar/vowstar-overlay.git"}, {"type": "git", "uri": "git://github.com/vowstar/vowstar-overlay.git"}, {"type": "git", "uri": "git@github.com:vowstar/vowstar-overlay.git"}], "feed": ["https://github.com/vowstar/vowstar-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-20 15:00:56 +0800\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 59}, "voyageur": {"quality": "experimental", "status": "official", "name": "voyageur", "description": {"en": "Voyageur's random ebuilds stuff"}, "homepage": "https://cafarelli.fr/cgi-bin/cgit.cgi/voyageur-overlay/", "owner": [{"type": "person", "email": "voyageur@gentoo.org"}], "source": [{"type": "git", "uri": "https://cafarelli.fr/git/voyageur-overlay/"}], "feed": ["https://cafarelli.fr/cgi-bin/cgit.cgi/voyageur-overlay/atom"], "x-state": "GOOD", "x-timestamp": "2020-09-28 12:38:27 +0200\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 33}, "waebbl": {"quality": "experimental", "status": "unofficial", "name": "waebbl", "description": {"en": "waebbl's overlay"}, "homepage": "https://github.com/waebbl/waebbl-gentoo", "owner": [{"type": "person", "email": "waebbl@gmail.com", "name": "Bernd Waibel"}], "source": [{"type": "git", "uri": "https://github.com/waebbl/waebbl-gentoo.git"}, {"type": "git", "uri": "git+ssh://git@github.com/waebbl/waebbl-gentoo.git"}], "feed": ["https://github.com/waebbl/waebbl-gentoo/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-22 07:14:41 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo", "raiagent"], "x-ebuild-count": 71}, "wayland-desktop": {"quality": "experimental", "status": "unofficial", "name": "wayland-desktop", "description": {"en": "gentoo overlay for wayland related ebuilds"}, "homepage": "https://github.com/epsilon-0/wayland-desktop", "owner": [{"type": "person", "email": "gentoo@aisha.cc", "name": "Aisha Tammy"}], "source": [{"type": "git", "uri": "https://github.com/epsilon-0/wayland-desktop.git"}, {"type": "git", "uri": "git+ssh://git@github.com/epsilon-0/wayland-desktop.git"}], "x-state": "GOOD", "x-timestamp": "2020-10-06 19:45:10 -0400\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 17}, "wbrana": {"quality": "experimental", "status": "unofficial", "name": "wbrana", "description": {"en": "wbrana's overlay"}, "homepage": "https://cgit.gentoo.org/user/wbrana.git/", "owner": [{"type": "person", "email": "wbrana@gmail.com", "name": "William Brana"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/wbrana.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/wbrana.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/wbrana.git"}], "feed": ["https://cgit.gentoo.org/user/wbrana.git/atom/"], "x-state": "GOOD", "x-timestamp": "2015-06-28 16:56:01 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "wdzierzan": {"quality": "experimental", "status": "unofficial", "name": "wdzierzan", "description": {"en": "Stuff I'd rather `emerge' than `stow'"}, "homepage": "https://cgit.gentoo.org/user/wdzierzan.git/", "owner": [{"type": "person", "email": "wojciech.dzierzanowski@gmail.com", "name": "Wojciech Dzier\u017canowski"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/wdzierzan.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/wdzierzan.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/wdzierzan.git"}], "feed": ["https://cgit.gentoo.org/user/wdzierzan.git/atom/"], "x-state": "GOOD", "x-timestamp": "2017-02-28 21:28:13 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "webos": {"quality": "experimental", "status": "unofficial", "name": "webos", "description": {"en": "Ported Open WebOS components and libraries"}, "homepage": "https://github.com/feniksa/webos-overlay", "owner": [{"type": "person", "email": "feniksa@rambler.ru", "name": "Maksym Sditanov"}], "source": [{"type": "git", "uri": "https://github.com/feniksa/webos-overlay.git"}, {"type": "git", "uri": "git://github.com:feniksa/webos-overlay.git"}, {"type": "git", "uri": "git@github.com:feniksa/webos-overlay.git"}], "feed": ["https://github.com/feniksa/webos-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-02-11 02:21:46 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 49}, "weuxel": {"quality": "experimental", "status": "unofficial", "name": "weuxel", "description": {"en": "Weuxels Personal Overlay"}, "homepage": "https://github.com/Weuxel/portage-weuxel", "owner": [{"type": "person", "email": "norman@smash-net.org", "name": "Norman Rie\u00df"}], "source": [{"type": "git", "uri": "https://github.com/Weuxel/portage-weuxel.git"}, {"type": "git", "uri": "git://github.com/Weuxel/portage-weuxel.git"}, {"type": "git", "uri": "git@github.com:Weuxel/portage-weuxel.git"}], "feed": ["https://github.com/Weuxel/portage-weuxel/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2018-12-18 10:17:01 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "what4-java": {"quality": "experimental", "status": "unofficial", "name": "what4-java", "description": {"en": "Incubator for dev-java updates that the Gentoo Java team has no time for"}, "homepage": "https://github.com/kwhat/gentoo-what4-java-overlay", "owner": [{"type": "person", "email": "alex@1stleg.com", "name": "Alex Barker"}], "source": [{"type": "git", "uri": "https://github.com/kwhat/gentoo-what4-java-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2020-07-02 08:48:49 -0700\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 23}, "wichtounet": {"quality": "experimental", "status": "unofficial", "name": "wichtounet", "description": {"en": "Personal overlay of Baptiste Wicht"}, "homepage": "https://github.com/wichtounet/wichtounet-overlay", "owner": [{"type": "person", "email": "baptistewicht@gmail.com", "name": "Baptiste Wicht"}], "source": [{"type": "git", "uri": "https://github.com/wichtounet/wichtounet-overlay.git"}, {"type": "git", "uri": "git://github.com/wichtounet/wichtounet-overlay.git"}, {"type": "git", "uri": "git@github.com:wichtounet/wichtounet-overlay.git"}], "feed": ["https://github.com/wichtounet/wichtounet-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-08-27 18:08:31 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 30}, "wine": {"quality": "testing", "status": "official", "name": "wine", "description": {"en": "All supported Wine ebuilds from the Gentoo Wine Project"}, "homepage": "https://wiki.gentoo.org/wiki/Project:Wine", "owner": [{"type": "project", "email": "wine@gentoo.org", "name": "Gentoo Wine Project"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/proj/wine.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/repo/proj/wine.git"}], "x-state": "GOOD", "x-timestamp": "2020-10-11 16:17:39 -0400\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 228}, "winny": {"quality": "experimental", "status": "unofficial", "name": "winny", "description": {"en": "Winny's personal overlay"}, "homepage": "https://github.com/winny-/winny-overlay", "owner": [{"type": "person", "email": "winston@ml1.net", "name": "winny"}], "source": [{"type": "git", "uri": "https://github.com/winny-/winny-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/winny-/winny-overlay.git"}], "feed": ["https://github.com/winny-/winny-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-09-20 01:08:19 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 63}, "wjn-overlay": {"quality": "experimental", "status": "unofficial", "name": "wjn-overlay", "description": {"en": "wjn's overlay for Gentoo Linux"}, "homepage": "https://bitbucket.org/wjn/wjn-overlay", "owner": [{"type": "person", "email": "wjn@aol.jp", "name": "wjn"}], "source": [{"type": "git", "uri": "https://bitbucket.org/wjn/wjn-overlay.git"}], "x-state": "BAD_CACHE", "x-timestamp": "2020-10-14 21:38:47 +0900\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 26}, "wuodan": {"quality": "experimental", "status": "unofficial", "name": "wuodan", "description": {"en": "An experimental portage overlay"}, "homepage": "https://github.com/Wuodan/gentoo-overlay", "owner": [{"type": "person", "email": "stefan.kuhn.zurich@gmail.com", "name": "Stefan Kuhn"}], "source": [{"type": "git", "uri": "https://github.com/Wuodan/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/Wuodan/gentoo-overlay.git"}], "feed": ["https://github.com/Wuodan/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-09-01 16:33:01 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo", "pentoo"], "x-ebuild-count": 25}, "x11": {"quality": "experimental", "status": "official", "name": "x11", "description": {"en": "Gentoo X11 team ebuild repository"}, "homepage": "https://cgit.gentoo.org/proj/x11.git", "owner": [{"type": "project", "email": "x11@gentoo.org"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/x11.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/x11"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/x11.git"}], "feed": ["https://cgit.gentoo.org/proj/x11.git/atom/"], "x-state": "GOOD", "x-timestamp": "2019-06-24 17:08:58 -0400\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 80}, "xdch47": {"quality": "experimental", "status": "unofficial", "name": "xdch47", "description": {"en": "Gentoo portage overlay of xdch47"}, "homepage": "https://github.com/xdch47/gpo-xdch47", "owner": [{"type": "person", "email": "xdch47@posteo.de", "name": "Felix Neum\u00e4rker"}], "source": [{"type": "git", "uri": "https://github.com/xdch47/gpo-xdch47.git"}, {"type": "git", "uri": "git+ssh://git@github.com/xdch47/gpo-xdch47.git"}], "x-state": "GOOD", "x-timestamp": "2020-09-22 08:47:26 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 40}, "xelnor": {"quality": "experimental", "status": "unofficial", "name": "xelnor", "description": {"en": "Rapha\u00ebl Barrois' (Xelnor) Gentoo overlay."}, "homepage": "http://overlay.xelnor.net", "owner": [{"type": "person", "email": "gentoo@xelnor.net"}], "source": [{"type": "git", "uri": "git://overlay.xelnor.net/overlay.git"}], "x-state": "GOOD", "x-timestamp": "2020-10-05 20:48:04 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 75}, "xoreos": {"quality": "experimental", "status": "unofficial", "name": "xoreos", "description": {"en": "Gentoo overlay for the xoreos project, providing a WIP reimplementation of the BioWare Aurora engine and related modding tools."}, "homepage": "https://github.com/xoreos/gentoo-overlay", "owner": [{"type": "person", "email": "drmccoy@drmccoy.de", "name": "Sven \"DrMcCoy\" Hesse"}], "source": [{"type": "git", "uri": "https://github.com/xoreos/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/xoreos/gentoo-overlay.git"}], "feed": ["https://github.com/xoreos/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-08-09 19:51:52 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 12}, "xtreemfs": {"quality": "experimental", "status": "unofficial", "name": "xtreemfs", "description": {"en": "XtreemFS, a cloud filesystem"}, "homepage": "https://github.com/xtreemfs-gentoo/overlay", "owner": [{"type": "person", "email": "p@trickhieber.de", "name": "Patrick Hieber"}], "source": [{"type": "git", "uri": "https://github.com/xtreemfs-gentoo/overlay.git"}, {"type": "git", "uri": "git://github.com/xtreemfs-gentoo/overlay.git"}, {"type": "git", "uri": "git@github.com:xtreemfs-gentoo/overlay.git"}], "feed": ["https://github.com/xtreemfs-gentoo/overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2016-08-21 22:24:19 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 0}, "xwing": {"quality": "experimental", "status": "unofficial", "name": "xwing", "description": {"en": "This overlay contains some experimental stuff, such as\n    turboprint printers driver (bug #61311), intel-536ep driver for lastest 2.6\n    kernels (bug #127464), lastest grisbi version (proxy maintainer) before\n    it's portage integration and so on."}, "homepage": "http://gentoo.xwing.info", "owner": [{"type": "person", "email": "casta@xwing.info"}], "source": [{"type": "rsync", "uri": "rsync://gentoo.xwing.info/xwing-overlay"}], "x-state": "GOOD", "x-timestamp": "2020-09-06 14:01:32.000000000 +0000\n", "x-masters": ["gentoo"], "x-ebuild-count": 24}, "yandex": {"quality": "experimental", "status": "unofficial", "name": "yandex", "description": {"en": "Gentoo overlay with packages for software made by Yandex", "ru": "\u041e\u0432\u0435\u0440\u043b\u0435\u0439 \u0441 \u0441\u043e\u0444\u0442\u043e\u043c, \u0432\u044b\u043f\u0443\u0449\u0435\u043d\u043d\u044b\u043c \u042f\u043d\u0434\u0435\u043a\u0441\u043e\u043c"}, "homepage": "https://github.com/yandex-gentoo/overlay", "owner": [{"type": "person", "email": "mva@gentoo.org", "name": "Vadim A. Misbakh-Soloviov"}], "source": [{"type": "git", "uri": "https://github.com/yandex-gentoo/overlay.git"}, {"type": "git", "uri": "git://github.com/yandex-gentoo/overlay.git"}, {"type": "git", "uri": "git@github.com:yandex-gentoo/overlay.git"}], "feed": ["https://github.com/yandex-gentoo/overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2019-07-24 05:06:41 +0700\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "yarik-overlay": {"quality": "experimental", "status": "unofficial", "name": "yarik-overlay", "description": {"en": "Some new packages plus uncommitted patches and ebuilds for the main tree"}, "homepage": "https://github.com/yarikmsu/yarik-overlay", "owner": [{"type": "person", "email": "ygorbunov@gmail.com", "name": "Yaroslav Gorbunov"}], "source": [{"type": "git", "uri": "https://github.com/yarikmsu/yarik-overlay.git"}], "feed": ["https://github.com/yarikmsu/yarik-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2018-09-02 12:58:34 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 17}, "ycUygB1": {"quality": "experimental", "status": "unofficial", "name": "ycUygB1", "description": {"en": "Gentoo User ycUygB1 overlay"}, "homepage": "https://github.com/ycUygB1/overlay", "owner": [{"type": "person", "email": "harold@alum.mit.edu", "name": "Harold Anderson"}], "source": [{"type": "git", "uri": "https://github.com/ycUygB1/overlay.git"}, {"type": "git", "uri": "git://github.com/ycUygB1/overlay.git"}, {"type": "git", "uri": "git@github.com:ycUygB1/overlay.git"}], "feed": ["https://github.com/ycUygB1/overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2018-08-10 19:13:36 -0700\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 68}, "yoreek": {"quality": "experimental", "status": "unofficial", "name": "yoreek", "description": {"en": "Ebuilds related to nginx webserver modules"}, "homepage": "https://cgit.gentoo.org/user/yoreek.git/", "owner": [{"type": "person", "email": "yoreek@yahoo.com", "name": "Yuri U."}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/yoreek.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/yoreek.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/yoreek.git"}], "feed": ["https://cgit.gentoo.org/user/yoreek.git/atom/"], "x-state": "GOOD", "x-timestamp": "2019-10-28 19:20:48 +0800\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "youbroketheinternet": {"quality": "experimental", "status": "unofficial", "name": "youbroketheinternet", "description": {"en": "This overlay is a collaborative maintained Gentoo developer overlay. Some of us are involved with SecuShare, but we try out all sorts of XKEYSCORE-resistant technology. Some of our unique ebuilds are the full GNUnet suite, and software around the psyced chatserver. Some ebuilds are experimental/testing - refer to the included README for more info and details. If you would like to get involved read https://wiki.gentoo.org/wiki/Overlay:Youbroketheinternet"}, "homepage": "http://youbroketheinternet.org/#overlay", "owner": [{"type": "person", "email": "lynX@youbroketheinternet.pages.de", "name": "lynX"}], "source": [{"type": "git", "uri": "https://gnunet.org/git/youbroketheinternet-overlay.git"}, {"type": "git", "uri": "git://cheettyiapsyciew.onion/youbroketheinternet-overlay"}, {"type": "git", "uri": "git://gnunet.org/youbroketheinternet-overlay.git"}], "x-state": "GOOD", "x-timestamp": "1984-04-04 00:44:24 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 159}, "yurij-overlay": {"quality": "experimental", "status": "unofficial", "name": "yurij-overlay", "description": {"en": "Yurij's overlay"}, "homepage": "https://github.com/yurijmikhalevich/yurij-overlay", "owner": [{"type": "person", "email": "yurij@mikhalevi.ch", "name": "Yurij Mikhalevich"}], "source": [{"type": "git", "uri": "https://github.com/yurijmikhalevich/yurij-overlay.git"}, {"type": "git", "uri": "git://github.com/yurijmikhalevich/yurij-overlay.git"}, {"type": "git", "uri": "git@github.com:yurijmikhalevich/yurij-overlay.git"}], "feed": ["https://github.com/yurijmikhalevich/yurij-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2017-09-03 21:21:55 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "yuzu-overlay": {"quality": "experimental", "status": "unofficial", "name": "yuzu-overlay", "description": {"en": "Provides the Yuzu Switch Emulator and required dependencies."}, "homepage": "https://github.com/Alex-Aralis/yuzu-overlay", "owner": [{"type": "person", "email": "alex.aralis@gmail.com", "name": "Alex Aralis"}], "source": [{"type": "git", "uri": "https://github.com/Alex-Aralis/yuzu-overlay.git"}, {"type": "git", "uri": "git://github.com/Alex-Aralis/yuzu-overlay.git"}, {"type": "git", "uri": "git@github.com:Alex-Aralis/yuzu-overlay.git"}], "feed": ["https://github.com/Alex-Aralis/yuzu-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-08-25 11:16:37 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 10}, "zerodaysfordays": {"quality": "experimental", "status": "unofficial", "name": "zerodaysfordays", "description": {"en": "Jakob L. Kreuze's personal overlay."}, "homepage": "https://git.sr.ht/~jakob/zerodaysfordays", "owner": [{"type": "person", "email": "zerodaysfordays@sdf.lonestar.org", "name": "Jakob L. Kreuze"}], "source": [{"type": "git", "uri": "https://git.sr.ht/~jakob/zerodaysfordays"}], "x-state": "GOOD", "x-timestamp": "2020-05-09 19:15:21 -0400\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 11}, "zoobab": {"quality": "experimental", "status": "unofficial", "name": "zoobab", "description": {"en": "Personal overlay of Benjamin Henrion"}, "homepage": "https://github.com/zoobab/overlay4gentoo/", "owner": [{"type": "person", "email": "zoobab@gmail.com", "name": "Benjamin Henrion"}], "source": [{"type": "git", "uri": "https://github.com/zoobab/overlay4gentoo.git"}, {"type": "git", "uri": "git://github.com/zoobab/overlay4gentoo.git"}, {"type": "git", "uri": "git@github.com:zoobab/overlay4gentoo.git"}], "feed": ["https://github.com/zoobab/overlay4gentoo/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2020-10-16 19:31:19 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 25}, "zscheile": {"quality": "experimental", "status": "unofficial", "name": "zscheile", "description": {"en": "Zscheile Overlay"}, "homepage": "https://github.com/zserik/portage-zscheile", "owner": [{"type": "person", "email": "zseri@ytrizja.de", "name": "Erik Zscheile"}], "source": [{"type": "git", "uri": "https://github.com/zserik/portage-zscheile.git"}, {"type": "git", "uri": "git://github.com/zserik/portage-zscheile.git"}, {"type": "git", "uri": "git@github.com:zserik/portage-zscheile.git"}], "feed": ["https://github.com/zserik/portage-zscheile/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-02 15:29:57 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 126}, "zugaina": {"quality": "experimental", "status": "unofficial", "name": "zugaina", "description": {"en": "collection of ebuilds by ycarus"}, "homepage": "http://gpo.zugaina.org/Overlays/zugaina/", "owner": [{"type": "person", "email": "ycarus@zugaina.org"}], "source": [{"type": "rsync", "uri": "rsync://gentoo.zugaina.org/zugaina-portage"}], "x-state": "GOOD", "x-timestamp": "2019-07-24 19:12:13.000000000 +0000\n", "x-masters": ["gentoo"], "x-ebuild-count": 474}, "zx2c4": {"quality": "experimental", "status": "official", "name": "zx2c4", "description": {"en": "zx2c4's repository of additional ebuilds"}, "homepage": "http://git.zx2c4.com/portage/", "owner": [{"type": "person", "email": "zx2c4@gentoo.org", "name": "Jason A. Donenfeld"}], "source": [{"type": "git", "uri": "git://git.zx2c4.com/portage"}, {"type": "git", "uri": "http://git.zx2c4.com/portage"}, {"type": "git", "uri": "ssh://git@git.zx2c4.com/portage"}], "feed": ["http://git.zx2c4.com/portage/atom/?h=master"], "x-state": "GOOD", "x-timestamp": "2020-03-01 15:33:49 +0800\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 9}, "zyrenth": {"quality": "experimental", "status": "unofficial", "name": "zyrenth", "description": {"en": "Personal overlay"}, "homepage": "https://github.com/kabili207/zyrenth-overlay", "owner": [{"type": "person", "email": "kabi-bugz.gentoo@zyrenth.com", "name": "Amy Nagle"}], "source": [{"type": "git", "uri": "https://github.com/kabili207/zyrenth-overlay.git"}, {"type": "git", "uri": "git://github.com/kabili207/zyrenth-overlay.git"}, {"type": "git", "uri": "git@github.com:kabili207/zyrenth-overlay.git"}], "feed": ["https://github.com/kabili207/zyrenth-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-08-23 18:12:23 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 63}}
\ No newline at end of file
diff --git a/superposition.html b/superposition.html
index d69871af92ae..b61deb72ffbf 100644
--- a/superposition.html
+++ b/superposition.html
@@ -40,83 +40,59 @@
 

             15
 'status': 'unofficial'}
 

-            16
 * Adding new repository
+            16
$ pmaint sync superposition
 

-            17
$ pmaint sync superposition
+            17
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

             18
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
warning: Pulling without specifying how to reconcile divergent branches is
 

-            23
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
discouraged. You can squelch this message by running one of the following
 

-            24
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
commands sometime before your next pull:
 

-            25
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 

-            26
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.rebase false  # merge (the default strategy)
 

-            27
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.rebase true   # rebase
 

-            28
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
  git config pull.ff only       # fast-forward only
 

-            29
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
 

-            30
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
You can replace "git config" with "git config --global" to set a default
 

-            31
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            32
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
or --ff-only on the command line to override the configured default per
 

-            33
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
invocation.
 

-            34
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
 

-            35
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
Already up to date.
 

-            36
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
*** syncing superposition
 

-            37
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            37
*** synced superposition
 

-            38
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            38
 * Sync succeeded
 

-            39
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            39
$ git log --format=%ci -1
 

-            40
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            40
$ git show -q --pretty=format:%G? HEAD
 

-            41
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            41
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 superposition
 

-            42
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            43
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            44
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            45
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            46
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            47
Cloning into '/var/lib/repo-mirror-ci/sync/superposition'...
-

-            48
*** syncing superposition
-

-            49
*** synced superposition
-

-            50
 * Sync succeeded
-

-            51
$ git log --format=%ci -1
-

-            52
$ git show -q --pretty=format:%G? HEAD
-

-            53
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 superposition
-

-            54
 * Cache regenerated successfully
+            42
 * Cache regenerated successfully
 

 
         
diff --git a/superposition.txt b/superposition.txt
index 811bba3f3cac..3c0875c3e3df 100644
--- a/superposition.txt
+++ b/superposition.txt
@@ -13,38 +13,26 @@
             {'type': 'git',
              'uri': 'git+ssh://git@git.gentoo.org/repo/user/superposition.git'}],
  'status': 'unofficial'}
- * Adding new repository
 $ pmaint sync superposition
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-Cloning into '/var/lib/repo-mirror-ci/sync/superposition'...
+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.
+
+Already up to date.
 *** syncing superposition
 *** synced superposition
  * Sync succeeded
diff --git a/swegener.html b/swegener.html
index cba68e377b75..9be0cc77a355 100644
--- a/swegener.html
+++ b/swegener.html
@@ -40,111 +40,91 @@
 

             15
$ pmaint sync swegener
 

-            16
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
Welcome To
 

-            22
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
        ____ _____ _____    _    _     _____ ____               _
 

-            23
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
       / ___|_   _| ____|  / \  | |   | ____|  _ \   _ __   ___| |_
 

-            24
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
       \___ \ | | |  _|   / _ \ | |   |  _| | |_) | | '_ \ / _ \ __|
 

-            25
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
        ___) || | | |___ / ___ \| |___| |___|  _ < _| | | |  __/ |_
 

-            26
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
       |____/ |_| |_____/_/   \_\_____|_____|_| \_(_)_| |_|\___|\__|
 

-            27
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
 

-            28
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
IP: 144.76.13.132
 

-            29
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
AKA: rsync7.de.gentoo.org
 

-            30
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
AKA: rsync.gentoo.stealer.net
 

-            31
Welcome To
+            31
 

-            32
        ____ _____ _____    _    _     _____ ____               _
+            32
Connection: 1 GBit/s, rsync limited to 20 connections
 

-            33
       / ___|_   _| ____|  / \  | |   | ____|  _ \   _ __   ___| |_
+            33
Location: Germany
 

-            34
       \___ \ | | |  _|   / _ \ | |   |  _| | |_) | | '_ \ / _ \ __|
+            34
Contact: Sven Wegener <swegener@gentoo.org>
 

-            35
        ___) || | | |___ / ___ \| |___| |___|  _ < _| | | |  __/ |_
+            35
 

-            36
       |____/ |_| |_____/_/   \_\_____|_____|_| \_(_)_| |_|\___|\__|
+            36
 

-            37
+            37
Number of files: 168 (reg: 94, dir: 74)
 

-            38
IP: 144.76.13.132
+            38
Number of created files: 0
 

-            39
AKA: rsync7.de.gentoo.org
+            39
Number of deleted files: 0
 

-            40
AKA: rsync.gentoo.stealer.net
+            40
Number of regular files transferred: 0
 

-            41
+            41
Total file size: 103.99K bytes
 

-            42
Connection: 1 GBit/s, rsync limited to 20 connections
+            42
Total transferred file size: 0 bytes
 

-            43
Location: Germany
+            43
Literal data: 0 bytes
 

-            44
Contact: Sven Wegener <swegener@gentoo.org>
+            44
Matched data: 0 bytes
 

-            45
+            45
File list size: 5.02K
 

-            46
+            46
File list generation time: 0.001 seconds
 

-            47
Number of files: 168 (reg: 94, dir: 74)
+            47
File list transfer time: 0.000 seconds
 

-            48
Number of created files: 0
+            48
Total bytes sent: 143
 

-            49
Number of deleted files: 0
+            49
Total bytes received: 5.10K
 

-            50
Number of regular files transferred: 0
+            50
 

-            51
Total file size: 103.99K bytes
+            51
sent 143 bytes  received 5.10K bytes  2.10K bytes/sec
 

-            52
Total transferred file size: 0 bytes
+            52
total size is 103.99K  speedup is 19.82
 

-            53
Literal data: 0 bytes
+            53
*** syncing swegener
 

-            54
Matched data: 0 bytes
+            54
*** synced swegener
 

-            55
File list size: 5.02K
+            55
 * Sync succeeded
 

-            56
File list generation time: 0.001 seconds
+            56
$ stat --format=%y .
 

-            57
File list transfer time: 0.000 seconds
+            57
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 swegener
 

-            58
Total bytes sent: 143
-

-            59
Total bytes received: 5.10K
-

-            60
-

-            61
sent 143 bytes  received 5.10K bytes  1.50K bytes/sec
-

-            62
total size is 103.99K  speedup is 19.82
-

-            63
*** syncing swegener
-

-            64
*** synced swegener
-

-            65
 * Sync succeeded
-

-            66
$ stat --format=%y .
-

-            67
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 swegener
-

-            68
 * Cache regenerated successfully
+            58
 * Cache regenerated successfully
 

 
         
diff --git a/swegener.txt b/swegener.txt
index 7a168334ef20..85fbb824490e 100644
--- a/swegener.txt
+++ b/swegener.txt
@@ -13,21 +13,11 @@
              'uri': 'rsync://rsync.gentoo.stealer.net/swegener-overlay/'}],
  'status': 'official'}
 $ pmaint sync swegener
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 Welcome To
         ____ _____ _____    _    _     _____ ____               _
        / ___|_   _| ____|  / \  | |   | ____|  _ \   _ __   ___| |_
@@ -58,7 +48,7 @@ File list transfer time: 0.000 seconds
 Total bytes sent: 143
 Total bytes received: 5.10K
 
-sent 143 bytes  received 5.10K bytes  1.50K bytes/sec
+sent 143 bytes  received 5.10K bytes  2.10K bytes/sec
 total size is 103.99K  speedup is 19.82
 *** syncing swegener
 *** synced swegener
diff --git a/tabinol.html b/tabinol.html
index c280c0d782cf..23e63d7bb2dc 100644
--- a/tabinol.html
+++ b/tabinol.html
@@ -38,77 +38,57 @@
 

             14
$ pmaint sync tabinol
 

-            15
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
warning: Pulling without specifying how to reconcile divergent branches is
 

-            21
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
discouraged. You can squelch this message by running one of the following
 

-            22
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
commands sometime before your next pull:
 

-            23
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
 

-            24
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.rebase false  # merge (the default strategy)
 

-            25
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase true   # rebase
 

-            26
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.ff only       # fast-forward only
 

-            27
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
 

-            28
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
You can replace "git config" with "git config --global" to set a default
 

-            29
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            30
warning: Pulling without specifying how to reconcile divergent branches is
+            30
or --ff-only on the command line to override the configured default per
 

-            31
discouraged. You can squelch this message by running one of the following
+            31
invocation.
 

-            32
commands sometime before your next pull:
+            32
 

-            33
+            33
Already up to date.
 

-            34
  git config pull.rebase false  # merge (the default strategy)
+            34
*** syncing tabinol
 

-            35
  git config pull.rebase true   # rebase
+            35
*** synced tabinol
 

-            36
  git config pull.ff only       # fast-forward only
+            36
 * Sync succeeded
 

-            37
+            37
$ git log --format=%ci -1
 

-            38
You can replace "git config" with "git config --global" to set a default
+            38
$ git show -q --pretty=format:%G? HEAD
 

-            39
preference for all repositories. You can also pass --rebase, --no-rebase,
+            39
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 tabinol
 

-            40
or --ff-only on the command line to override the configured default per
-

-            41
invocation.
-

-            42
-

-            43
Already up to date.
-

-            44
*** syncing tabinol
-

-            45
*** synced tabinol
-

-            46
 * Sync succeeded
-

-            47
$ git log --format=%ci -1
-

-            48
$ git show -q --pretty=format:%G? HEAD
-

-            49
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 tabinol
-

-            50
 * Cache regenerated successfully
+            40
 * Cache regenerated successfully
 

 
         
diff --git a/tabinol.txt b/tabinol.txt
index 588a205e7258..81b199053884 100644
--- a/tabinol.txt
+++ b/tabinol.txt
@@ -12,21 +12,11 @@
              'uri': 'git+ssh://git@github.com/Tabinol/tabinol-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync tabinol
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/tamiko.html b/tamiko.html
index 43b6589c25f8..02cf3780f720 100644
--- a/tamiko.html
+++ b/tamiko.html
@@ -44,76 +44,42 @@
 

             17
$ pmaint sync tamiko
 

-            18
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            23
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            24
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            25
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            26
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            27
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            28
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
Cloning into '/var/lib/repo-mirror-ci/sync/tamiko'...
 

-            29
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
*** syncing tamiko
 

-            30
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
*** synced tamiko
 

-            31
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
 * Sync succeeded
 

-            32
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
$ git log --format=%ci -1
 

-            33
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
$ git show -q --pretty=format:%G? HEAD
 

-            34
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 tamiko
 

-            35
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
 * Cache regenerated successfully
 

-            36
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            37
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            38
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            39
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            40
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            41
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            42
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            43
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            44
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            45
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            46
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            47
WARNING:pkgcore:superposition repo at '/var/lib/repo-mirror-ci/sync/superposition', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            48
Cloning into '/var/lib/repo-mirror-ci/sync/tamiko'...
-

-            49
fatal: unable to access 'https://anongit.gentoo.org/git/repo/dev/tamiko.git/': The requested URL returned error: 504
-

-            50
*** syncing tamiko
-

-            51
!!! failed syncing tamiko
-

-            52
 * Sync failed with 1
-
[FATAL]
 
         
     
diff --git a/tamiko.txt b/tamiko.txt
index 3cad38b60725..179d6b500057 100644
--- a/tamiko.txt
+++ b/tamiko.txt
@@ -15,38 +15,21 @@
  'status': 'unofficial'}
  * Adding new repository
 $ pmaint sync tamiko
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:superposition repo at '/var/lib/repo-mirror-ci/sync/superposition', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 Cloning into '/var/lib/repo-mirror-ci/sync/tamiko'...
-fatal: unable to access 'https://anongit.gentoo.org/git/repo/dev/tamiko.git/': The requested URL returned error: 504
 *** syncing tamiko
-!!! failed syncing tamiko
- * Sync failed with 1
+*** synced tamiko
+ * Sync succeeded
+$ git log --format=%ci -1
+$ git show -q --pretty=format:%G? HEAD
+$ pmaint regen --use-local-desc --pkg-desc-index -t 1 tamiko
+ * Cache regenerated successfully
diff --git a/tante.html b/tante.html
index e2f900b0609d..828a0f65d01c 100644
--- a/tante.html
+++ b/tante.html
@@ -26,77 +26,57 @@
 

             8
$ pmaint sync tante
 

-            9
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            9
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            10
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            10
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            11
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            11
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            12
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
warning: Pulling without specifying how to reconcile divergent branches is
 

-            15
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
discouraged. You can squelch this message by running one of the following
 

-            16
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
commands sometime before your next pull:
 

-            17
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
 

-            18
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
  git config pull.rebase false  # merge (the default strategy)
 

-            19
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
  git config pull.rebase true   # rebase
 

-            20
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
  git config pull.ff only       # fast-forward only
 

-            21
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
 

-            22
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
You can replace "git config" with "git config --global" to set a default
 

-            23
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            24
warning: Pulling without specifying how to reconcile divergent branches is
+            24
or --ff-only on the command line to override the configured default per
 

-            25
discouraged. You can squelch this message by running one of the following
+            25
invocation.
 

-            26
commands sometime before your next pull:
+            26
 

-            27
+            27
Already up to date.
 

-            28
  git config pull.rebase false  # merge (the default strategy)
+            28
*** syncing tante
 

-            29
  git config pull.rebase true   # rebase
+            29
*** synced tante
 

-            30
  git config pull.ff only       # fast-forward only
+            30
 * Sync succeeded
 

-            31
+            31
$ git log --format=%ci -1
 

-            32
You can replace "git config" with "git config --global" to set a default
+            32
$ git show -q --pretty=format:%G? HEAD
 

-            33
preference for all repositories. You can also pass --rebase, --no-rebase,
+            33
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 tante
 

-            34
or --ff-only on the command line to override the configured default per
-

-            35
invocation.
-

-            36
-

-            37
Already up to date.
-

-            38
*** syncing tante
-

-            39
*** synced tante
-

-            40
 * Sync succeeded
-

-            41
$ git log --format=%ci -1
-

-            42
$ git show -q --pretty=format:%G? HEAD
-

-            43
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 tante
-

-            44
 * Cache regenerated successfully
+            34
 * Cache regenerated successfully
 

 
         
diff --git a/tante.txt b/tante.txt
index 761b0c3e7882..1512cc3e68ae 100644
--- a/tante.txt
+++ b/tante.txt
@@ -6,21 +6,11 @@
  'source': [{'type': 'git', 'uri': 'https://github.com/tante/overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync tante
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/tarantool.html b/tarantool.html
index 2c185bfee1a8..2d70ff72fa31 100644
--- a/tarantool.html
+++ b/tarantool.html
@@ -42,77 +42,59 @@
 

             16
$ pmaint sync tarantool
 

-            17
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            23
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
warning: Pulling without specifying how to reconcile divergent branches is
 

-            24
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
discouraged. You can squelch this message by running one of the following
 

-            25
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
commands sometime before your next pull:
 

-            26
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
 

-            27
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.rebase false  # merge (the default strategy)
 

-            28
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
  git config pull.rebase true   # rebase
 

-            29
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
  git config pull.ff only       # fast-forward only
 

-            30
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
 

-            31
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
You can replace "git config" with "git config --global" to set a default
 

-            32
warning: Pulling without specifying how to reconcile divergent branches is
+            32
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            33
discouraged. You can squelch this message by running one of the following
+            33
or --ff-only on the command line to override the configured default per
 

-            34
commands sometime before your next pull:
+            34
invocation.
 

             35
 

-            36
  git config pull.rebase false  # merge (the default strategy)
+            36
Already up to date.
 

-            37
  git config pull.rebase true   # rebase
+            37
*** syncing tarantool
 

-            38
  git config pull.ff only       # fast-forward only
+            38
*** synced tarantool
 

-            39
+            39
 * Sync succeeded
 

-            40
You can replace "git config" with "git config --global" to set a default
+            40
$ git log --format=%ci -1
 

-            41
preference for all repositories. You can also pass --rebase, --no-rebase,
+            41
$ git show -q --pretty=format:%G? HEAD
 

-            42
or --ff-only on the command line to override the configured default per
+            42
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 tarantool
 

-            43
invocation.
-

-            44
-

-            45
Already up to date.
-

-            46
*** syncing tarantool
-

-            47
*** synced tarantool
-

-            48
 * Sync succeeded
-

-            49
$ git log --format=%ci -1
-

-            50
$ git show -q --pretty=format:%G? HEAD
-

-            51
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 tarantool
-

-            52
 * Cache regenerated successfully
+            43
 * Cache regenerated successfully
 

 
         
diff --git a/tarantool.txt b/tarantool.txt
index bd533c5a9a5c..19bd4a61be3b 100644
--- a/tarantool.txt
+++ b/tarantool.txt
@@ -14,21 +14,12 @@
              'uri': 'git@github.com:tarantool/gentoo-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync tarantool
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/tastytea.html b/tastytea.html
index d7a1c69be18d..03471fb9ad41 100644
--- a/tastytea.html
+++ b/tastytea.html
@@ -32,93 +32,69 @@
 

             11
$ pmaint sync tastytea
 

-            12
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
warning: Pulling without specifying how to reconcile divergent branches is
 

-            19
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
discouraged. You can squelch this message by running one of the following
 

-            20
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
commands sometime before your next pull:
 

-            21
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
 

-            22
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase false  # merge (the default strategy)
 

-            23
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase true   # rebase
 

-            24
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.ff only       # fast-forward only
 

-            25
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 

-            26
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
You can replace "git config" with "git config --global" to set a default
 

-            27
warning: Pulling without specifying how to reconcile divergent branches is
+            27
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            28
discouraged. You can squelch this message by running one of the following
+            28
or --ff-only on the command line to override the configured default per
 

-            29
commands sometime before your next pull:
+            29
invocation.
 

             30
 

-            31
  git config pull.rebase false  # merge (the default strategy)
+            31
From https://schlomp.space/tastytea/overlay
 

-            32
  git config pull.rebase true   # rebase
+            32
   13b94d0..7515466  master     -> origin/master
 

-            33
  git config pull.ff only       # fast-forward only
+            33
Updating 13b94d0..7515466
 

-            34
+            34
Fast-forward
 

-            35
You can replace "git config" with "git config --global" to set a default
+            35
 profiles/package.mask | 4 ++++
 

-            36
preference for all repositories. You can also pass --rebase, --no-rebase,
+            36
 1 file changed, 4 insertions(+)
 

-            37
or --ff-only on the command line to override the configured default per
+            37
*** syncing tastytea
 

-            38
invocation.
+            38
*** synced tastytea
 

-            39
+            39
 * Sync succeeded
 

-            40
From https://schlomp.space/tastytea/overlay
+            40
$ git log --format=%ci -1
 

-            41
   d289e7c..13b94d0  master     -> origin/master
+            41
$ git show -q --pretty=format:%G? HEAD
 

-            42
Updating d289e7c..13b94d0
+            42
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 tastytea
 

-            43
Fast-forward
-

-            44
 .../files/simutrans-0.122.0-Fix-Makefile.patch     | 22 ++++++++++++++++++++++
-

-            45
 games-simulation/simutrans/metadata.xml            |  1 +
-

-            46
 .../simutrans/simutrans-0.122.0.ebuild             | 19 ++++++++-----------
-

-            47
 3 files changed, 31 insertions(+), 11 deletions(-)
-

-            48
 create mode 100644 games-simulation/simutrans/files/simutrans-0.122.0-Fix-Makefile.patch
-

-            49
*** syncing tastytea
-

-            50
*** synced tastytea
-

-            51
 * Sync succeeded
-

-            52
$ git log --format=%ci -1
-

-            53
$ git show -q --pretty=format:%G? HEAD
-

-            54
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 tastytea
-

-            55
 * Cache regenerated successfully
+            43
 * Cache regenerated successfully
 

 
         
diff --git a/tastytea.txt b/tastytea.txt
index 9f5e641b20bd..240321a67625 100644
--- a/tastytea.txt
+++ b/tastytea.txt
@@ -9,21 +9,12 @@
              'uri': 'https://schlomp.space/tastytea/overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync tastytea
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
@@ -38,14 +29,11 @@ or --ff-only on the command line to override the configured default per
 invocation.
 
 From https://schlomp.space/tastytea/overlay
-   d289e7c..13b94d0  master     -> origin/master
-Updating d289e7c..13b94d0
+   13b94d0..7515466  master     -> origin/master
+Updating 13b94d0..7515466
 Fast-forward
- .../files/simutrans-0.122.0-Fix-Makefile.patch     | 22 ++++++++++++++++++++++
- games-simulation/simutrans/metadata.xml            |  1 +
- .../simutrans/simutrans-0.122.0.ebuild             | 19 ++++++++-----------
- 3 files changed, 31 insertions(+), 11 deletions(-)
- create mode 100644 games-simulation/simutrans/files/simutrans-0.122.0-Fix-Makefile.patch
+ profiles/package.mask | 4 ++++
+ 1 file changed, 4 insertions(+)
 *** syncing tastytea
 *** synced tastytea
  * Sync succeeded
diff --git a/telans.html b/telans.html
index f91f7fd61d14..2b05a0affb64 100644
--- a/telans.html
+++ b/telans.html
@@ -28,77 +28,57 @@
 

             9
$ pmaint sync telans
 

-            10
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            10
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            11
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            11
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            12
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
warning: Pulling without specifying how to reconcile divergent branches is
 

-            16
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
discouraged. You can squelch this message by running one of the following
 

-            17
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
commands sometime before your next pull:
 

-            18
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
 

-            19
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
  git config pull.rebase false  # merge (the default strategy)
 

-            20
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
  git config pull.rebase true   # rebase
 

-            21
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
  git config pull.ff only       # fast-forward only
 

-            22
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
 

-            23
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
You can replace "git config" with "git config --global" to set a default
 

-            24
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            25
warning: Pulling without specifying how to reconcile divergent branches is
+            25
or --ff-only on the command line to override the configured default per
 

-            26
discouraged. You can squelch this message by running one of the following
+            26
invocation.
 

-            27
commands sometime before your next pull:
+            27
 

-            28
+            28
Already up to date.
 

-            29
  git config pull.rebase false  # merge (the default strategy)
+            29
*** syncing telans
 

-            30
  git config pull.rebase true   # rebase
+            30
*** synced telans
 

-            31
  git config pull.ff only       # fast-forward only
+            31
 * Sync succeeded
 

-            32
+            32
$ git log --format=%ci -1
 

-            33
You can replace "git config" with "git config --global" to set a default
+            33
$ git show -q --pretty=format:%G? HEAD
 

-            34
preference for all repositories. You can also pass --rebase, --no-rebase,
+            34
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 telans
 

-            35
or --ff-only on the command line to override the configured default per
-

-            36
invocation.
-

-            37
-

-            38
Already up to date.
-

-            39
*** syncing telans
-

-            40
*** synced telans
-

-            41
 * Sync succeeded
-

-            42
$ git log --format=%ci -1
-

-            43
$ git show -q --pretty=format:%G? HEAD
-

-            44
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 telans
-

-            45
 * Cache regenerated successfully
+            35
 * Cache regenerated successfully
 

 
         
diff --git a/telans.txt b/telans.txt
index 38851fa9c627..e9216746d26d 100644
--- a/telans.txt
+++ b/telans.txt
@@ -7,21 +7,11 @@
  'source': [{'type': 'git', 'uri': 'https://github.com/telans/EBUILDS.git'}],
  'status': 'unofficial'}
 $ pmaint sync telans
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/tengine-overlay.html b/tengine-overlay.html
index 1392730f16cf..1b972b0215cc 100644
--- a/tengine-overlay.html
+++ b/tengine-overlay.html
@@ -34,77 +34,57 @@
 

             12
$ pmaint sync tengine-overlay
 

-            13
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
warning: Pulling without specifying how to reconcile divergent branches is
 

-            19
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
discouraged. You can squelch this message by running one of the following
 

-            20
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
commands sometime before your next pull:
 

-            21
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
 

-            22
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase false  # merge (the default strategy)
 

-            23
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase true   # rebase
 

-            24
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.ff only       # fast-forward only
 

-            25
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 

-            26
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
You can replace "git config" with "git config --global" to set a default
 

-            27
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            28
warning: Pulling without specifying how to reconcile divergent branches is
+            28
or --ff-only on the command line to override the configured default per
 

-            29
discouraged. You can squelch this message by running one of the following
+            29
invocation.
 

-            30
commands sometime before your next pull:
+            30
 

-            31
+            31
Already up to date.
 

-            32
  git config pull.rebase false  # merge (the default strategy)
+            32
*** syncing tengine-overlay
 

-            33
  git config pull.rebase true   # rebase
+            33
*** synced tengine-overlay
 

-            34
  git config pull.ff only       # fast-forward only
+            34
 * Sync succeeded
 

-            35
+            35
$ git log --format=%ci -1
 

-            36
You can replace "git config" with "git config --global" to set a default
+            36
$ git show -q --pretty=format:%G? HEAD
 

-            37
preference for all repositories. You can also pass --rebase, --no-rebase,
+            37
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 tengine-overlay
 

-            38
or --ff-only on the command line to override the configured default per
-

-            39
invocation.
-

-            40
-

-            41
Already up to date.
-

-            42
*** syncing tengine-overlay
-

-            43
*** synced tengine-overlay
-

-            44
 * Sync succeeded
-

-            45
$ git log --format=%ci -1
-

-            46
$ git show -q --pretty=format:%G? HEAD
-

-            47
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 tengine-overlay
-

-            48
 * Cache regenerated successfully
+            38
 * Cache regenerated successfully
 

 
         
diff --git a/tengine-overlay.txt b/tengine-overlay.txt
index ff07e7c716fe..cc843993995d 100644
--- a/tengine-overlay.txt
+++ b/tengine-overlay.txt
@@ -10,21 +10,11 @@
              'uri': 'https://github.com/damex/tengine-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync tengine-overlay
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/tf201.html b/tf201.html
index c360543d7904..a499de2da207 100644
--- a/tf201.html
+++ b/tf201.html
@@ -26,79 +26,57 @@
 

             8
$ pmaint sync tf201
 

-            9
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            9
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            10
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            10
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            11
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            11
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            12
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
warning: Pulling without specifying how to reconcile divergent branches is
 

-            15
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
discouraged. You can squelch this message by running one of the following
 

-            16
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
commands sometime before your next pull:
 

-            17
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
 

-            18
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
  git config pull.rebase false  # merge (the default strategy)
 

-            19
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
  git config pull.rebase true   # rebase
 

-            20
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
  git config pull.ff only       # fast-forward only
 

-            21
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
 

-            22
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
You can replace "git config" with "git config --global" to set a default
 

-            23
WARNING:pkgcore:superposition repo at '/var/lib/repo-mirror-ci/sync/superposition', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            24
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
or --ff-only on the command line to override the configured default per
 

-            25
warning: Pulling without specifying how to reconcile divergent branches is
+            25
invocation.
 

-            26
discouraged. You can squelch this message by running one of the following
+            26
 

-            27
commands sometime before your next pull:
+            27
Already up to date.
 

-            28
+            28
*** syncing tf201
 

-            29
  git config pull.rebase false  # merge (the default strategy)
+            29
*** synced tf201
 

-            30
  git config pull.rebase true   # rebase
+            30
 * Sync succeeded
 

-            31
  git config pull.ff only       # fast-forward only
+            31
$ git log --format=%ci -1
 

-            32
+            32
$ git show -q --pretty=format:%G? HEAD
 

-            33
You can replace "git config" with "git config --global" to set a default
+            33
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 tf201
 

-            34
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            35
or --ff-only on the command line to override the configured default per
-

-            36
invocation.
-

-            37
-

-            38
Already up to date.
-

-            39
*** syncing tf201
-

-            40
*** synced tf201
-

-            41
 * Sync succeeded
-

-            42
$ git log --format=%ci -1
-

-            43
$ git show -q --pretty=format:%G? HEAD
-

-            44
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 tf201
-

-            45
 * Cache regenerated successfully
+            34
 * Cache regenerated successfully
 

 
         
diff --git a/tf201.txt b/tf201.txt
index 7144f3950402..d54182a947e9 100644
--- a/tf201.txt
+++ b/tf201.txt
@@ -6,22 +6,11 @@
  'source': [{'type': 'git', 'uri': 'https://github.com/Tux1c/tf201-overlay'}],
  'status': 'unofficial'}
 $ pmaint sync tf201
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:superposition repo at '/var/lib/repo-mirror-ci/sync/superposition', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/tgbugs-overlay.html b/tgbugs-overlay.html
index 34dbbb5aeea0..0bc40749f539 100644
--- a/tgbugs-overlay.html
+++ b/tgbugs-overlay.html
@@ -40,79 +40,59 @@
 

             15
$ pmaint sync tgbugs-overlay
 

-            16
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
warning: Pulling without specifying how to reconcile divergent branches is
 

-            23
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
discouraged. You can squelch this message by running one of the following
 

-            24
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
commands sometime before your next pull:
 

-            25
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 

-            26
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.rebase false  # merge (the default strategy)
 

-            27
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.rebase true   # rebase
 

-            28
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
  git config pull.ff only       # fast-forward only
 

-            29
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
 

-            30
WARNING:pkgcore:superposition repo at '/var/lib/repo-mirror-ci/sync/superposition', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
You can replace "git config" with "git config --global" to set a default
 

-            31
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            32
warning: Pulling without specifying how to reconcile divergent branches is
+            32
or --ff-only on the command line to override the configured default per
 

-            33
discouraged. You can squelch this message by running one of the following
+            33
invocation.
 

-            34
commands sometime before your next pull:
+            34
 

-            35
+            35
Already up to date.
 

-            36
  git config pull.rebase false  # merge (the default strategy)
+            36
*** syncing tgbugs-overlay
 

-            37
  git config pull.rebase true   # rebase
+            37
*** synced tgbugs-overlay
 

-            38
  git config pull.ff only       # fast-forward only
+            38
 * Sync succeeded
 

-            39
+            39
$ git log --format=%ci -1
 

-            40
You can replace "git config" with "git config --global" to set a default
+            40
$ git show -q --pretty=format:%G? HEAD
 

-            41
preference for all repositories. You can also pass --rebase, --no-rebase,
+            41
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 tgbugs-overlay
 

-            42
or --ff-only on the command line to override the configured default per
-

-            43
invocation.
-

-            44
-

-            45
Already up to date.
-

-            46
*** syncing tgbugs-overlay
-

-            47
*** synced tgbugs-overlay
-

-            48
 * Sync succeeded
-

-            49
$ git log --format=%ci -1
-

-            50
$ git show -q --pretty=format:%G? HEAD
-

-            51
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 tgbugs-overlay
-

-            52
 * Cache regenerated successfully
+            42
 * Cache regenerated successfully
 

 
         
diff --git a/tgbugs-overlay.txt b/tgbugs-overlay.txt
index ea6c8c13bb11..8c32dfa97e41 100644
--- a/tgbugs-overlay.txt
+++ b/tgbugs-overlay.txt
@@ -13,22 +13,12 @@
             {'type': 'git', 'uri': 'git@github.com:tgbugs/tgbugs-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync tgbugs-overlay
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:superposition repo at '/var/lib/repo-mirror-ci/sync/superposition', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/thabairne.html b/thabairne.html
index 8dcb0500c91b..daae6662cc76 100644
--- a/thabairne.html
+++ b/thabairne.html
@@ -34,81 +34,59 @@
 

             12
$ pmaint sync thabairne
 

-            13
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
warning: Pulling without specifying how to reconcile divergent branches is
 

-            20
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
discouraged. You can squelch this message by running one of the following
 

-            21
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
commands sometime before your next pull:
 

-            22
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
 

-            23
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase false  # merge (the default strategy)
 

-            24
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.rebase true   # rebase
 

-            25
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.ff only       # fast-forward only
 

-            26
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
 

-            27
WARNING:pkgcore:superposition repo at '/var/lib/repo-mirror-ci/sync/superposition', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
You can replace "git config" with "git config --global" to set a default
 

-            28
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            29
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
or --ff-only on the command line to override the configured default per
 

-            30
warning: Pulling without specifying how to reconcile divergent branches is
+            30
invocation.
 

-            31
discouraged. You can squelch this message by running one of the following
+            31
 

-            32
commands sometime before your next pull:
+            32
Already up to date.
 

-            33
+            33
*** syncing thabairne
 

-            34
  git config pull.rebase false  # merge (the default strategy)
+            34
*** synced thabairne
 

-            35
  git config pull.rebase true   # rebase
+            35
 * Sync succeeded
 

-            36
  git config pull.ff only       # fast-forward only
+            36
$ git log --format=%ci -1
 

-            37
+            37
$ git show -q --pretty=format:%G? HEAD
 

-            38
You can replace "git config" with "git config --global" to set a default
+            38
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 thabairne
 

-            39
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            40
or --ff-only on the command line to override the configured default per
-

-            41
invocation.
-

-            42
-

-            43
Already up to date.
-

-            44
*** syncing thabairne
-

-            45
*** synced thabairne
-

-            46
 * Sync succeeded
-

-            47
$ git log --format=%ci -1
-

-            48
$ git show -q --pretty=format:%G? HEAD
-

-            49
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 thabairne
-

-            50
 * Cache regenerated successfully
+            39
 * Cache regenerated successfully
 

 
         
diff --git a/thabairne.txt b/thabairne.txt
index a80bd23c41e0..fc7c2036ce35 100644
--- a/thabairne.txt
+++ b/thabairne.txt
@@ -10,23 +10,12 @@
              'uri': 'https://github.com/ntnn/gentoo-thabairne.git'}],
  'status': 'unofficial'}
 $ pmaint sync thabairne
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:superposition repo at '/var/lib/repo-mirror-ci/sync/superposition', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/thegreatmcpain.html b/thegreatmcpain.html
index 9f7455ad3c43..23b195f0c20d 100644
--- a/thegreatmcpain.html
+++ b/thegreatmcpain.html
@@ -38,81 +38,59 @@
 

             14
$ pmaint sync thegreatmcpain
 

-            15
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
warning: Pulling without specifying how to reconcile divergent branches is
 

-            22
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
discouraged. You can squelch this message by running one of the following
 

-            23
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
commands sometime before your next pull:
 

-            24
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 

-            25
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase false  # merge (the default strategy)
 

-            26
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.rebase true   # rebase
 

-            27
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.ff only       # fast-forward only
 

-            28
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
 

-            29
WARNING:pkgcore:superposition repo at '/var/lib/repo-mirror-ci/sync/superposition', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
You can replace "git config" with "git config --global" to set a default
 

-            30
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            31
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
or --ff-only on the command line to override the configured default per
 

-            32
warning: Pulling without specifying how to reconcile divergent branches is
+            32
invocation.
 

-            33
discouraged. You can squelch this message by running one of the following
+            33
 

-            34
commands sometime before your next pull:
+            34
Already up to date.
 

-            35
+            35
*** syncing thegreatmcpain
 

-            36
  git config pull.rebase false  # merge (the default strategy)
+            36
*** synced thegreatmcpain
 

-            37
  git config pull.rebase true   # rebase
+            37
 * Sync succeeded
 

-            38
  git config pull.ff only       # fast-forward only
+            38
$ git log --format=%ci -1
 

-            39
+            39
$ git show -q --pretty=format:%G? HEAD
 

-            40
You can replace "git config" with "git config --global" to set a default
+            40
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 thegreatmcpain
 

-            41
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            42
or --ff-only on the command line to override the configured default per
-

-            43
invocation.
-

-            44
-

-            45
Already up to date.
-

-            46
*** syncing thegreatmcpain
-

-            47
*** synced thegreatmcpain
-

-            48
 * Sync succeeded
-

-            49
$ git log --format=%ci -1
-

-            50
$ git show -q --pretty=format:%G? HEAD
-

-            51
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 thegreatmcpain
-

-            52
 * Cache regenerated successfully
+            41
 * Cache regenerated successfully
 

 
         
diff --git a/thegreatmcpain.txt b/thegreatmcpain.txt
index dec57da23488..8661065abdba 100644
--- a/thegreatmcpain.txt
+++ b/thegreatmcpain.txt
@@ -12,23 +12,12 @@
              'uri': 'git@gitlab.com:TheGreatMcPain/thegreatmcpain-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync thegreatmcpain
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:superposition repo at '/var/lib/repo-mirror-ci/sync/superposition', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/timboudreau.html b/timboudreau.html
index be600fa22342..d59e51417f33 100644
--- a/timboudreau.html
+++ b/timboudreau.html
@@ -36,99 +36,75 @@
 

             13
$ pmaint sync timboudreau
 

-            14
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
warning: Pulling without specifying how to reconcile divergent branches is
 

-            20
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
discouraged. You can squelch this message by running one of the following
 

-            21
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
commands sometime before your next pull:
 

-            22
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
 

-            23
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase false  # merge (the default strategy)
 

-            24
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.rebase true   # rebase
 

-            25
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.ff only       # fast-forward only
 

-            26
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
 

-            27
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
You can replace "git config" with "git config --global" to set a default
 

-            28
WARNING:pkgcore:superposition repo at '/var/lib/repo-mirror-ci/sync/superposition', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            29
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
or --ff-only on the command line to override the configured default per
 

-            30
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
invocation.
 

-            31
warning: Pulling without specifying how to reconcile divergent branches is
+            31
 

-            32
discouraged. You can squelch this message by running one of the following
+            32
Already up to date.
 

-            33
commands sometime before your next pull:
+            33
*** syncing timboudreau
 

-            34
+            34
*** synced timboudreau
 

-            35
  git config pull.rebase false  # merge (the default strategy)
+            35
 * Sync succeeded
 

-            36
  git config pull.rebase true   # rebase
+            36
$ git log --format=%ci -1
 

-            37
  git config pull.ff only       # fast-forward only
+            37
$ git show -q --pretty=format:%G? HEAD
 

-            38
+            38
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 timboudreau
 

-            39
You can replace "git config" with "git config --global" to set a default
-

-            40
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            41
or --ff-only on the command line to override the configured default per
-

-            42
invocation.
-

-            43
-

-            44
Already up to date.
-

-            45
*** syncing timboudreau
-

-            46
*** synced timboudreau
-

-            47
 * Sync succeeded
-

-            48
$ git log --format=%ci -1
-

-            49
$ git show -q --pretty=format:%G? HEAD
-

-            50
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 timboudreau
-

-            51
 * media-gfx/synfig-0.64.2: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            39
 * media-gfx/synfig-0.64.2: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            52
 * media-libs/openni-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            40
 * media-libs/openni-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            53
 * media-libs/openni-kinect-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            41
 * media-libs/openni-kinect-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            54
 * media-libs/openni-sensor-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            42
 * media-libs/openni-sensor-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            55
 * media-video/tupi-0.2.4: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            43
 * media-video/tupi-0.2.4: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            56
 * net-misc/statsd-0.7.1: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            44
 * net-misc/statsd-0.7.1: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            57
 * net-misc/statsd-0.7.2: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            45
 * net-misc/statsd-0.7.2: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            58
 * net-misc/statsd-0.8.0: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            46
 * net-misc/statsd-0.8.0: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            59
 * net-misc/statsd-0.8.5: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            47
 * net-misc/statsd-0.8.5: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            60
 * Cache regen failed with 1
+            48
 * Cache regen failed with 1
 

 
         
diff --git a/timboudreau.txt b/timboudreau.txt
index cad93c0fafe2..c849a26321b0 100644
--- a/timboudreau.txt
+++ b/timboudreau.txt
@@ -11,23 +11,11 @@
             {'type': 'git', 'uri': 'git@github.com:timboudreau/gentoo.git'}],
  'status': 'unofficial'}
 $ pmaint sync timboudreau
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:superposition repo at '/var/lib/repo-mirror-ci/sync/superposition', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/tmacedo.html b/tmacedo.html
index 664beec08eae..726e8c42332a 100644
--- a/tmacedo.html
+++ b/tmacedo.html
@@ -32,81 +32,57 @@
 

             11
$ pmaint sync tmacedo
 

-            12
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
warning: Pulling without specifying how to reconcile divergent branches is
 

-            18
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
discouraged. You can squelch this message by running one of the following
 

-            19
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
commands sometime before your next pull:
 

-            20
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
 

-            21
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
  git config pull.rebase false  # merge (the default strategy)
 

-            22
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase true   # rebase
 

-            23
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.ff only       # fast-forward only
 

-            24
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 

-            25
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
You can replace "git config" with "git config --global" to set a default
 

-            26
WARNING:pkgcore:superposition repo at '/var/lib/repo-mirror-ci/sync/superposition', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            27
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
or --ff-only on the command line to override the configured default per
 

-            28
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
invocation.
 

-            29
warning: Pulling without specifying how to reconcile divergent branches is
+            29
 

-            30
discouraged. You can squelch this message by running one of the following
+            30
Already up to date.
 

-            31
commands sometime before your next pull:
+            31
*** syncing tmacedo
 

-            32
+            32
*** synced tmacedo
 

-            33
  git config pull.rebase false  # merge (the default strategy)
+            33
 * Sync succeeded
 

-            34
  git config pull.rebase true   # rebase
+            34
$ git log --format=%ci -1
 

-            35
  git config pull.ff only       # fast-forward only
+            35
$ git show -q --pretty=format:%G? HEAD
 

-            36
+            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 tmacedo
 

-            37
You can replace "git config" with "git config --global" to set a default
-

-            38
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            39
or --ff-only on the command line to override the configured default per
-

-            40
invocation.
-

-            41
-

-            42
Already up to date.
-

-            43
*** syncing tmacedo
-

-            44
*** synced tmacedo
-

-            45
 * Sync succeeded
-

-            46
$ git log --format=%ci -1
-

-            47
$ git show -q --pretty=format:%G? HEAD
-

-            48
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 tmacedo
-

-            49
 * Cache regenerated successfully
+            37
 * Cache regenerated successfully
 

 
         
diff --git a/tmacedo.txt b/tmacedo.txt
index 2bf16386c829..978bda88ef19 100644
--- a/tmacedo.txt
+++ b/tmacedo.txt
@@ -9,23 +9,11 @@
  'source': [{'type': 'git', 'uri': 'git://github.com/tmacedo/portage.git'}],
  'status': 'unofficial'}
 $ pmaint sync tmacedo
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:superposition repo at '/var/lib/repo-mirror-ci/sync/superposition', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/tocaro.html b/tocaro.html
index a876af626e3d..ea6ad52b94c8 100644
--- a/tocaro.html
+++ b/tocaro.html
@@ -42,80 +42,40 @@
 

             16
$ pmaint sync tocaro
 

-            17
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            23
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            24
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            25
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            26
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
Cloning into '/var/lib/repo-mirror-ci/sync/tocaro'...
 

-            27
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
*** syncing tocaro
 

-            28
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
*** synced tocaro
 

-            29
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
 * Sync succeeded
 

-            30
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
$ git log --format=%ci -1
 

-            31
WARNING:pkgcore:superposition repo at '/var/lib/repo-mirror-ci/sync/superposition', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
$ git show -q --pretty=format:%G? HEAD
 

-            32
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 tocaro
 

-            33
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
 * Cache regenerated successfully
 

-            34
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            35
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            36
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            37
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            38
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            39
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            40
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            41
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            42
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            43
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            44
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            45
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            46
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            47
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            48
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            49
Cloning into '/var/lib/repo-mirror-ci/sync/tocaro'...
-

-            50
fatal: unable to access 'https://anongit.gentoo.org/git/user/tocaro.git/': The requested URL returned error: 504
-

-            51
*** syncing tocaro
-

-            52
!!! failed syncing tocaro
-

-            53
 * Sync failed with 1
-
[FATAL]
 
         
     
diff --git a/tocaro.txt b/tocaro.txt
index 864b04f6b99d..9bc9f831ba2f 100644
--- a/tocaro.txt
+++ b/tocaro.txt
@@ -14,40 +14,20 @@
  'status': 'unofficial'}
  * Adding new repository
 $ pmaint sync tocaro
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:superposition repo at '/var/lib/repo-mirror-ci/sync/superposition', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 Cloning into '/var/lib/repo-mirror-ci/sync/tocaro'...
-fatal: unable to access 'https://anongit.gentoo.org/git/user/tocaro.git/': The requested URL returned error: 504
 *** syncing tocaro
-!!! failed syncing tocaro
- * Sync failed with 1
+*** synced tocaro
+ * Sync succeeded
+$ git log --format=%ci -1
+$ git show -q --pretty=format:%G? HEAD
+$ pmaint regen --use-local-desc --pkg-desc-index -t 1 tocaro
+ * Cache regenerated successfully
diff --git a/toniz4-overlay.html b/toniz4-overlay.html
index 0f479e203d6b..70fac2d3432c 100644
--- a/toniz4-overlay.html
+++ b/toniz4-overlay.html
@@ -30,81 +30,57 @@
 

             10
$ pmaint sync toniz4-overlay
 

-            11
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            11
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            12
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
warning: Pulling without specifying how to reconcile divergent branches is
 

-            17
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
discouraged. You can squelch this message by running one of the following
 

-            18
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
commands sometime before your next pull:
 

-            19
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
 

-            20
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
  git config pull.rebase false  # merge (the default strategy)
 

-            21
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
  git config pull.rebase true   # rebase
 

-            22
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.ff only       # fast-forward only
 

-            23
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
 

-            24
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
You can replace "git config" with "git config --global" to set a default
 

-            25
WARNING:pkgcore:superposition repo at '/var/lib/repo-mirror-ci/sync/superposition', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            26
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
or --ff-only on the command line to override the configured default per
 

-            27
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
invocation.
 

-            28
warning: Pulling without specifying how to reconcile divergent branches is
+            28
 

-            29
discouraged. You can squelch this message by running one of the following
+            29
Already up to date.
 

-            30
commands sometime before your next pull:
+            30
*** syncing toniz4-overlay
 

-            31
+            31
*** synced toniz4-overlay
 

-            32
  git config pull.rebase false  # merge (the default strategy)
+            32
 * Sync succeeded
 

-            33
  git config pull.rebase true   # rebase
+            33
$ git log --format=%ci -1
 

-            34
  git config pull.ff only       # fast-forward only
+            34
$ git show -q --pretty=format:%G? HEAD
 

-            35
+            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 toniz4-overlay
 

-            36
You can replace "git config" with "git config --global" to set a default
-

-            37
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            38
or --ff-only on the command line to override the configured default per
-

-            39
invocation.
-

-            40
-

-            41
Already up to date.
-

-            42
*** syncing toniz4-overlay
-

-            43
*** synced toniz4-overlay
-

-            44
 * Sync succeeded
-

-            45
$ git log --format=%ci -1
-

-            46
$ git show -q --pretty=format:%G? HEAD
-

-            47
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 toniz4-overlay
-

-            48
 * Cache regenerated successfully
+            36
 * Cache regenerated successfully
 

 
         
diff --git a/toniz4-overlay.txt b/toniz4-overlay.txt
index 233b741bc136..3d7ad8f0b5c4 100644
--- a/toniz4-overlay.txt
+++ b/toniz4-overlay.txt
@@ -8,23 +8,11 @@
              'uri': 'https://github.com/toniz4/toniz4-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync toniz4-overlay
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:superposition repo at '/var/lib/repo-mirror-ci/sync/superposition', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/toolchain.html b/toolchain.html
index 1ec92108743d..2db4057e6a91 100644
--- a/toolchain.html
+++ b/toolchain.html
@@ -40,89 +40,59 @@
 

             15
 'status': 'official'}
 

-            16
 * Adding new repository
+            16
$ pmaint sync toolchain
 

-            17
$ pmaint sync toolchain
+            17
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

             18
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
warning: Pulling without specifying how to reconcile divergent branches is
 

-            23
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
discouraged. You can squelch this message by running one of the following
 

-            24
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
commands sometime before your next pull:
 

-            25
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 

-            26
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.rebase false  # merge (the default strategy)
 

-            27
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.rebase true   # rebase
 

-            28
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
  git config pull.ff only       # fast-forward only
 

-            29
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
 

-            30
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
You can replace "git config" with "git config --global" to set a default
 

-            31
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            32
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
or --ff-only on the command line to override the configured default per
 

-            33
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
invocation.
 

-            34
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
 

-            35
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
Already up to date.
 

-            36
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
*** syncing toolchain
 

-            37
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            37
*** synced toolchain
 

-            38
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            38
 * Sync succeeded
 

-            39
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            39
$ git log --format=%ci -1
 

-            40
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            40
$ git show -q --pretty=format:%G? HEAD
 

-            41
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            41
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 toolchain
 

-            42
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            43
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            44
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            45
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            46
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            47
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            48
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            49
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            50
Cloning into '/var/lib/repo-mirror-ci/sync/toolchain'...
-

-            51
*** syncing toolchain
-

-            52
*** synced toolchain
-

-            53
 * Sync succeeded
-

-            54
$ git log --format=%ci -1
-

-            55
$ git show -q --pretty=format:%G? HEAD
-

-            56
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 toolchain
-

-            57
 * Cache regenerated successfully
+            42
 * Cache regenerated successfully
 

 
         
diff --git a/toolchain.txt b/toolchain.txt
index 9ffa957babfe..8424bf65d74c 100644
--- a/toolchain.txt
+++ b/toolchain.txt
@@ -13,41 +13,26 @@
             {'type': 'git',
              'uri': 'git+ssh://git@git.gentoo.org/proj/toolchain.git'}],
  'status': 'official'}
- * Adding new repository
 $ pmaint sync toolchain
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-Cloning into '/var/lib/repo-mirror-ci/sync/toolchain'...
+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.
+
+Already up to date.
 *** syncing toolchain
 *** synced toolchain
  * Sync succeeded
diff --git a/torbrowser.html b/torbrowser.html
index 5d2aa46076de..914167b87ac5 100644
--- a/torbrowser.html
+++ b/torbrowser.html
@@ -38,79 +38,57 @@
 

             14
$ pmaint sync torbrowser
 

-            15
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
warning: Pulling without specifying how to reconcile divergent branches is
 

-            21
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
discouraged. You can squelch this message by running one of the following
 

-            22
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
commands sometime before your next pull:
 

-            23
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
 

-            24
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.rebase false  # merge (the default strategy)
 

-            25
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase true   # rebase
 

-            26
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.ff only       # fast-forward only
 

-            27
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
 

-            28
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
You can replace "git config" with "git config --global" to set a default
 

-            29
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            30
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
or --ff-only on the command line to override the configured default per
 

-            31
warning: Pulling without specifying how to reconcile divergent branches is
+            31
invocation.
 

-            32
discouraged. You can squelch this message by running one of the following
+            32
 

-            33
commands sometime before your next pull:
+            33
Already up to date.
 

-            34
+            34
*** syncing torbrowser
 

-            35
  git config pull.rebase false  # merge (the default strategy)
+            35
*** synced torbrowser
 

-            36
  git config pull.rebase true   # rebase
+            36
 * Sync succeeded
 

-            37
  git config pull.ff only       # fast-forward only
+            37
$ git log --format=%ci -1
 

-            38
+            38
$ git show -q --pretty=format:%G? HEAD
 

-            39
You can replace "git config" with "git config --global" to set a default
+            39
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 torbrowser
 

-            40
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            41
or --ff-only on the command line to override the configured default per
-

-            42
invocation.
-

-            43
-

-            44
Already up to date.
-

-            45
*** syncing torbrowser
-

-            46
*** synced torbrowser
-

-            47
 * Sync succeeded
-

-            48
$ git log --format=%ci -1
-

-            49
$ git show -q --pretty=format:%G? HEAD
-

-            50
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 torbrowser
-

-            51
 * Cache regenerated successfully
+            40
 * Cache regenerated successfully
 

 
         
diff --git a/torbrowser.txt b/torbrowser.txt
index fe0160f4943e..15dbde96fb02 100644
--- a/torbrowser.txt
+++ b/torbrowser.txt
@@ -12,22 +12,11 @@
              'uri': 'git@github.com:MeisterP/torbrowser-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync torbrowser
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/tranquility.html b/tranquility.html
index 836f28e6bafe..e4bcbc5dd314 100644
--- a/tranquility.html
+++ b/tranquility.html
@@ -40,93 +40,59 @@
 

             15
 'status': 'official'}
 

-            16
 * Adding new repository
+            16
$ pmaint sync tranquility
 

-            17
$ pmaint sync tranquility
+            17
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

             18
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
warning: Pulling without specifying how to reconcile divergent branches is
 

-            23
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
discouraged. You can squelch this message by running one of the following
 

-            24
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
commands sometime before your next pull:
 

-            25
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 

-            26
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.rebase false  # merge (the default strategy)
 

-            27
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.rebase true   # rebase
 

-            28
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
  git config pull.ff only       # fast-forward only
 

-            29
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
 

-            30
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
You can replace "git config" with "git config --global" to set a default
 

-            31
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            32
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
or --ff-only on the command line to override the configured default per
 

-            33
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
invocation.
 

-            34
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
 

-            35
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
Already up to date.
 

-            36
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
*** syncing tranquility
 

-            37
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            37
*** synced tranquility
 

-            38
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            38
 * Sync succeeded
 

-            39
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            39
$ git log --format=%ci -1
 

-            40
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            40
$ git show -q --pretty=format:%G? HEAD
 

-            41
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            41
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 tranquility
 

-            42
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            43
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            44
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            45
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            46
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            47
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            48
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            49
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            50
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            51
WARNING:pkgcore:toolchain repo at '/var/lib/repo-mirror-ci/sync/toolchain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            52
Cloning into '/var/lib/repo-mirror-ci/sync/tranquility'...
-

-            53
*** syncing tranquility
-

-            54
*** synced tranquility
-

-            55
 * Sync succeeded
-

-            56
$ git log --format=%ci -1
-

-            57
$ git show -q --pretty=format:%G? HEAD
-

-            58
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 tranquility
-

-            59
 * Cache regenerated successfully
+            42
 * Cache regenerated successfully
 

 
         
diff --git a/tranquility.txt b/tranquility.txt
index 8370a26ce9d1..a75507e43621 100644
--- a/tranquility.txt
+++ b/tranquility.txt
@@ -13,43 +13,26 @@
             {'type': 'git',
              'uri': 'git+ssh://git@git.gentoo.org/repo/dev/tranquility.git'}],
  'status': 'official'}
- * Adding new repository
 $ pmaint sync tranquility
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:toolchain repo at '/var/lib/repo-mirror-ci/sync/toolchain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-Cloning into '/var/lib/repo-mirror-ci/sync/tranquility'...
+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.
+
+Already up to date.
 *** syncing tranquility
 *** synced tranquility
  * Sync succeeded
diff --git a/triquetra.html b/triquetra.html
index 37990d655bc6..4568f1ba7703 100644
--- a/triquetra.html
+++ b/triquetra.html
@@ -44,86 +44,44 @@
 

             17
$ pmaint sync triquetra
 

-            18
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            23
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            24
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            25
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            26
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            27
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
Cloning into '/var/lib/repo-mirror-ci/sync/triquetra'...
 

-            28
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
*** syncing triquetra
 

-            29
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
*** synced triquetra
 

-            30
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
 * Sync succeeded
 

-            31
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
$ git log --format=%ci -1
 

-            32
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
$ git show -q --pretty=format:%G? HEAD
 

-            33
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 triquetra
 

-            34
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            35
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            36
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            37
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            38
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            39
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            40
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            41
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            42
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            43
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            44
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            45
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            46
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            47
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            48
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            49
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            50
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            51
WARNING:pkgcore:toolchain repo at '/var/lib/repo-mirror-ci/sync/toolchain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            52
WARNING:pkgcore:tranquility repo at '/var/lib/repo-mirror-ci/sync/tranquility', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            53
Cloning into '/var/lib/repo-mirror-ci/sync/triquetra'...
-

-            54
fatal: unable to access 'https://anongit.gentoo.org/git/user/triquetra.git/': The requested URL returned error: 504
-

-            55
*** syncing triquetra
-

-            56
!!! failed syncing triquetra
-

-            57
 * Sync failed with 1
+            34
 * app-admin/rcm-1.2.3: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+
[FATAL]
+            35
 * app-admin/rcm-1.3.0: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
+            36
 * Cache regen failed with 1
+

 
         
     
diff --git a/triquetra.txt b/triquetra.txt
index fce9a4c9ff2b..055e21c91a78 100644
--- a/triquetra.txt
+++ b/triquetra.txt
@@ -15,43 +15,22 @@
  'status': 'unofficial'}
  * Adding new repository
 $ pmaint sync triquetra
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:toolchain repo at '/var/lib/repo-mirror-ci/sync/toolchain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tranquility repo at '/var/lib/repo-mirror-ci/sync/tranquility', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 Cloning into '/var/lib/repo-mirror-ci/sync/triquetra'...
-fatal: unable to access 'https://anongit.gentoo.org/git/user/triquetra.git/': The requested URL returned error: 504
 *** syncing triquetra
-!!! failed syncing triquetra
- * Sync failed with 1
+*** synced triquetra
+ * Sync succeeded
+$ git log --format=%ci -1
+$ git show -q --pretty=format:%G? HEAD
+$ pmaint regen --use-local-desc --pkg-desc-index -t 1 triquetra
+ * app-admin/rcm-1.2.3: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+ * app-admin/rcm-1.3.0: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+ * Cache regen failed with 1
diff --git a/trolltoo.html b/trolltoo.html
index 6132af4096f3..cab4e2fc6399 100644
--- a/trolltoo.html
+++ b/trolltoo.html
@@ -38,83 +38,57 @@
 

             14
$ pmaint sync trolltoo
 

-            15
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
warning: Pulling without specifying how to reconcile divergent branches is
 

-            21
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
discouraged. You can squelch this message by running one of the following
 

-            22
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
commands sometime before your next pull:
 

-            23
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
 

-            24
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.rebase false  # merge (the default strategy)
 

-            25
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase true   # rebase
 

-            26
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.ff only       # fast-forward only
 

-            27
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
 

-            28
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
You can replace "git config" with "git config --global" to set a default
 

-            29
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            30
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
or --ff-only on the command line to override the configured default per
 

-            31
WARNING:pkgcore:toolchain repo at '/var/lib/repo-mirror-ci/sync/toolchain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
invocation.
 

-            32
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
 

-            33
warning: Pulling without specifying how to reconcile divergent branches is
+            33
Already up to date.
 

-            34
discouraged. You can squelch this message by running one of the following
+            34
*** syncing trolltoo
 

-            35
commands sometime before your next pull:
+            35
*** synced trolltoo
 

-            36
+            36
 * Sync succeeded
 

-            37
  git config pull.rebase false  # merge (the default strategy)
+            37
$ git log --format=%ci -1
 

-            38
  git config pull.rebase true   # rebase
+            38
$ git show -q --pretty=format:%G? HEAD
 

-            39
  git config pull.ff only       # fast-forward only
+            39
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 trolltoo
 

-            40
-

-            41
You can replace "git config" with "git config --global" to set a default
-

-            42
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            43
or --ff-only on the command line to override the configured default per
-

-            44
invocation.
-

-            45
-

-            46
Already up to date.
-

-            47
*** syncing trolltoo
-

-            48
*** synced trolltoo
-

-            49
 * Sync succeeded
-

-            50
$ git log --format=%ci -1
-

-            51
$ git show -q --pretty=format:%G? HEAD
-

-            52
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 trolltoo
-

-            53
 * Cache regenerated successfully
+            40
 * Cache regenerated successfully
 

 
         
diff --git a/trolltoo.txt b/trolltoo.txt
index 841042b741d9..ec90371fc0d2 100644
--- a/trolltoo.txt
+++ b/trolltoo.txt
@@ -12,24 +12,11 @@
              'uri': 'git+ssh://git@github.com/dallenwilson/trolltoo.git'}],
  'status': 'unofficial'}
 $ pmaint sync trolltoo
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:toolchain repo at '/var/lib/repo-mirror-ci/sync/toolchain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/tryton.html b/tryton.html
index 578fc6ccb29b..6320f3e53d97 100644
--- a/tryton.html
+++ b/tryton.html
@@ -28,59 +28,33 @@
 

             9
$ pmaint sync tryton
 

-            10
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            10
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            11
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            11
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            12
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
pulling from https://hg.tryton.org/tryton-overlay
 

-            16
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
searching for changes
 

-            17
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
no changes found
 

-            18
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
*** syncing tryton
 

-            19
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
*** synced tryton
 

-            20
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
 * Sync succeeded
 

-            21
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
$ hg log -l 1 --template={date|isodatesec}
 

-            22
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 tryton
 

-            23
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            24
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            25
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            26
WARNING:pkgcore:toolchain repo at '/var/lib/repo-mirror-ci/sync/toolchain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            27
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            28
pulling from https://hg.tryton.org/tryton-overlay
-

-            29
searching for changes
-

-            30
no changes found
-

-            31
*** syncing tryton
-

-            32
*** synced tryton
-

-            33
 * Sync succeeded
-

-            34
$ hg log -l 1 --template={date|isodatesec}
-

-            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 tryton
-

-            36
 * Cache regenerated successfully
+            23
 * Cache regenerated successfully
 

 
         
diff --git a/tryton.txt b/tryton.txt
index 3cce1129fe02..e13133982d4f 100644
--- a/tryton.txt
+++ b/tryton.txt
@@ -7,24 +7,11 @@
              'uri': 'https://hg.tryton.org/tryton-overlay'}],
  'status': 'unofficial'}
 $ pmaint sync tryton
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:toolchain repo at '/var/lib/repo-mirror-ci/sync/toolchain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 pulling from https://hg.tryton.org/tryton-overlay
 searching for changes
 no changes found
diff --git a/twister.html b/twister.html
index 6c003c9a173c..e0ff0ef9b787 100644
--- a/twister.html
+++ b/twister.html
@@ -42,83 +42,55 @@
 

             16
$ pmaint sync twister
 

-            17
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
warning: Pulling without specifying how to reconcile divergent branches is
 

-            22
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
discouraged. You can squelch this message by running one of the following
 

-            23
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
commands sometime before your next pull:
 

-            24
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 

-            25
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase false  # merge (the default strategy)
 

-            26
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.rebase true   # rebase
 

-            27
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.ff only       # fast-forward only
 

-            28
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
 

-            29
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
You can replace "git config" with "git config --global" to set a default
 

-            30
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            31
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
or --ff-only on the command line to override the configured default per
 

-            32
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
invocation.
 

-            33
WARNING:pkgcore:toolchain repo at '/var/lib/repo-mirror-ci/sync/toolchain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
 

-            34
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
Already up to date.
 

-            35
warning: Pulling without specifying how to reconcile divergent branches is
+            35
*** syncing twister
 

-            36
discouraged. You can squelch this message by running one of the following
+            36
*** synced twister
 

-            37
commands sometime before your next pull:
+            37
 * Sync succeeded
 

-            38
+            38
$ git log --format=%ci -1
 

-            39
  git config pull.rebase false  # merge (the default strategy)
+            39
$ git show -q --pretty=format:%G? HEAD
 

-            40
  git config pull.rebase true   # rebase
+            40
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 twister
 

-            41
  git config pull.ff only       # fast-forward only
-

-            42
-

-            43
You can replace "git config" with "git config --global" to set a default
-

-            44
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            45
or --ff-only on the command line to override the configured default per
-

-            46
invocation.
-

-            47
-

-            48
Already up to date.
-

-            49
*** syncing twister
-

-            50
*** synced twister
-

-            51
 * Sync succeeded
-

-            52
$ git log --format=%ci -1
-

-            53
$ git show -q --pretty=format:%G? HEAD
-

-            54
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 twister
-

-            55
 * Cache regenerated successfully
+            41
 * Cache regenerated successfully
 

 
         
diff --git a/twister.txt b/twister.txt
index 48ccb56a0bda..728000d55b85 100644
--- a/twister.txt
+++ b/twister.txt
@@ -14,24 +14,10 @@
              'uri': 'git@github.com:ddorian1/gentoo-twister-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync twister
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:toolchain repo at '/var/lib/repo-mirror-ci/sync/toolchain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/twitch153.html b/twitch153.html
index 8d83283fedc5..7a38e8ec65f7 100644
--- a/twitch153.html
+++ b/twitch153.html
@@ -32,87 +32,59 @@
 

             11
$ pmaint sync twitch153
 

-            12
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
warning: Pulling without specifying how to reconcile divergent branches is
 

-            17
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
discouraged. You can squelch this message by running one of the following
 

-            18
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
commands sometime before your next pull:
 

-            19
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
 

-            20
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
  git config pull.rebase false  # merge (the default strategy)
 

-            21
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
  git config pull.rebase true   # rebase
 

-            22
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.ff only       # fast-forward only
 

-            23
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
 

-            24
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
You can replace "git config" with "git config --global" to set a default
 

-            25
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            26
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
or --ff-only on the command line to override the configured default per
 

-            27
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
invocation.
 

-            28
WARNING:pkgcore:toolchain repo at '/var/lib/repo-mirror-ci/sync/toolchain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
 

-            29
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
Already up to date.
 

-            30
warning: Pulling without specifying how to reconcile divergent branches is
+            30
*** syncing twitch153
 

-            31
discouraged. You can squelch this message by running one of the following
+            31
*** synced twitch153
 

-            32
commands sometime before your next pull:
+            32
 * Sync succeeded
 

-            33
+            33
$ git log --format=%ci -1
 

-            34
  git config pull.rebase false  # merge (the default strategy)
+            34
$ git show -q --pretty=format:%G? HEAD
 

-            35
  git config pull.rebase true   # rebase
+            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 twitch153
 

-            36
  git config pull.ff only       # fast-forward only
-

-            37
-

-            38
You can replace "git config" with "git config --global" to set a default
-

-            39
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            40
or --ff-only on the command line to override the configured default per
-

-            41
invocation.
-

-            42
-

-            43
Already up to date.
-

-            44
*** syncing twitch153
-

-            45
*** synced twitch153
-

-            46
 * Sync succeeded
-

-            47
$ git log --format=%ci -1
-

-            48
$ git show -q --pretty=format:%G? HEAD
-

-            49
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 twitch153
-

-            50
 * app-admin/webapp-config-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            36
 * app-admin/webapp-config-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            51
 * games-emulation/dolphin-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            37
 * games-emulation/dolphin-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            52
 * Cache regen failed with 1
+            38
 * Cache regen failed with 1
 

 
         
diff --git a/twitch153.txt b/twitch153.txt
index 9420ebcb30b5..227ea25ae76e 100644
--- a/twitch153.txt
+++ b/twitch153.txt
@@ -9,24 +9,10 @@
  'source': [{'type': 'git', 'uri': 'git://github.com/twitch153/ebuilds.git'}],
  'status': 'unofficial'}
 $ pmaint sync twitch153
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:toolchain repo at '/var/lib/repo-mirror-ci/sync/toolchain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/ulm.html b/ulm.html
index ab31c299ddab..be1e47c69571 100644
--- a/ulm.html
+++ b/ulm.html
@@ -42,92 +42,42 @@
 

             16
$ pmaint sync ulm
 

-            17
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            23
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            24
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            25
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            26
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            27
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
Cloning into '/var/lib/repo-mirror-ci/sync/ulm'...
 

-            28
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
*** syncing ulm
 

-            29
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
*** synced ulm
 

-            30
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
 * Sync succeeded
 

-            31
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
$ git log --format=%ci -1
 

-            32
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
$ git show -q --pretty=format:%G? HEAD
 

-            33
WARNING:pkgcore:toolchain repo at '/var/lib/repo-mirror-ci/sync/toolchain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 ulm
 

-            34
WARNING:pkgcore:tranquility repo at '/var/lib/repo-mirror-ci/sync/tranquility', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
 * Cache regenerated successfully
 

-            35
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            36
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            37
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            38
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            39
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            40
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            41
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            42
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            43
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            44
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            45
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            46
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            47
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            48
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            49
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            50
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            51
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            52
WARNING:pkgcore:toolchain repo at '/var/lib/repo-mirror-ci/sync/toolchain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            53
WARNING:pkgcore:tranquility repo at '/var/lib/repo-mirror-ci/sync/tranquility', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            54
WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            55
Cloning into '/var/lib/repo-mirror-ci/sync/ulm'...
-

-            56
fatal: unable to access 'https://anongit.gentoo.org/git/repo/dev/ulm.git/': The requested URL returned error: 502
-

-            57
*** syncing ulm
-

-            58
!!! failed syncing ulm
-

-            59
 * Sync failed with 1
-
[FATAL]
 
         
     
diff --git a/ulm.txt b/ulm.txt
index 457f71be2d35..f3f085f622f2 100644
--- a/ulm.txt
+++ b/ulm.txt
@@ -14,46 +14,21 @@
  'status': 'official'}
  * Adding new repository
 $ pmaint sync ulm
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:toolchain repo at '/var/lib/repo-mirror-ci/sync/toolchain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tranquility repo at '/var/lib/repo-mirror-ci/sync/tranquility', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:toolchain repo at '/var/lib/repo-mirror-ci/sync/toolchain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tranquility repo at '/var/lib/repo-mirror-ci/sync/tranquility', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 Cloning into '/var/lib/repo-mirror-ci/sync/ulm'...
-fatal: unable to access 'https://anongit.gentoo.org/git/repo/dev/ulm.git/': The requested URL returned error: 502
 *** syncing ulm
-!!! failed syncing ulm
- * Sync failed with 1
+*** synced ulm
+ * Sync succeeded
+$ git log --format=%ci -1
+$ git show -q --pretty=format:%G? HEAD
+$ pmaint regen --use-local-desc --pkg-desc-index -t 1 ulm
+ * Cache regenerated successfully
diff --git a/ultrabug.html b/ultrabug.html
index 88991a7ca4c2..47be9f9e93f2 100644
--- a/ultrabug.html
+++ b/ultrabug.html
@@ -42,96 +42,42 @@
 

             16
$ pmaint sync ultrabug
 

-            17
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            23
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            24
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            25
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            26
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            27
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
Cloning into '/var/lib/repo-mirror-ci/sync/ultrabug'...
 

-            28
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
*** syncing ultrabug
 

-            29
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
*** synced ultrabug
 

-            30
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
 * Sync succeeded
 

-            31
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
$ git log --format=%ci -1
 

-            32
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
$ git show -q --pretty=format:%G? HEAD
 

-            33
WARNING:pkgcore:toolchain repo at '/var/lib/repo-mirror-ci/sync/toolchain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 ultrabug
 

-            34
WARNING:pkgcore:tranquility repo at '/var/lib/repo-mirror-ci/sync/tranquility', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
 * Cache regenerated successfully
 

-            35
WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            36
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            37
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            38
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            39
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            40
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            41
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            42
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            43
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            44
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            45
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            46
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            47
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            48
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            49
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            50
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            51
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            52
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            53
WARNING:pkgcore:toolchain repo at '/var/lib/repo-mirror-ci/sync/toolchain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            54
WARNING:pkgcore:tranquility repo at '/var/lib/repo-mirror-ci/sync/tranquility', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            55
WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            56
WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            57
Cloning into '/var/lib/repo-mirror-ci/sync/ultrabug'...
-

-            58
fatal: unable to access 'https://anongit.gentoo.org/git/dev/ultrabug.git/': The requested URL returned error: 502
-

-            59
*** syncing ultrabug
-

-            60
!!! failed syncing ultrabug
-

-            61
 * Sync failed with 1
-
[FATAL]
 
         
     
diff --git a/ultrabug.txt b/ultrabug.txt
index e1a517ed7e1a..b65e26cd0c99 100644
--- a/ultrabug.txt
+++ b/ultrabug.txt
@@ -14,48 +14,21 @@
  'status': 'official'}
  * Adding new repository
 $ pmaint sync ultrabug
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:toolchain repo at '/var/lib/repo-mirror-ci/sync/toolchain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tranquility repo at '/var/lib/repo-mirror-ci/sync/tranquility', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:toolchain repo at '/var/lib/repo-mirror-ci/sync/toolchain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tranquility repo at '/var/lib/repo-mirror-ci/sync/tranquility', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 Cloning into '/var/lib/repo-mirror-ci/sync/ultrabug'...
-fatal: unable to access 'https://anongit.gentoo.org/git/dev/ultrabug.git/': The requested URL returned error: 502
 *** syncing ultrabug
-!!! failed syncing ultrabug
- * Sync failed with 1
+*** synced ultrabug
+ * Sync succeeded
+$ git log --format=%ci -1
+$ git show -q --pretty=format:%G? HEAD
+$ pmaint regen --use-local-desc --pkg-desc-index -t 1 ultrabug
+ * Cache regenerated successfully
diff --git a/unity-gentoo.html b/unity-gentoo.html
index 8933771a1081..4dd29625c42e 100644
--- a/unity-gentoo.html
+++ b/unity-gentoo.html
@@ -36,87 +36,55 @@
 

             13
$ pmaint sync unity-gentoo
 

-            14
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
warning: Pulling without specifying how to reconcile divergent branches is
 

-            19
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
discouraged. You can squelch this message by running one of the following
 

-            20
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
commands sometime before your next pull:
 

-            21
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
 

-            22
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase false  # merge (the default strategy)
 

-            23
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase true   # rebase
 

-            24
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.ff only       # fast-forward only
 

-            25
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 

-            26
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
You can replace "git config" with "git config --global" to set a default
 

-            27
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            28
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
or --ff-only on the command line to override the configured default per
 

-            29
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
invocation.
 

-            30
WARNING:pkgcore:toolchain repo at '/var/lib/repo-mirror-ci/sync/toolchain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
 

-            31
WARNING:pkgcore:tranquility repo at '/var/lib/repo-mirror-ci/sync/tranquility', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
Already up to date.
 

-            32
WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
*** syncing unity-gentoo
 

-            33
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
*** synced unity-gentoo
 

-            34
warning: Pulling without specifying how to reconcile divergent branches is
+            34
 * Sync succeeded
 

-            35
discouraged. You can squelch this message by running one of the following
+            35
$ git log --format=%ci -1
 

-            36
commands sometime before your next pull:
+            36
$ git show -q --pretty=format:%G? HEAD
 

-            37
+            37
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 unity-gentoo
 

-            38
  git config pull.rebase false  # merge (the default strategy)
-

-            39
  git config pull.rebase true   # rebase
-

-            40
  git config pull.ff only       # fast-forward only
-

-            41
-

-            42
You can replace "git config" with "git config --global" to set a default
-

-            43
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            44
or --ff-only on the command line to override the configured default per
-

-            45
invocation.
-

-            46
-

-            47
Already up to date.
-

-            48
*** syncing unity-gentoo
-

-            49
*** synced unity-gentoo
-

-            50
 * Sync succeeded
-

-            51
$ git log --format=%ci -1
-

-            52
$ git show -q --pretty=format:%G? HEAD
-

-            53
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 unity-gentoo
-

-            54
 * Cache regenerated successfully
+            38
 * Cache regenerated successfully
 

 
         
diff --git a/unity-gentoo.txt b/unity-gentoo.txt
index 89ac5d43ff6b..b5b54f488cf2 100644
--- a/unity-gentoo.txt
+++ b/unity-gentoo.txt
@@ -11,26 +11,10 @@
              'uri': 'git://github.com/shiznix/unity-gentoo.git'}],
  'status': 'unofficial'}
 $ pmaint sync unity-gentoo
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:toolchain repo at '/var/lib/repo-mirror-ci/sync/toolchain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tranquility repo at '/var/lib/repo-mirror-ci/sync/tranquility', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/usenet-overlay.html b/usenet-overlay.html
index 14bf94eb5440..1b50ff3a35bb 100644
--- a/usenet-overlay.html
+++ b/usenet-overlay.html
@@ -38,89 +38,55 @@
 

             14
$ pmaint sync usenet-overlay
 

-            15
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
warning: Pulling without specifying how to reconcile divergent branches is
 

-            20
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
discouraged. You can squelch this message by running one of the following
 

-            21
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
commands sometime before your next pull:
 

-            22
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
 

-            23
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase false  # merge (the default strategy)
 

-            24
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.rebase true   # rebase
 

-            25
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.ff only       # fast-forward only
 

-            26
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
 

-            27
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
You can replace "git config" with "git config --global" to set a default
 

-            28
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            29
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
or --ff-only on the command line to override the configured default per
 

-            30
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
invocation.
 

-            31
WARNING:pkgcore:toolchain repo at '/var/lib/repo-mirror-ci/sync/toolchain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
 

-            32
WARNING:pkgcore:tranquility repo at '/var/lib/repo-mirror-ci/sync/tranquility', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
Already up to date.
 

-            33
WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
*** syncing usenet-overlay
 

-            34
WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
*** synced usenet-overlay
 

-            35
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
 * Sync succeeded
 

-            36
warning: Pulling without specifying how to reconcile divergent branches is
+            36
$ git log --format=%ci -1
 

-            37
discouraged. You can squelch this message by running one of the following
+            37
$ git show -q --pretty=format:%G? HEAD
 

-            38
commands sometime before your next pull:
+            38
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 usenet-overlay
 

-            39
-

-            40
  git config pull.rebase false  # merge (the default strategy)
-

-            41
  git config pull.rebase true   # rebase
-

-            42
  git config pull.ff only       # fast-forward only
-

-            43
-

-            44
You can replace "git config" with "git config --global" to set a default
-

-            45
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            46
or --ff-only on the command line to override the configured default per
-

-            47
invocation.
-

-            48
-

-            49
Already up to date.
-

-            50
*** syncing usenet-overlay
-

-            51
*** synced usenet-overlay
-

-            52
 * Sync succeeded
-

-            53
$ git log --format=%ci -1
-

-            54
$ git show -q --pretty=format:%G? HEAD
-

-            55
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 usenet-overlay
-

-            56
 * Cache regenerated successfully
+            39
 * Cache regenerated successfully
 

 
         
diff --git a/usenet-overlay.txt b/usenet-overlay.txt
index d922e85ceceb..22c450440aa4 100644
--- a/usenet-overlay.txt
+++ b/usenet-overlay.txt
@@ -12,27 +12,10 @@
              'uri': 'git+ssh://git@github.com/xartin/gentoo-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync usenet-overlay
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:toolchain repo at '/var/lib/repo-mirror-ci/sync/toolchain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tranquility repo at '/var/lib/repo-mirror-ci/sync/tranquility', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/vaca.html b/vaca.html
index b61f7edf472b..3af4a4a037e4 100644
--- a/vaca.html
+++ b/vaca.html
@@ -38,111 +38,77 @@
 

             14
$ pmaint sync vaca
 

-            15
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
warning: Pulling without specifying how to reconcile divergent branches is
 

-            20
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
discouraged. You can squelch this message by running one of the following
 

-            21
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
commands sometime before your next pull:
 

-            22
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
 

-            23
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase false  # merge (the default strategy)
 

-            24
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.rebase true   # rebase
 

-            25
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.ff only       # fast-forward only
 

-            26
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
 

-            27
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
You can replace "git config" with "git config --global" to set a default
 

-            28
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            29
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
or --ff-only on the command line to override the configured default per
 

-            30
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
invocation.
 

-            31
WARNING:pkgcore:toolchain repo at '/var/lib/repo-mirror-ci/sync/toolchain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
 

-            32
WARNING:pkgcore:tranquility repo at '/var/lib/repo-mirror-ci/sync/tranquility', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
Already up to date.
 

-            33
WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
*** syncing vaca
 

-            34
WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
*** synced vaca
 

-            35
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
 * Sync succeeded
 

-            36
warning: Pulling without specifying how to reconcile divergent branches is
+            36
$ git log --format=%ci -1
 

-            37
discouraged. You can squelch this message by running one of the following
+            37
$ git show -q --pretty=format:%G? HEAD
 

-            38
commands sometime before your next pull:
+            38
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 vaca
 

-            39
-

-            40
  git config pull.rebase false  # merge (the default strategy)
-

-            41
  git config pull.rebase true   # rebase
-

-            42
  git config pull.ff only       # fast-forward only
-

-            43
-

-            44
You can replace "git config" with "git config --global" to set a default
-

-            45
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            46
or --ff-only on the command line to override the configured default per
-

-            47
invocation.
-

-            48
-

-            49
Already up to date.
-

-            50
*** syncing vaca
-

-            51
*** synced vaca
-

-            52
 * Sync succeeded
-

-            53
$ git log --format=%ci -1
-

-            54
$ git show -q --pretty=format:%G? HEAD
-

-            55
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 vaca
-

-            56
 * dev-libs/libevdev-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            39
 * dev-libs/libevdev-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            57
 * games-emulation/ppsspp-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            40
 * games-emulation/ppsspp-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            58
 * games-emulation/ppsspp-9999-r1: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            41
 * games-emulation/ppsspp-9999-r1: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            59
 * games-server/dmp-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            42
 * games-server/dmp-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            60
 * games-util/fsbext-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            43
 * games-util/fsbext-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            61
 * media-libs/maiat3plusdec-9999-r1: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            44
 * media-libs/maiat3plusdec-9999-r1: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            62
 * sys-apps/bd-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            45
 * sys-apps/bd-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            63
 * sys-apps/ranwhen-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            46
 * sys-apps/ranwhen-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            64
 * sys-auth/pam_usb-9999-r2: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            47
 * sys-auth/pam_usb-9999-r2: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            65
 * sys-fs/fuse_7z-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            48
 * sys-fs/fuse_7z-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            66
 * x11-misc/xwinwrap-9999: failed sourcing ebuild: inherit requires unknown eclass: bzr.eclass
+            49
 * x11-misc/xwinwrap-9999: failed sourcing ebuild: inherit requires unknown eclass: bzr.eclass
 
[FATAL]
-            67
 * Cache regen failed with 1
+            50
 * Cache regen failed with 1
 

 
         
diff --git a/vaca.txt b/vaca.txt
index 2bb595fafa4a..fb258f042954 100644
--- a/vaca.txt
+++ b/vaca.txt
@@ -12,27 +12,10 @@
              'uri': 'git://github.com/hashashin/gentoo-vaca-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync vaca
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:toolchain repo at '/var/lib/repo-mirror-ci/sync/toolchain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tranquility repo at '/var/lib/repo-mirror-ci/sync/tranquility', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/vampire.html b/vampire.html
index 02501defb2a4..1726d99244f7 100644
--- a/vampire.html
+++ b/vampire.html
@@ -40,89 +40,57 @@
 

             15
$ pmaint sync vampire
 

-            16
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
warning: Pulling without specifying how to reconcile divergent branches is
 

-            22
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
discouraged. You can squelch this message by running one of the following
 

-            23
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
commands sometime before your next pull:
 

-            24
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 

-            25
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase false  # merge (the default strategy)
 

-            26
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.rebase true   # rebase
 

-            27
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.ff only       # fast-forward only
 

-            28
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
 

-            29
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
You can replace "git config" with "git config --global" to set a default
 

-            30
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            31
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
or --ff-only on the command line to override the configured default per
 

-            32
WARNING:pkgcore:toolchain repo at '/var/lib/repo-mirror-ci/sync/toolchain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
invocation.
 

-            33
WARNING:pkgcore:tranquility repo at '/var/lib/repo-mirror-ci/sync/tranquility', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
 

-            34
WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
Already up to date.
 

-            35
WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
*** syncing vampire
 

-            36
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
*** synced vampire
 

-            37
warning: Pulling without specifying how to reconcile divergent branches is
+            37
 * Sync succeeded
 

-            38
discouraged. You can squelch this message by running one of the following
+            38
$ git log --format=%ci -1
 

-            39
commands sometime before your next pull:
+            39
$ git show -q --pretty=format:%G? HEAD
 

-            40
+            40
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 vampire
 

-            41
  git config pull.rebase false  # merge (the default strategy)
-

-            42
  git config pull.rebase true   # rebase
-

-            43
  git config pull.ff only       # fast-forward only
-

-            44
-

-            45
You can replace "git config" with "git config --global" to set a default
-

-            46
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            47
or --ff-only on the command line to override the configured default per
-

-            48
invocation.
-

-            49
-

-            50
Already up to date.
-

-            51
*** syncing vampire
-

-            52
*** synced vampire
-

-            53
 * Sync succeeded
-

-            54
$ git log --format=%ci -1
-

-            55
$ git show -q --pretty=format:%G? HEAD
-

-            56
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 vampire
-

-            57
 * Cache regenerated successfully
+            41
 * Cache regenerated successfully
 

 
         
diff --git a/vampire.txt b/vampire.txt
index 4b38066b88f3..9a0b84258869 100644
--- a/vampire.txt
+++ b/vampire.txt
@@ -13,27 +13,11 @@
              'uri': 'git://github.com/TheCrueltySage/vampire-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync vampire
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:toolchain repo at '/var/lib/repo-mirror-ci/sync/toolchain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tranquility repo at '/var/lib/repo-mirror-ci/sync/tranquility', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/vapoursynth.html b/vapoursynth.html
index 3d39adb60ac0..548f8ea95aab 100644
--- a/vapoursynth.html
+++ b/vapoursynth.html
@@ -30,89 +30,57 @@
 

             10
$ pmaint sync vapoursynth
 

-            11
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            11
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            12
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
warning: Pulling without specifying how to reconcile divergent branches is
 

-            17
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
discouraged. You can squelch this message by running one of the following
 

-            18
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
commands sometime before your next pull:
 

-            19
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
 

-            20
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
  git config pull.rebase false  # merge (the default strategy)
 

-            21
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
  git config pull.rebase true   # rebase
 

-            22
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.ff only       # fast-forward only
 

-            23
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
 

-            24
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
You can replace "git config" with "git config --global" to set a default
 

-            25
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            26
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
or --ff-only on the command line to override the configured default per
 

-            27
WARNING:pkgcore:toolchain repo at '/var/lib/repo-mirror-ci/sync/toolchain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
invocation.
 

-            28
WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
 

-            29
WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
Already up to date.
 

-            30
WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
*** syncing vapoursynth
 

-            31
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
*** synced vapoursynth
 

-            32
warning: Pulling without specifying how to reconcile divergent branches is
+            32
 * Sync succeeded
 

-            33
discouraged. You can squelch this message by running one of the following
+            33
$ git log --format=%ci -1
 

-            34
commands sometime before your next pull:
+            34
$ git show -q --pretty=format:%G? HEAD
 

-            35
+            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 vapoursynth
 

-            36
  git config pull.rebase false  # merge (the default strategy)
-

-            37
  git config pull.rebase true   # rebase
-

-            38
  git config pull.ff only       # fast-forward only
-

-            39
-

-            40
You can replace "git config" with "git config --global" to set a default
-

-            41
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            42
or --ff-only on the command line to override the configured default per
-

-            43
invocation.
-

-            44
-

-            45
Already up to date.
-

-            46
*** syncing vapoursynth
-

-            47
*** synced vapoursynth
-

-            48
 * Sync succeeded
-

-            49
$ git log --format=%ci -1
-

-            50
$ git show -q --pretty=format:%G? HEAD
-

-            51
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 vapoursynth
-

-            52
 * Cache regenerated successfully
+            36
 * Cache regenerated successfully
 

 
         
diff --git a/vapoursynth.txt b/vapoursynth.txt
index c542cf8c59c3..391e5e9b7057 100644
--- a/vapoursynth.txt
+++ b/vapoursynth.txt
@@ -8,27 +8,11 @@
              'uri': 'https://github.com/4re/vapoursynth-portage.git'}],
  'status': 'unofficial'}
 $ pmaint sync vapoursynth
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:toolchain repo at '/var/lib/repo-mirror-ci/sync/toolchain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/vayerx.html b/vayerx.html
index 8547f68a648b..eb49926c1192 100644
--- a/vayerx.html
+++ b/vayerx.html
@@ -38,89 +38,59 @@
 

             14
$ pmaint sync vayerx
 

-            15
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
warning: Pulling without specifying how to reconcile divergent branches is
 

-            21
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
discouraged. You can squelch this message by running one of the following
 

-            22
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
commands sometime before your next pull:
 

-            23
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
 

-            24
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.rebase false  # merge (the default strategy)
 

-            25
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase true   # rebase
 

-            26
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.ff only       # fast-forward only
 

-            27
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
 

-            28
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
You can replace "git config" with "git config --global" to set a default
 

-            29
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            30
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
or --ff-only on the command line to override the configured default per
 

-            31
WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
invocation.
 

-            32
WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
 

-            33
WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
Already up to date.
 

-            34
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
*** syncing vayerx
 

-            35
warning: Pulling without specifying how to reconcile divergent branches is
+            35
*** synced vayerx
 

-            36
discouraged. You can squelch this message by running one of the following
+            36
 * Sync succeeded
 

-            37
commands sometime before your next pull:
+            37
$ git log --format=%ci -1
 

-            38
+            38
$ git show -q --pretty=format:%G? HEAD
 

-            39
  git config pull.rebase false  # merge (the default strategy)
+            39
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 vayerx
 

-            40
  git config pull.rebase true   # rebase
-

-            41
  git config pull.ff only       # fast-forward only
-

-            42
-

-            43
You can replace "git config" with "git config --global" to set a default
-

-            44
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            45
or --ff-only on the command line to override the configured default per
-

-            46
invocation.
-

-            47
-

-            48
Already up to date.
-

-            49
*** syncing vayerx
-

-            50
*** synced vayerx
-

-            51
 * Sync succeeded
-

-            52
$ git log --format=%ci -1
-

-            53
$ git show -q --pretty=format:%G? HEAD
-

-            54
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 vayerx
-

-            55
 * dev-vcs/git-lfs-2.9.2: failed sourcing ebuild: external commands disallowed during metadata regen: 'go-module_vendor_uris'
+            40
 * dev-vcs/git-lfs-2.9.2: failed sourcing ebuild: external commands disallowed during metadata regen: 'go-module_vendor_uris'
 
[FATAL]
-            56
 * Cache regen failed with 1
+            41
 * Cache regen failed with 1
 

 
         
diff --git a/vayerx.txt b/vayerx.txt
index a013f4b4ee9d..b25961e6e2ef 100644
--- a/vayerx.txt
+++ b/vayerx.txt
@@ -12,26 +12,11 @@
             {'type': 'git', 'uri': 'git@github.com:vayerx/vayerx-gentoo.git'}],
  'status': 'unofficial'}
 $ pmaint sync vayerx
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/vdr-devel.html b/vdr-devel.html
index d59de0a4586b..323f022c901d 100644
--- a/vdr-devel.html
+++ b/vdr-devel.html
@@ -40,103 +40,59 @@
 

             15
 'status': 'official'}
 

-            16
 * Adding new repository
+            16
$ pmaint sync vdr-devel
 

-            17
$ pmaint sync vdr-devel
+            17
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

             18
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
warning: Pulling without specifying how to reconcile divergent branches is
 

-            23
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
discouraged. You can squelch this message by running one of the following
 

-            24
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
commands sometime before your next pull:
 

-            25
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 

-            26
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.rebase false  # merge (the default strategy)
 

-            27
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.rebase true   # rebase
 

-            28
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
  git config pull.ff only       # fast-forward only
 

-            29
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
 

-            30
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
You can replace "git config" with "git config --global" to set a default
 

-            31
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            32
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
or --ff-only on the command line to override the configured default per
 

-            33
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
invocation.
 

-            34
WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
 

-            35
WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
Already up to date.
 

-            36
WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
*** syncing vdr-devel
 

-            37
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            37
*** synced vdr-devel
 

-            38
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            38
 * Sync succeeded
 

-            39
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            39
$ git log --format=%ci -1
 

-            40
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            40
$ git show -q --pretty=format:%G? HEAD
 

-            41
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            41
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 vdr-devel
 

-            42
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            43
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            44
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            45
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            46
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            47
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            48
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            49
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            50
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            51
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            52
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            53
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            54
WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            55
WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            56
WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            57
Cloning into '/var/lib/repo-mirror-ci/sync/vdr-devel'...
-

-            58
*** syncing vdr-devel
-

-            59
*** synced vdr-devel
-

-            60
 * Sync succeeded
-

-            61
$ git log --format=%ci -1
-

-            62
$ git show -q --pretty=format:%G? HEAD
-

-            63
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 vdr-devel
-

-            64
 * Cache regenerated successfully
+            42
 * Cache regenerated successfully
 

 
         
diff --git a/vdr-devel.txt b/vdr-devel.txt
index 62bfd0a60716..62f6a176afbb 100644
--- a/vdr-devel.txt
+++ b/vdr-devel.txt
@@ -13,48 +13,26 @@
             {'type': 'git',
              'uri': 'git+ssh://git@git.gentoo.org/proj/vdr/devel.git'}],
  'status': 'official'}
- * Adding new repository
 $ pmaint sync vdr-devel
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-Cloning into '/var/lib/repo-mirror-ci/sync/vdr-devel'...
+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.
+
+Already up to date.
 *** syncing vdr-devel
 *** synced vdr-devel
  * Sync succeeded
diff --git a/vifino-overlay.html b/vifino-overlay.html
index 4fe44ce60f60..ea46def16450 100644
--- a/vifino-overlay.html
+++ b/vifino-overlay.html
@@ -40,87 +40,57 @@
 

             15
$ pmaint sync vifino-overlay
 

-            16
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
warning: Pulling without specifying how to reconcile divergent branches is
 

-            22
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
discouraged. You can squelch this message by running one of the following
 

-            23
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
commands sometime before your next pull:
 

-            24
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 

-            25
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase false  # merge (the default strategy)
 

-            26
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.rebase true   # rebase
 

-            27
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.ff only       # fast-forward only
 

-            28
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
 

-            29
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
You can replace "git config" with "git config --global" to set a default
 

-            30
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            31
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
or --ff-only on the command line to override the configured default per
 

-            32
WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
invocation.
 

-            33
WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
 

-            34
WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
Already up to date.
 

-            35
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
*** syncing vifino-overlay
 

-            36
warning: Pulling without specifying how to reconcile divergent branches is
+            36
*** synced vifino-overlay
 

-            37
discouraged. You can squelch this message by running one of the following
+            37
 * Sync succeeded
 

-            38
commands sometime before your next pull:
+            38
$ git log --format=%ci -1
 

-            39
+            39
$ git show -q --pretty=format:%G? HEAD
 

-            40
  git config pull.rebase false  # merge (the default strategy)
+            40
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 vifino-overlay
 

-            41
  git config pull.rebase true   # rebase
-

-            42
  git config pull.ff only       # fast-forward only
-

-            43
-

-            44
You can replace "git config" with "git config --global" to set a default
-

-            45
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            46
or --ff-only on the command line to override the configured default per
-

-            47
invocation.
-

-            48
-

-            49
Already up to date.
-

-            50
*** syncing vifino-overlay
-

-            51
*** synced vifino-overlay
-

-            52
 * Sync succeeded
-

-            53
$ git log --format=%ci -1
-

-            54
$ git show -q --pretty=format:%G? HEAD
-

-            55
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 vifino-overlay
-

-            56
 * Cache regenerated successfully
+            41
 * Cache regenerated successfully
 

 
         
diff --git a/vifino-overlay.txt b/vifino-overlay.txt
index 6fc323dcdba2..2a75771b66a6 100644
--- a/vifino-overlay.txt
+++ b/vifino-overlay.txt
@@ -13,26 +13,11 @@
             {'type': 'git', 'uri': 'git@github.com:vifino/vifino-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync vifino-overlay
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/vklimovs.html b/vklimovs.html
index 64eb0780b1d9..ecdd6dd224bc 100644
--- a/vklimovs.html
+++ b/vklimovs.html
@@ -38,87 +38,57 @@
 

             14
$ pmaint sync vklimovs
 

-            15
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
warning: Pulling without specifying how to reconcile divergent branches is
 

-            21
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
discouraged. You can squelch this message by running one of the following
 

-            22
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
commands sometime before your next pull:
 

-            23
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
 

-            24
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.rebase false  # merge (the default strategy)
 

-            25
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase true   # rebase
 

-            26
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.ff only       # fast-forward only
 

-            27
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
 

-            28
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
You can replace "git config" with "git config --global" to set a default
 

-            29
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            30
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
or --ff-only on the command line to override the configured default per
 

-            31
WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
invocation.
 

-            32
WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
 

-            33
WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
Already up to date.
 

-            34
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
*** syncing vklimovs
 

-            35
warning: Pulling without specifying how to reconcile divergent branches is
+            35
*** synced vklimovs
 

-            36
discouraged. You can squelch this message by running one of the following
+            36
 * Sync succeeded
 

-            37
commands sometime before your next pull:
+            37
$ git log --format=%ci -1
 

-            38
+            38
$ git show -q --pretty=format:%G? HEAD
 

-            39
  git config pull.rebase false  # merge (the default strategy)
+            39
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 vklimovs
 

-            40
  git config pull.rebase true   # rebase
-

-            41
  git config pull.ff only       # fast-forward only
-

-            42
-

-            43
You can replace "git config" with "git config --global" to set a default
-

-            44
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            45
or --ff-only on the command line to override the configured default per
-

-            46
invocation.
-

-            47
-

-            48
Already up to date.
-

-            49
*** syncing vklimovs
-

-            50
*** synced vklimovs
-

-            51
 * Sync succeeded
-

-            52
$ git log --format=%ci -1
-

-            53
$ git show -q --pretty=format:%G? HEAD
-

-            54
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 vklimovs
-

-            55
 * Cache regenerated successfully
+            40
 * Cache regenerated successfully
 

 
         
diff --git a/vklimovs.txt b/vklimovs.txt
index cb3a40e5df5c..8a4642bc8472 100644
--- a/vklimovs.txt
+++ b/vklimovs.txt
@@ -12,26 +12,11 @@
              'uri': 'git+ssh://git@github.com/vklimovs/portage-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync vklimovs
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/vmacs.html b/vmacs.html
index f09d0f3d3964..5ce27d726619 100644
--- a/vmacs.html
+++ b/vmacs.html
@@ -42,94 +42,46 @@
 

             16
$ pmaint sync vmacs
 

-            17
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            23
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            24
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            25
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            26
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            27
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            28
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            29
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
Cloning into '/var/lib/repo-mirror-ci/sync/vmacs'...
 

-            30
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
*** syncing vmacs
 

-            31
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
*** synced vmacs
 

-            32
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
 * Sync succeeded
 

-            33
WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
$ git log --format=%ci -1
 

-            34
WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
$ git show -q --pretty=format:%G? HEAD
 

-            35
WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 vmacs
 

-            36
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
 * Cache regenerated successfully
 

-            37
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            38
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            39
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            40
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            41
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            42
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            43
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            44
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            45
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            46
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            47
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            48
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            49
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            50
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            51
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            52
WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            53
WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            54
WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            55
WARNING:pkgcore:vdr-devel repo at '/var/lib/repo-mirror-ci/sync/vdr-devel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            56
Cloning into '/var/lib/repo-mirror-ci/sync/vmacs'...
-

-            57
fatal: unable to access 'https://anongit.gentoo.org/git/user/vmacs.git/': The requested URL returned error: 502
-

-            58
*** syncing vmacs
-

-            59
!!! failed syncing vmacs
-

-            60
 * Sync failed with 1
-
[FATAL]
 
         
     
diff --git a/vmacs.txt b/vmacs.txt
index 98887f55c9cb..88cff7f33088 100644
--- a/vmacs.txt
+++ b/vmacs.txt
@@ -14,47 +14,23 @@
  'status': 'unofficial'}
  * Adding new repository
 $ pmaint sync vmacs
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vdr-devel repo at '/var/lib/repo-mirror-ci/sync/vdr-devel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 Cloning into '/var/lib/repo-mirror-ci/sync/vmacs'...
-fatal: unable to access 'https://anongit.gentoo.org/git/user/vmacs.git/': The requested URL returned error: 502
 *** syncing vmacs
-!!! failed syncing vmacs
- * Sync failed with 1
+*** synced vmacs
+ * Sync succeeded
+$ git log --format=%ci -1
+$ git show -q --pretty=format:%G? HEAD
+$ pmaint regen --use-local-desc --pkg-desc-index -t 1 vmacs
+ * Cache regenerated successfully
diff --git a/vortex.html b/vortex.html
index 26e57d2e774d..615ed1249bd8 100644
--- a/vortex.html
+++ b/vortex.html
@@ -38,87 +38,59 @@
 

             14
$ pmaint sync vortex
 

-            15
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
warning: Pulling without specifying how to reconcile divergent branches is
 

-            22
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
discouraged. You can squelch this message by running one of the following
 

-            23
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
commands sometime before your next pull:
 

-            24
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 

-            25
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase false  # merge (the default strategy)
 

-            26
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.rebase true   # rebase
 

-            27
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.ff only       # fast-forward only
 

-            28
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
 

-            29
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
You can replace "git config" with "git config --global" to set a default
 

-            30
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            31
WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
or --ff-only on the command line to override the configured default per
 

-            32
WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
invocation.
 

-            33
WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
 

-            34
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
Already up to date.
 

-            35
warning: Pulling without specifying how to reconcile divergent branches is
+            35
*** syncing vortex
 

-            36
discouraged. You can squelch this message by running one of the following
+            36
*** synced vortex
 

-            37
commands sometime before your next pull:
+            37
 * Sync succeeded
 

-            38
+            38
$ git log --format=%ci -1
 

-            39
  git config pull.rebase false  # merge (the default strategy)
+            39
$ git show -q --pretty=format:%G? HEAD
 

-            40
  git config pull.rebase true   # rebase
+            40
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 vortex
 

-            41
  git config pull.ff only       # fast-forward only
-

-            42
-

-            43
You can replace "git config" with "git config --global" to set a default
-

-            44
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            45
or --ff-only on the command line to override the configured default per
-

-            46
invocation.
-

-            47
-

-            48
Already up to date.
-

-            49
*** syncing vortex
-

-            50
*** synced vortex
-

-            51
 * Sync succeeded
-

-            52
$ git log --format=%ci -1
-

-            53
$ git show -q --pretty=format:%G? HEAD
-

-            54
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 vortex
-

-            55
 * Cache regenerated successfully
+            41
 * Cache regenerated successfully
 

 
         
diff --git a/vortex.txt b/vortex.txt
index aece7ecf5812..c85434781784 100644
--- a/vortex.txt
+++ b/vortex.txt
@@ -12,26 +12,12 @@
              'uri': 'git://github.com/nE0sIghT/vortex-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync vortex
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/vowstar.html b/vowstar.html
index 7823dbc9ce78..34093db30c3f 100644
--- a/vowstar.html
+++ b/vowstar.html
@@ -38,89 +38,59 @@
 

             14
$ pmaint sync vowstar
 

-            15
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
warning: Pulling without specifying how to reconcile divergent branches is
 

-            22
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
discouraged. You can squelch this message by running one of the following
 

-            23
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
commands sometime before your next pull:
 

-            24
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 

-            25
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase false  # merge (the default strategy)
 

-            26
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.rebase true   # rebase
 

-            27
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.ff only       # fast-forward only
 

-            28
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
 

-            29
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
You can replace "git config" with "git config --global" to set a default
 

-            30
WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            31
WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
or --ff-only on the command line to override the configured default per
 

-            32
WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
invocation.
 

-            33
WARNING:pkgcore:vdr-devel repo at '/var/lib/repo-mirror-ci/sync/vdr-devel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
 

-            34
WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
Already up to date.
 

-            35
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
*** syncing vowstar
 

-            36
warning: Pulling without specifying how to reconcile divergent branches is
+            36
*** synced vowstar
 

-            37
discouraged. You can squelch this message by running one of the following
+            37
 * Sync succeeded
 

-            38
commands sometime before your next pull:
+            38
$ git log --format=%ci -1
 

-            39
+            39
$ git show -q --pretty=format:%G? HEAD
 

-            40
  git config pull.rebase false  # merge (the default strategy)
+            40
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 vowstar
 

-            41
  git config pull.rebase true   # rebase
-

-            42
  git config pull.ff only       # fast-forward only
-

-            43
-

-            44
You can replace "git config" with "git config --global" to set a default
-

-            45
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            46
or --ff-only on the command line to override the configured default per
-

-            47
invocation.
-

-            48
-

-            49
Already up to date.
-

-            50
*** syncing vowstar
-

-            51
*** synced vowstar
-

-            52
 * Sync succeeded
-

-            53
$ git log --format=%ci -1
-

-            54
$ git show -q --pretty=format:%G? HEAD
-

-            55
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 vowstar
-

-            56
 * Cache regenerated successfully
+            41
 * Cache regenerated successfully
 

 
         
diff --git a/vowstar.txt b/vowstar.txt
index c8bcd93d47a1..8dcb8ed1bc41 100644
--- a/vowstar.txt
+++ b/vowstar.txt
@@ -12,27 +12,12 @@
              'uri': 'git@github.com:vowstar/vowstar-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync vowstar
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vdr-devel repo at '/var/lib/repo-mirror-ci/sync/vdr-devel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/voyageur.html b/voyageur.html
index 6e707aac35fd..d7f11d22ab8f 100644
--- a/voyageur.html
+++ b/voyageur.html
@@ -30,89 +30,61 @@
 

             10
$ pmaint sync voyageur
 

-            11
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            11
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            12
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
warning: Pulling without specifying how to reconcile divergent branches is
 

-            19
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
discouraged. You can squelch this message by running one of the following
 

-            20
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
commands sometime before your next pull:
 

-            21
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
 

-            22
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase false  # merge (the default strategy)
 

-            23
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase true   # rebase
 

-            24
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.ff only       # fast-forward only
 

-            25
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 

-            26
WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
You can replace "git config" with "git config --global" to set a default
 

-            27
WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            28
WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
or --ff-only on the command line to override the configured default per
 

-            29
WARNING:pkgcore:vdr-devel repo at '/var/lib/repo-mirror-ci/sync/vdr-devel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
invocation.
 

-            30
WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
 

-            31
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
Already up to date.
 

-            32
warning: Pulling without specifying how to reconcile divergent branches is
+            32
*** syncing voyageur
 

-            33
discouraged. You can squelch this message by running one of the following
+            33
*** synced voyageur
 

-            34
commands sometime before your next pull:
+            34
 * Sync succeeded
 

-            35
+            35
$ git log --format=%ci -1
 

-            36
  git config pull.rebase false  # merge (the default strategy)
+            36
$ git show -q --pretty=format:%G? HEAD
 

-            37
  git config pull.rebase true   # rebase
+            37
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 voyageur
 

-            38
  git config pull.ff only       # fast-forward only
-

-            39
-

-            40
You can replace "git config" with "git config --global" to set a default
-

-            41
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            42
or --ff-only on the command line to override the configured default per
-

-            43
invocation.
-

-            44
-

-            45
Already up to date.
-

-            46
*** syncing voyageur
-

-            47
*** synced voyageur
-

-            48
 * Sync succeeded
-

-            49
$ git log --format=%ci -1
-

-            50
$ git show -q --pretty=format:%G? HEAD
-

-            51
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 voyageur
-

-            52
 * Cache regenerated successfully
+            38
 * Cache regenerated successfully
 

 
         
diff --git a/voyageur.txt b/voyageur.txt
index 987a3d2dd2b4..64688b366911 100644
--- a/voyageur.txt
+++ b/voyageur.txt
@@ -8,27 +8,13 @@
              'uri': 'https://cafarelli.fr/git/voyageur-overlay/'}],
  'status': 'official'}
 $ pmaint sync voyageur
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vdr-devel repo at '/var/lib/repo-mirror-ci/sync/vdr-devel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/waebbl.html b/waebbl.html
index 557eaf611236..c4f32ce8062d 100644
--- a/waebbl.html
+++ b/waebbl.html
@@ -38,89 +38,61 @@
 

             14
$ pmaint sync waebbl
 

-            15
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
warning: Pulling without specifying how to reconcile divergent branches is
 

-            23
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
discouraged. You can squelch this message by running one of the following
 

-            24
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
commands sometime before your next pull:
 

-            25
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 

-            26
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.rebase false  # merge (the default strategy)
 

-            27
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.rebase true   # rebase
 

-            28
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
  git config pull.ff only       # fast-forward only
 

-            29
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
 

-            30
WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
You can replace "git config" with "git config --global" to set a default
 

-            31
WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            32
WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
or --ff-only on the command line to override the configured default per
 

-            33
WARNING:pkgcore:vdr-devel repo at '/var/lib/repo-mirror-ci/sync/vdr-devel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
invocation.
 

-            34
WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
 

-            35
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
Already up to date.
 

-            36
warning: Pulling without specifying how to reconcile divergent branches is
+            36
*** syncing waebbl
 

-            37
discouraged. You can squelch this message by running one of the following
+            37
*** synced waebbl
 

-            38
commands sometime before your next pull:
+            38
 * Sync succeeded
 

-            39
+            39
$ git log --format=%ci -1
 

-            40
  git config pull.rebase false  # merge (the default strategy)
+            40
$ git show -q --pretty=format:%G? HEAD
 

-            41
  git config pull.rebase true   # rebase
+            41
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 waebbl
 

-            42
  git config pull.ff only       # fast-forward only
-

-            43
-

-            44
You can replace "git config" with "git config --global" to set a default
-

-            45
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            46
or --ff-only on the command line to override the configured default per
-

-            47
invocation.
-

-            48
-

-            49
Already up to date.
-

-            50
*** syncing waebbl
-

-            51
*** synced waebbl
-

-            52
 * Sync succeeded
-

-            53
$ git log --format=%ci -1
-

-            54
$ git show -q --pretty=format:%G? HEAD
-

-            55
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 waebbl
-

-            56
 * Cache regenerated successfully
+            42
 * Cache regenerated successfully
 

 
         
diff --git a/waebbl.txt b/waebbl.txt
index 259ac85f660f..cfd549fe2629 100644
--- a/waebbl.txt
+++ b/waebbl.txt
@@ -12,27 +12,13 @@
              'uri': 'git+ssh://git@github.com/waebbl/waebbl-gentoo.git'}],
  'status': 'unofficial'}
 $ pmaint sync waebbl
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vdr-devel repo at '/var/lib/repo-mirror-ci/sync/vdr-devel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/wayland-desktop.html b/wayland-desktop.html
index 42f24e9c67ce..bebaad0b0079 100644
--- a/wayland-desktop.html
+++ b/wayland-desktop.html
@@ -36,89 +36,61 @@
 

             13
$ pmaint sync wayland-desktop
 

-            14
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
warning: Pulling without specifying how to reconcile divergent branches is
 

-            22
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
discouraged. You can squelch this message by running one of the following
 

-            23
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
commands sometime before your next pull:
 

-            24
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 

-            25
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase false  # merge (the default strategy)
 

-            26
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.rebase true   # rebase
 

-            27
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.ff only       # fast-forward only
 

-            28
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
 

-            29
WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
You can replace "git config" with "git config --global" to set a default
 

-            30
WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            31
WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
or --ff-only on the command line to override the configured default per
 

-            32
WARNING:pkgcore:vdr-devel repo at '/var/lib/repo-mirror-ci/sync/vdr-devel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
invocation.
 

-            33
WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
 

-            34
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
Already up to date.
 

-            35
warning: Pulling without specifying how to reconcile divergent branches is
+            35
*** syncing wayland-desktop
 

-            36
discouraged. You can squelch this message by running one of the following
+            36
*** synced wayland-desktop
 

-            37
commands sometime before your next pull:
+            37
 * Sync succeeded
 

-            38
+            38
$ git log --format=%ci -1
 

-            39
  git config pull.rebase false  # merge (the default strategy)
+            39
$ git show -q --pretty=format:%G? HEAD
 

-            40
  git config pull.rebase true   # rebase
+            40
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 wayland-desktop
 

-            41
  git config pull.ff only       # fast-forward only
-

-            42
-

-            43
You can replace "git config" with "git config --global" to set a default
-

-            44
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            45
or --ff-only on the command line to override the configured default per
-

-            46
invocation.
-

-            47
-

-            48
Already up to date.
-

-            49
*** syncing wayland-desktop
-

-            50
*** synced wayland-desktop
-

-            51
 * Sync succeeded
-

-            52
$ git log --format=%ci -1
-

-            53
$ git show -q --pretty=format:%G? HEAD
-

-            54
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 wayland-desktop
-

-            55
 * Cache regenerated successfully
+            41
 * Cache regenerated successfully
 

 
         
diff --git a/wayland-desktop.txt b/wayland-desktop.txt
index ac8936aa9beb..929283b3a467 100644
--- a/wayland-desktop.txt
+++ b/wayland-desktop.txt
@@ -11,27 +11,13 @@
              'uri': 'git+ssh://git@github.com/epsilon-0/wayland-desktop.git'}],
  'status': 'unofficial'}
 $ pmaint sync wayland-desktop
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vdr-devel repo at '/var/lib/repo-mirror-ci/sync/vdr-devel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/wbrana.html b/wbrana.html
index a79f8f56e6f6..f114ea4f55da 100644
--- a/wbrana.html
+++ b/wbrana.html
@@ -40,101 +40,61 @@
 

             15
$ pmaint sync wbrana
 

-            16
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            23
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
warning: Pulling without specifying how to reconcile divergent branches is
 

-            24
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
discouraged. You can squelch this message by running one of the following
 

-            25
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
commands sometime before your next pull:
 

-            26
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
 

-            27
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.rebase false  # merge (the default strategy)
 

-            28
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
  git config pull.rebase true   # rebase
 

-            29
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
  git config pull.ff only       # fast-forward only
 

-            30
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
 

-            31
WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
You can replace "git config" with "git config --global" to set a default
 

-            32
WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            33
WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
or --ff-only on the command line to override the configured default per
 

-            34
WARNING:pkgcore:vdr-devel repo at '/var/lib/repo-mirror-ci/sync/vdr-devel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
invocation.
 

-            35
WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
 

-            36
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
Already up to date.
 

-            37
warning: Pulling without specifying how to reconcile divergent branches is
+            37
*** syncing wbrana
 

-            38
discouraged. You can squelch this message by running one of the following
+            38
*** synced wbrana
 

-            39
commands sometime before your next pull:
+            39
 * Sync succeeded
 

-            40
+            40
$ git log --format=%ci -1
 

-            41
  git config pull.rebase false  # merge (the default strategy)
+            41
$ git show -q --pretty=format:%G? HEAD
 

-            42
  git config pull.rebase true   # rebase
+            42
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 wbrana
 

-            43
  git config pull.ff only       # fast-forward only
-

-            44
-

-            45
You can replace "git config" with "git config --global" to set a default
-

-            46
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            47
or --ff-only on the command line to override the configured default per
-

-            48
invocation.
-

-            49
-

-            50
fatal: unable to access 'https://anongit.gentoo.org/git/user/wbrana.git/': The requested URL returned error: 502
-

-            51
*** syncing wbrana
-

-            52
!!! failed syncing wbrana
-

-            53
 * Sync failed with 1
-
[FATAL]
-            54
 * Will try to re-create
-

-            55
$ pmaint sync wbrana
-

-            56
Cloning into '/var/lib/repo-mirror-ci/sync/wbrana'...
-

-            57
*** syncing wbrana
-

-            58
*** synced wbrana
-

-            59
 * Sync succeeded after re-adding
-

-            60
$ git log --format=%ci -1
-

-            61
$ git show -q --pretty=format:%G? HEAD
-

-            62
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 wbrana
-

-            63
 * Cache regenerated successfully
+            43
 * Cache regenerated successfully
 

 
         
diff --git a/wbrana.txt b/wbrana.txt
index 89ffff34c339..13ad36fb737a 100644
--- a/wbrana.txt
+++ b/wbrana.txt
@@ -13,27 +13,13 @@
              'uri': 'git+ssh://git@git.gentoo.org/user/wbrana.git'}],
  'status': 'unofficial'}
 $ pmaint sync wbrana
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vdr-devel repo at '/var/lib/repo-mirror-ci/sync/vdr-devel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
@@ -47,16 +33,10 @@ 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.
 
-fatal: unable to access 'https://anongit.gentoo.org/git/user/wbrana.git/': The requested URL returned error: 502
-*** syncing wbrana
-!!! failed syncing wbrana
- * Sync failed with 1
- * Will try to re-create
-$ pmaint sync wbrana
-Cloning into '/var/lib/repo-mirror-ci/sync/wbrana'...
+Already up to date.
 *** syncing wbrana
 *** synced wbrana
- * Sync succeeded after re-adding
+ * Sync succeeded
 $ git log --format=%ci -1
 $ git show -q --pretty=format:%G? HEAD
 $ pmaint regen --use-local-desc --pkg-desc-index -t 1 wbrana
diff --git a/wdzierzan.html b/wdzierzan.html
index 3f783aa8d047..3b2f3836a55a 100644
--- a/wdzierzan.html
+++ b/wdzierzan.html
@@ -44,98 +44,48 @@
 

             17
$ pmaint sync wdzierzan
 

-            18
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            23
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            24
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            25
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            26
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

             27
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            28
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            29
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            30
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            31
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
Cloning into '/var/lib/repo-mirror-ci/sync/wdzierzan'...
 

-            32
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
*** syncing wdzierzan
 

-            33
WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
*** synced wdzierzan
 

-            34
WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
 * Sync succeeded
 

-            35
WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
$ git log --format=%ci -1
 

-            36
WARNING:pkgcore:vdr-devel repo at '/var/lib/repo-mirror-ci/sync/vdr-devel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
$ git show -q --pretty=format:%G? HEAD
 

-            37
WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            37
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 wdzierzan
 

-            38
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            38
 * Cache regenerated successfully
 

-            39
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            40
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            41
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            42
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            43
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            44
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            45
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            46
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            47
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            48
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            49
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            50
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            51
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            52
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            53
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            54
WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            55
WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            56
WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            57
WARNING:pkgcore:vdr-devel repo at '/var/lib/repo-mirror-ci/sync/vdr-devel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            58
WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            59
Cloning into '/var/lib/repo-mirror-ci/sync/wdzierzan'...
-

-            60
fatal: unable to access 'https://anongit.gentoo.org/git/user/wdzierzan.git/': The requested URL returned error: 502
-

-            61
*** syncing wdzierzan
-

-            62
!!! failed syncing wdzierzan
-

-            63
 * Sync failed with 1
-
[FATAL]
 
         
     
diff --git a/wdzierzan.txt b/wdzierzan.txt
index 3175760ae3bf..51ac61d6102a 100644
--- a/wdzierzan.txt
+++ b/wdzierzan.txt
@@ -15,49 +15,24 @@
  'status': 'unofficial'}
  * Adding new repository
 $ pmaint sync wdzierzan
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vdr-devel repo at '/var/lib/repo-mirror-ci/sync/vdr-devel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vdr-devel repo at '/var/lib/repo-mirror-ci/sync/vdr-devel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 Cloning into '/var/lib/repo-mirror-ci/sync/wdzierzan'...
-fatal: unable to access 'https://anongit.gentoo.org/git/user/wdzierzan.git/': The requested URL returned error: 502
 *** syncing wdzierzan
-!!! failed syncing wdzierzan
- * Sync failed with 1
+*** synced wdzierzan
+ * Sync succeeded
+$ git log --format=%ci -1
+$ git show -q --pretty=format:%G? HEAD
+$ pmaint regen --use-local-desc --pkg-desc-index -t 1 wdzierzan
+ * Cache regenerated successfully
diff --git a/webos.html b/webos.html
index 5001d8543dc6..4aa56d62b96a 100644
--- a/webos.html
+++ b/webos.html
@@ -40,89 +40,61 @@
 

             15
$ pmaint sync webos
 

-            16
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            23
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
warning: Pulling without specifying how to reconcile divergent branches is
 

-            24
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
discouraged. You can squelch this message by running one of the following
 

-            25
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
commands sometime before your next pull:
 

-            26
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
 

-            27
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.rebase false  # merge (the default strategy)
 

-            28
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
  git config pull.rebase true   # rebase
 

-            29
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
  git config pull.ff only       # fast-forward only
 

-            30
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
 

-            31
WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
You can replace "git config" with "git config --global" to set a default
 

-            32
WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            33
WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
or --ff-only on the command line to override the configured default per
 

-            34
WARNING:pkgcore:vdr-devel repo at '/var/lib/repo-mirror-ci/sync/vdr-devel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
invocation.
 

-            35
WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
 

-            36
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
Already up to date.
 

-            37
warning: Pulling without specifying how to reconcile divergent branches is
+            37
*** syncing webos
 

-            38
discouraged. You can squelch this message by running one of the following
+            38
*** synced webos
 

-            39
commands sometime before your next pull:
+            39
 * Sync succeeded
 

-            40
+            40
$ git log --format=%ci -1
 

-            41
  git config pull.rebase false  # merge (the default strategy)
+            41
$ git show -q --pretty=format:%G? HEAD
 

-            42
  git config pull.rebase true   # rebase
+            42
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 webos
 

-            43
  git config pull.ff only       # fast-forward only
-

-            44
-

-            45
You can replace "git config" with "git config --global" to set a default
-

-            46
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            47
or --ff-only on the command line to override the configured default per
-

-            48
invocation.
-

-            49
-

-            50
Already up to date.
-

-            51
*** syncing webos
-

-            52
*** synced webos
-

-            53
 * Sync succeeded
-

-            54
$ git log --format=%ci -1
-

-            55
$ git show -q --pretty=format:%G? HEAD
-

-            56
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 webos
-

-            57
 * Cache regenerated successfully
+            43
 * Cache regenerated successfully
 

 
         
diff --git a/webos.txt b/webos.txt
index 60ef4231410c..7397c94ff587 100644
--- a/webos.txt
+++ b/webos.txt
@@ -13,27 +13,13 @@
             {'type': 'git', 'uri': 'git@github.com:feniksa/webos-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync webos
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vdr-devel repo at '/var/lib/repo-mirror-ci/sync/vdr-devel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/weuxel.html b/weuxel.html
index 6e2d7315afd0..ee5297a0971e 100644
--- a/weuxel.html
+++ b/weuxel.html
@@ -40,89 +40,61 @@
 

             15
$ pmaint sync weuxel
 

-            16
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            23
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
warning: Pulling without specifying how to reconcile divergent branches is
 

-            24
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
discouraged. You can squelch this message by running one of the following
 

-            25
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
commands sometime before your next pull:
 

-            26
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
 

-            27
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.rebase false  # merge (the default strategy)
 

-            28
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
  git config pull.rebase true   # rebase
 

-            29
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
  git config pull.ff only       # fast-forward only
 

-            30
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
 

-            31
WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
You can replace "git config" with "git config --global" to set a default
 

-            32
WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            33
WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
or --ff-only on the command line to override the configured default per
 

-            34
WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
invocation.
 

-            35
WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
 

-            36
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
Already up to date.
 

-            37
warning: Pulling without specifying how to reconcile divergent branches is
+            37
*** syncing weuxel
 

-            38
discouraged. You can squelch this message by running one of the following
+            38
*** synced weuxel
 

-            39
commands sometime before your next pull:
+            39
 * Sync succeeded
 

-            40
+            40
$ git log --format=%ci -1
 

-            41
  git config pull.rebase false  # merge (the default strategy)
+            41
$ git show -q --pretty=format:%G? HEAD
 

-            42
  git config pull.rebase true   # rebase
+            42
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 weuxel
 

-            43
  git config pull.ff only       # fast-forward only
-

-            44
-

-            45
You can replace "git config" with "git config --global" to set a default
-

-            46
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            47
or --ff-only on the command line to override the configured default per
-

-            48
invocation.
-

-            49
-

-            50
Already up to date.
-

-            51
*** syncing weuxel
-

-            52
*** synced weuxel
-

-            53
 * Sync succeeded
-

-            54
$ git log --format=%ci -1
-

-            55
$ git show -q --pretty=format:%G? HEAD
-

-            56
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 weuxel
-

-            57
 * Cache regenerated successfully
+            43
 * Cache regenerated successfully
 

 
         
diff --git a/weuxel.txt b/weuxel.txt
index 425cd47bb02d..97d7ee08ef41 100644
--- a/weuxel.txt
+++ b/weuxel.txt
@@ -13,27 +13,13 @@
             {'type': 'git', 'uri': 'git@github.com:Weuxel/portage-weuxel.git'}],
  'status': 'unofficial'}
 $ pmaint sync weuxel
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/what4-java.html b/what4-java.html
index 820fa5362c58..90a5fc753374 100644
--- a/what4-java.html
+++ b/what4-java.html
@@ -34,89 +34,59 @@
 

             12
$ pmaint sync what4-java
 

-            13
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
warning: Pulling without specifying how to reconcile divergent branches is
 

-            20
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
discouraged. You can squelch this message by running one of the following
 

-            21
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
commands sometime before your next pull:
 

-            22
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
 

-            23
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase false  # merge (the default strategy)
 

-            24
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.rebase true   # rebase
 

-            25
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.ff only       # fast-forward only
 

-            26
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
 

-            27
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
You can replace "git config" with "git config --global" to set a default
 

-            28
WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            29
WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
or --ff-only on the command line to override the configured default per
 

-            30
WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
invocation.
 

-            31
WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
 

-            32
WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
Already up to date.
 

-            33
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
*** syncing what4-java
 

-            34
warning: Pulling without specifying how to reconcile divergent branches is
+            34
*** synced what4-java
 

-            35
discouraged. You can squelch this message by running one of the following
+            35
 * Sync succeeded
 

-            36
commands sometime before your next pull:
+            36
$ git log --format=%ci -1
 

-            37
+            37
$ git show -q --pretty=format:%G? HEAD
 

-            38
  git config pull.rebase false  # merge (the default strategy)
+            38
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 what4-java
 

-            39
  git config pull.rebase true   # rebase
-

-            40
  git config pull.ff only       # fast-forward only
-

-            41
-

-            42
You can replace "git config" with "git config --global" to set a default
-

-            43
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            44
or --ff-only on the command line to override the configured default per
-

-            45
invocation.
-

-            46
-

-            47
Already up to date.
-

-            48
*** syncing what4-java
-

-            49
*** synced what4-java
-

-            50
 * Sync succeeded
-

-            51
$ git log --format=%ci -1
-

-            52
$ git show -q --pretty=format:%G? HEAD
-

-            53
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 what4-java
-

-            54
 * Cache regenerated successfully
+            39
 * Cache regenerated successfully
 

 
         
diff --git a/what4-java.txt b/what4-java.txt
index 3258f413da83..1c605a52ff22 100644
--- a/what4-java.txt
+++ b/what4-java.txt
@@ -10,27 +10,12 @@
              'uri': 'https://github.com/kwhat/gentoo-what4-java-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync what4-java
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/wichtounet.html b/wichtounet.html
index 04fbd2f0ca88..824197db097a 100644
--- a/wichtounet.html
+++ b/wichtounet.html
@@ -42,89 +42,59 @@
 

             16
$ pmaint sync wichtounet
 

-            17
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            23
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
warning: Pulling without specifying how to reconcile divergent branches is
 

-            24
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
discouraged. You can squelch this message by running one of the following
 

-            25
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
commands sometime before your next pull:
 

-            26
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
 

-            27
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.rebase false  # merge (the default strategy)
 

-            28
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
  git config pull.rebase true   # rebase
 

-            29
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
  git config pull.ff only       # fast-forward only
 

-            30
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
 

-            31
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
You can replace "git config" with "git config --global" to set a default
 

-            32
WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            33
WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
or --ff-only on the command line to override the configured default per
 

-            34
WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
invocation.
 

-            35
WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
 

-            36
WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
Already up to date.
 

-            37
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            37
*** syncing wichtounet
 

-            38
warning: Pulling without specifying how to reconcile divergent branches is
+            38
*** synced wichtounet
 

-            39
discouraged. You can squelch this message by running one of the following
+            39
 * Sync succeeded
 

-            40
commands sometime before your next pull:
+            40
$ git log --format=%ci -1
 

-            41
+            41
$ git show -q --pretty=format:%G? HEAD
 

-            42
  git config pull.rebase false  # merge (the default strategy)
+            42
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 wichtounet
 

-            43
  git config pull.rebase true   # rebase
-

-            44
  git config pull.ff only       # fast-forward only
-

-            45
-

-            46
You can replace "git config" with "git config --global" to set a default
-

-            47
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            48
or --ff-only on the command line to override the configured default per
-

-            49
invocation.
-

-            50
-

-            51
Already up to date.
-

-            52
*** syncing wichtounet
-

-            53
*** synced wichtounet
-

-            54
 * Sync succeeded
-

-            55
$ git log --format=%ci -1
-

-            56
$ git show -q --pretty=format:%G? HEAD
-

-            57
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 wichtounet
-

-            58
 * Cache regenerated successfully
+            43
 * Cache regenerated successfully
 

 
         
diff --git a/wichtounet.txt b/wichtounet.txt
index 3dd6fd08c9d1..42e11869f6c2 100644
--- a/wichtounet.txt
+++ b/wichtounet.txt
@@ -14,27 +14,12 @@
              'uri': 'git@github.com:wichtounet/wichtounet-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync wichtounet
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/wine.html b/wine.html
index b5db295a2b9e..fc3061140790 100644
--- a/wine.html
+++ b/wine.html
@@ -36,107 +36,61 @@
 

             13
 'status': 'official'}
 

-            14
 * Adding new repository
+            14
$ pmaint sync wine
 

-            15
$ pmaint sync wine
+            15
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
warning: Pulling without specifying how to reconcile divergent branches is
 

-            22
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
discouraged. You can squelch this message by running one of the following
 

-            23
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
commands sometime before your next pull:
 

-            24
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 

-            25
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase false  # merge (the default strategy)
 

-            26
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.rebase true   # rebase
 

-            27
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.ff only       # fast-forward only
 

-            28
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
 

-            29
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
You can replace "git config" with "git config --global" to set a default
 

-            30
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            31
WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
or --ff-only on the command line to override the configured default per
 

-            32
WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
invocation.
 

-            33
WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
 

-            34
WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
Already up to date.
 

-            35
WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
*** syncing wine
 

-            36
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
*** synced wine
 

-            37
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            37
 * Sync succeeded
 

-            38
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            38
$ git log --format=%ci -1
 

-            39
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            39
$ git show -q --pretty=format:%G? HEAD
 

-            40
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            40
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 wine
 

-            41
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            42
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            43
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            44
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            45
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            46
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            47
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            48
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            49
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            50
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            51
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            52
WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            53
WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            54
WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            55
WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            56
WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            57
Cloning into '/var/lib/repo-mirror-ci/sync/wine'...
-

-            58
*** syncing wine
-

-            59
*** synced wine
-

-            60
 * Sync succeeded
-

-            61
$ git log --format=%ci -1
-

-            62
$ git show -q --pretty=format:%G? HEAD
-

-            63
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 wine
-

-            64
 * Cache regenerated successfully
+            41
 * Cache regenerated successfully
 

 
         
diff --git a/wine.txt b/wine.txt
index 69e5f9ad5881..10952cdda992 100644
--- a/wine.txt
+++ b/wine.txt
@@ -11,50 +11,27 @@
             {'type': 'git',
              'uri': 'git://anongit.gentoo.org/repo/proj/wine.git'}],
  'status': 'official'}
- * Adding new repository
 $ pmaint sync wine
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-Cloning into '/var/lib/repo-mirror-ci/sync/wine'...
+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.
+
+Already up to date.
 *** syncing wine
 *** synced wine
  * Sync succeeded
diff --git a/winny.html b/winny.html
index 8ecf7ee65cea..57299e5048aa 100644
--- a/winny.html
+++ b/winny.html
@@ -34,89 +34,61 @@
 

             12
$ pmaint sync winny
 

-            13
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
warning: Pulling without specifying how to reconcile divergent branches is
 

-            21
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
discouraged. You can squelch this message by running one of the following
 

-            22
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
commands sometime before your next pull:
 

-            23
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
 

-            24
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.rebase false  # merge (the default strategy)
 

-            25
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase true   # rebase
 

-            26
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.ff only       # fast-forward only
 

-            27
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
 

-            28
WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
You can replace "git config" with "git config --global" to set a default
 

-            29
WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            30
WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
or --ff-only on the command line to override the configured default per
 

-            31
WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
invocation.
 

-            32
WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
 

-            33
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
Already up to date.
 

-            34
warning: Pulling without specifying how to reconcile divergent branches is
+            34
*** syncing winny
 

-            35
discouraged. You can squelch this message by running one of the following
+            35
*** synced winny
 

-            36
commands sometime before your next pull:
+            36
 * Sync succeeded
 

-            37
+            37
$ git log --format=%ci -1
 

-            38
  git config pull.rebase false  # merge (the default strategy)
+            38
$ git show -q --pretty=format:%G? HEAD
 

-            39
  git config pull.rebase true   # rebase
+            39
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 winny
 

-            40
  git config pull.ff only       # fast-forward only
-

-            41
-

-            42
You can replace "git config" with "git config --global" to set a default
-

-            43
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            44
or --ff-only on the command line to override the configured default per
-

-            45
invocation.
-

-            46
-

-            47
Already up to date.
-

-            48
*** syncing winny
-

-            49
*** synced winny
-

-            50
 * Sync succeeded
-

-            51
$ git log --format=%ci -1
-

-            52
$ git show -q --pretty=format:%G? HEAD
-

-            53
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 winny
-

-            54
 * Cache regenerated successfully
+            40
 * Cache regenerated successfully
 

 
         
diff --git a/winny.txt b/winny.txt
index f76c75718916..716fd3b3fd38 100644
--- a/winny.txt
+++ b/winny.txt
@@ -10,27 +10,13 @@
              'uri': 'git+ssh://git@github.com/winny-/winny-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync winny
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/wjn-overlay.html b/wjn-overlay.html
index 0d451cea804c..c23b56f6dfc9 100644
--- a/wjn-overlay.html
+++ b/wjn-overlay.html
@@ -28,91 +28,63 @@
 

             9
$ pmaint sync wjn-overlay
 

-            10
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            10
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            11
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            11
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            12
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
warning: Pulling without specifying how to reconcile divergent branches is
 

-            18
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
discouraged. You can squelch this message by running one of the following
 

-            19
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
commands sometime before your next pull:
 

-            20
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
 

-            21
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
  git config pull.rebase false  # merge (the default strategy)
 

-            22
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase true   # rebase
 

-            23
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.ff only       # fast-forward only
 

-            24
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 

-            25
WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
You can replace "git config" with "git config --global" to set a default
 

-            26
WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            27
WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
or --ff-only on the command line to override the configured default per
 

-            28
WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
invocation.
 

-            29
WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
 

-            30
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
Already up to date.
 

-            31
warning: Pulling without specifying how to reconcile divergent branches is
+            31
*** syncing wjn-overlay
 

-            32
discouraged. You can squelch this message by running one of the following
+            32
*** synced wjn-overlay
 

-            33
commands sometime before your next pull:
+            33
 * Sync succeeded
 

-            34
+            34
$ git log --format=%ci -1
 

-            35
  git config pull.rebase false  # merge (the default strategy)
+            35
$ git show -q --pretty=format:%G? HEAD
 

-            36
  git config pull.rebase true   # rebase
+            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 wjn-overlay
 

-            37
  git config pull.ff only       # fast-forward only
-

-            38
-

-            39
You can replace "git config" with "git config --global" to set a default
-

-            40
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            41
or --ff-only on the command line to override the configured default per
-

-            42
invocation.
-

-            43
-

-            44
Already up to date.
-

-            45
*** syncing wjn-overlay
-

-            46
*** synced wjn-overlay
-

-            47
 * Sync succeeded
-

-            48
$ git log --format=%ci -1
-

-            49
$ git show -q --pretty=format:%G? HEAD
-

-            50
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 wjn-overlay
-

-            51
 * www-plugins/browserpass-3.0.6-r1: failed sourcing ebuild: external commands disallowed during metadata regen: 'go-module_vendor_uris'
+            37
 * www-plugins/browserpass-3.0.6-r1: failed sourcing ebuild: external commands disallowed during metadata regen: 'go-module_vendor_uris'
 
[FATAL]
-            52
 * Cache regen failed with 1
+            38
 * Cache regen failed with 1
 

 
         
diff --git a/wjn-overlay.txt b/wjn-overlay.txt
index 9370ee4f6156..16d488565aaa 100644
--- a/wjn-overlay.txt
+++ b/wjn-overlay.txt
@@ -7,27 +7,13 @@
              'uri': 'https://bitbucket.org/wjn/wjn-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync wjn-overlay
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/wuodan.html b/wuodan.html
index d481d8c5c62d..c9ba61a636f4 100644
--- a/wuodan.html
+++ b/wuodan.html
@@ -38,89 +38,61 @@
 

             14
$ pmaint sync wuodan
 

-            15
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
warning: Pulling without specifying how to reconcile divergent branches is
 

-            23
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
discouraged. You can squelch this message by running one of the following
 

-            24
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
commands sometime before your next pull:
 

-            25
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 

-            26
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.rebase false  # merge (the default strategy)
 

-            27
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.rebase true   # rebase
 

-            28
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
  git config pull.ff only       # fast-forward only
 

-            29
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
 

-            30
WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
You can replace "git config" with "git config --global" to set a default
 

-            31
WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            32
WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
or --ff-only on the command line to override the configured default per
 

-            33
WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
invocation.
 

-            34
WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
 

-            35
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
Already up to date.
 

-            36
warning: Pulling without specifying how to reconcile divergent branches is
+            36
*** syncing wuodan
 

-            37
discouraged. You can squelch this message by running one of the following
+            37
*** synced wuodan
 

-            38
commands sometime before your next pull:
+            38
 * Sync succeeded
 

-            39
+            39
$ git log --format=%ci -1
 

-            40
  git config pull.rebase false  # merge (the default strategy)
+            40
$ git show -q --pretty=format:%G? HEAD
 

-            41
  git config pull.rebase true   # rebase
+            41
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 wuodan
 

-            42
  git config pull.ff only       # fast-forward only
-

-            43
-

-            44
You can replace "git config" with "git config --global" to set a default
-

-            45
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            46
or --ff-only on the command line to override the configured default per
-

-            47
invocation.
-

-            48
-

-            49
Already up to date.
-

-            50
*** syncing wuodan
-

-            51
*** synced wuodan
-

-            52
 * Sync succeeded
-

-            53
$ git log --format=%ci -1
-

-            54
$ git show -q --pretty=format:%G? HEAD
-

-            55
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 wuodan
-

-            56
 * Cache regenerated successfully
+            42
 * Cache regenerated successfully
 

 
         
diff --git a/wuodan.txt b/wuodan.txt
index 11821e726371..3a7da520a269 100644
--- a/wuodan.txt
+++ b/wuodan.txt
@@ -12,27 +12,13 @@
              'uri': 'git+ssh://git@github.com/Wuodan/gentoo-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync wuodan
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/x11.html b/x11.html
index ca1201ef8f8e..eae9a9cb3c66 100644
--- a/x11.html
+++ b/x11.html
@@ -34,111 +34,63 @@
 

             12
 'status': 'official'}
 

-            13
 * Adding new repository
+            13
$ pmaint sync x11
 

-            14
$ pmaint sync x11
+            14
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
warning: Pulling without specifying how to reconcile divergent branches is
 

-            22
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
discouraged. You can squelch this message by running one of the following
 

-            23
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
commands sometime before your next pull:
 

-            24
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 

-            25
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase false  # merge (the default strategy)
 

-            26
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.rebase true   # rebase
 

-            27
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.ff only       # fast-forward only
 

-            28
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
 

-            29
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
You can replace "git config" with "git config --global" to set a default
 

-            30
WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            31
WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
or --ff-only on the command line to override the configured default per
 

-            32
WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
invocation.
 

-            33
WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
 

-            34
WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
Already up to date.
 

-            35
WARNING:pkgcore:wine repo at '/var/lib/repo-mirror-ci/sync/wine', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
*** syncing x11
 

-            36
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
*** synced x11
 

-            37
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            37
 * Sync succeeded
 

-            38
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            38
$ git log --format=%ci -1
 

-            39
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            39
$ git show -q --pretty=format:%G? HEAD
 

-            40
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            40
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 x11
 

-            41
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            42
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            43
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            44
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            45
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            46
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            47
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            48
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            49
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            50
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            51
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            52
WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            53
WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            54
WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            55
WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            56
WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            57
WARNING:pkgcore:wine repo at '/var/lib/repo-mirror-ci/sync/wine', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            58
Cloning into '/var/lib/repo-mirror-ci/sync/x11'...
-

-            59
*** syncing x11
-

-            60
*** synced x11
-

-            61
 * Sync succeeded
-

-            62
$ git log --format=%ci -1
-

-            63
$ git show -q --pretty=format:%G? HEAD
-

-            64
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 x11
-

-            65
 * Cache regenerated successfully
+            41
 * Cache regenerated successfully
 

 
         
diff --git a/x11.txt b/x11.txt
index 86086d3e041b..c4e10de94c06 100644
--- a/x11.txt
+++ b/x11.txt
@@ -10,52 +10,28 @@
             {'type': 'git',
              'uri': 'git+ssh://git@git.gentoo.org/proj/x11.git'}],
  'status': 'official'}
- * Adding new repository
 $ pmaint sync x11
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wine repo at '/var/lib/repo-mirror-ci/sync/wine', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wine repo at '/var/lib/repo-mirror-ci/sync/wine', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-Cloning into '/var/lib/repo-mirror-ci/sync/x11'...
+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.
+
+Already up to date.
 *** syncing x11
 *** synced x11
  * Sync succeeded
diff --git a/xdch47.html b/xdch47.html
index a655037b78b9..225f90e73a0a 100644
--- a/xdch47.html
+++ b/xdch47.html
@@ -34,91 +34,61 @@
 

             12
$ pmaint sync xdch47
 

-            13
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
warning: Pulling without specifying how to reconcile divergent branches is
 

-            21
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
discouraged. You can squelch this message by running one of the following
 

-            22
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
commands sometime before your next pull:
 

-            23
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
 

-            24
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.rebase false  # merge (the default strategy)
 

-            25
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase true   # rebase
 

-            26
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.ff only       # fast-forward only
 

-            27
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
 

-            28
WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
You can replace "git config" with "git config --global" to set a default
 

-            29
WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            30
WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
or --ff-only on the command line to override the configured default per
 

-            31
WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
invocation.
 

-            32
WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
 

-            33
WARNING:pkgcore:wine repo at '/var/lib/repo-mirror-ci/sync/wine', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
Already up to date.
 

-            34
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
*** syncing xdch47
 

-            35
warning: Pulling without specifying how to reconcile divergent branches is
+            35
*** synced xdch47
 

-            36
discouraged. You can squelch this message by running one of the following
+            36
 * Sync succeeded
 

-            37
commands sometime before your next pull:
+            37
$ git log --format=%ci -1
 

-            38
+            38
$ git show -q --pretty=format:%G? HEAD
 

-            39
  git config pull.rebase false  # merge (the default strategy)
+            39
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 xdch47
 

-            40
  git config pull.rebase true   # rebase
-

-            41
  git config pull.ff only       # fast-forward only
-

-            42
-

-            43
You can replace "git config" with "git config --global" to set a default
-

-            44
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            45
or --ff-only on the command line to override the configured default per
-

-            46
invocation.
-

-            47
-

-            48
Already up to date.
-

-            49
*** syncing xdch47
-

-            50
*** synced xdch47
-

-            51
 * Sync succeeded
-

-            52
$ git log --format=%ci -1
-

-            53
$ git show -q --pretty=format:%G? HEAD
-

-            54
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 xdch47
-

-            55
 * Cache regenerated successfully
+            40
 * Cache regenerated successfully
 

 
         
diff --git a/xdch47.txt b/xdch47.txt
index fb83a89ec0ed..a385d382b86c 100644
--- a/xdch47.txt
+++ b/xdch47.txt
@@ -10,28 +10,13 @@
              'uri': 'git+ssh://git@github.com/xdch47/gpo-xdch47.git'}],
  'status': 'unofficial'}
 $ pmaint sync xdch47
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wine repo at '/var/lib/repo-mirror-ci/sync/wine', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/xelnor.html b/xelnor.html
index 7954875fc2db..277d4a57f26a 100644
--- a/xelnor.html
+++ b/xelnor.html
@@ -26,93 +26,61 @@
 

             8
$ pmaint sync xelnor
 

-            9
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            9
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            10
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            10
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            11
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            11
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            12
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
warning: Pulling without specifying how to reconcile divergent branches is
 

-            17
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
discouraged. You can squelch this message by running one of the following
 

-            18
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
commands sometime before your next pull:
 

-            19
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
 

-            20
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
  git config pull.rebase false  # merge (the default strategy)
 

-            21
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
  git config pull.rebase true   # rebase
 

-            22
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.ff only       # fast-forward only
 

-            23
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
 

-            24
WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
You can replace "git config" with "git config --global" to set a default
 

-            25
WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            26
WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
or --ff-only on the command line to override the configured default per
 

-            27
WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
invocation.
 

-            28
WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
 

-            29
WARNING:pkgcore:wine repo at '/var/lib/repo-mirror-ci/sync/wine', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
Already up to date.
 

-            30
WARNING:pkgcore:x11 repo at '/var/lib/repo-mirror-ci/sync/x11', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
*** syncing xelnor
 

-            31
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
*** synced xelnor
 

-            32
warning: Pulling without specifying how to reconcile divergent branches is
+            32
 * Sync succeeded
 

-            33
discouraged. You can squelch this message by running one of the following
+            33
$ git log --format=%ci -1
 

-            34
commands sometime before your next pull:
+            34
$ git show -q --pretty=format:%G? HEAD
 

-            35
+            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 xelnor
 

-            36
  git config pull.rebase false  # merge (the default strategy)
-

-            37
  git config pull.rebase true   # rebase
-

-            38
  git config pull.ff only       # fast-forward only
-

-            39
-

-            40
You can replace "git config" with "git config --global" to set a default
-

-            41
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            42
or --ff-only on the command line to override the configured default per
-

-            43
invocation.
-

-            44
-

-            45
Already up to date.
-

-            46
*** syncing xelnor
-

-            47
*** synced xelnor
-

-            48
 * Sync succeeded
-

-            49
$ git log --format=%ci -1
-

-            50
$ git show -q --pretty=format:%G? HEAD
-

-            51
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 xelnor
-

-            52
 * Cache regenerated successfully
+            36
 * Cache regenerated successfully
 

 
         
diff --git a/xelnor.txt b/xelnor.txt
index 32e342191378..ab289e98e3cd 100644
--- a/xelnor.txt
+++ b/xelnor.txt
@@ -6,29 +6,13 @@
  'source': [{'type': 'git', 'uri': 'git://overlay.xelnor.net/overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync xelnor
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wine repo at '/var/lib/repo-mirror-ci/sync/wine', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:x11 repo at '/var/lib/repo-mirror-ci/sync/x11', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/xoreos.html b/xoreos.html
index 21d84124c56d..d09cc4bdbd4d 100644
--- a/xoreos.html
+++ b/xoreos.html
@@ -42,91 +42,61 @@
 

             16
$ pmaint sync xoreos
 

-            17
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            23
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            24
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
warning: Pulling without specifying how to reconcile divergent branches is
 

-            25
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
discouraged. You can squelch this message by running one of the following
 

-            26
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
commands sometime before your next pull:
 

-            27
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
 

-            28
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
  git config pull.rebase false  # merge (the default strategy)
 

-            29
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
  git config pull.rebase true   # rebase
 

-            30
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
  git config pull.ff only       # fast-forward only
 

-            31
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
 

-            32
WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
You can replace "git config" with "git config --global" to set a default
 

-            33
WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            34
WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
or --ff-only on the command line to override the configured default per
 

-            35
WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
invocation.
 

-            36
WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
 

-            37
WARNING:pkgcore:wine repo at '/var/lib/repo-mirror-ci/sync/wine', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            37
Already up to date.
 

-            38
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            38
*** syncing xoreos
 

-            39
warning: Pulling without specifying how to reconcile divergent branches is
+            39
*** synced xoreos
 

-            40
discouraged. You can squelch this message by running one of the following
+            40
 * Sync succeeded
 

-            41
commands sometime before your next pull:
+            41
$ git log --format=%ci -1
 

-            42
+            42
$ git show -q --pretty=format:%G? HEAD
 

-            43
  git config pull.rebase false  # merge (the default strategy)
+            43
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 xoreos
 

-            44
  git config pull.rebase true   # rebase
-

-            45
  git config pull.ff only       # fast-forward only
-

-            46
-

-            47
You can replace "git config" with "git config --global" to set a default
-

-            48
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            49
or --ff-only on the command line to override the configured default per
-

-            50
invocation.
-

-            51
-

-            52
Already up to date.
-

-            53
*** syncing xoreos
-

-            54
*** synced xoreos
-

-            55
 * Sync succeeded
-

-            56
$ git log --format=%ci -1
-

-            57
$ git show -q --pretty=format:%G? HEAD
-

-            58
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 xoreos
-

-            59
 * Cache regenerated successfully
+            44
 * Cache regenerated successfully
 

 
         
diff --git a/xoreos.txt b/xoreos.txt
index 619326c9face..543d2558fc8b 100644
--- a/xoreos.txt
+++ b/xoreos.txt
@@ -14,28 +14,13 @@
              'uri': 'git+ssh://git@github.com/xoreos/gentoo-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync xoreos
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wine repo at '/var/lib/repo-mirror-ci/sync/wine', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/xtreemfs.html b/xtreemfs.html
index e42c7f239ae3..350d270c77be 100644
--- a/xtreemfs.html
+++ b/xtreemfs.html
@@ -42,95 +42,65 @@
 

             16
$ pmaint sync xtreemfs
 

-            17
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            23
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            24
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
warning: Pulling without specifying how to reconcile divergent branches is
 

-            25
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
discouraged. You can squelch this message by running one of the following
 

-            26
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
commands sometime before your next pull:
 

-            27
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
 

-            28
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
  git config pull.rebase false  # merge (the default strategy)
 

-            29
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
  git config pull.rebase true   # rebase
 

-            30
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
  git config pull.ff only       # fast-forward only
 

-            31
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
 

-            32
WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
You can replace "git config" with "git config --global" to set a default
 

-            33
WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            34
WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
or --ff-only on the command line to override the configured default per
 

-            35
WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
invocation.
 

-            36
WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
 

-            37
WARNING:pkgcore:x11 repo at '/var/lib/repo-mirror-ci/sync/x11', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            37
Already up to date.
 

-            38
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            38
*** syncing xtreemfs
 

-            39
warning: Pulling without specifying how to reconcile divergent branches is
+            39
*** synced xtreemfs
 

-            40
discouraged. You can squelch this message by running one of the following
+            40
 * Sync succeeded
 

-            41
commands sometime before your next pull:
+            41
$ git log --format=%ci -1
 

-            42
+            42
$ git show -q --pretty=format:%G? HEAD
 

-            43
  git config pull.rebase false  # merge (the default strategy)
+            43
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 xtreemfs
 

-            44
  git config pull.rebase true   # rebase
-

-            45
  git config pull.ff only       # fast-forward only
-

-            46
-

-            47
You can replace "git config" with "git config --global" to set a default
-

-            48
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            49
or --ff-only on the command line to override the configured default per
-

-            50
invocation.
-

-            51
-

-            52
Already up to date.
-

-            53
*** syncing xtreemfs
-

-            54
*** synced xtreemfs
-

-            55
 * Sync succeeded
-

-            56
$ git log --format=%ci -1
-

-            57
$ git show -q --pretty=format:%G? HEAD
-

-            58
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 xtreemfs
-

-            59
 * net-fs/xtreemfs-1.5.1: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            44
 * net-fs/xtreemfs-1.5.1: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            60
 * net-fs/xtreemfs-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            45
 * net-fs/xtreemfs-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            61
 * Cache regen failed with 1
+            46
 * Cache regen failed with 1
 

 
         
diff --git a/xtreemfs.txt b/xtreemfs.txt
index 7c6fdfb976ad..35f7b796a953 100644
--- a/xtreemfs.txt
+++ b/xtreemfs.txt
@@ -14,28 +14,13 @@
              'uri': 'git@github.com:xtreemfs-gentoo/overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync xtreemfs
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:x11 repo at '/var/lib/repo-mirror-ci/sync/x11', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/xwing.html b/xwing.html
index 6552f3e46021..d98cce172763 100644
--- a/xwing.html
+++ b/xwing.html
@@ -40,107 +40,123 @@
 

             15
$ pmaint sync xwing
 

-            16
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            23
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
This is xwing.info / alderaan.xwing.info
 

-            24
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 

-            25
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
Server Address : 91.134.139.206
 

-            26
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
Contact Name   : webmaster@xwing.info
 

-            27
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
Hardware       : VPS 2016 SSD 3
 

-            28
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
 

-            29
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
 

-            30
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
Number of files: 1 (reg: 1)
 

-            31
WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
Number of created files: 0
 

-            32
WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
Number of deleted files: 0
 

-            33
WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
Number of regular files transferred: 1
 

-            34
WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
Total file size: 32 bytes
 

-            35
WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
Total transferred file size: 32 bytes
 

-            36
WARNING:pkgcore:x11 repo at '/var/lib/repo-mirror-ci/sync/x11', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
Literal data: 32 bytes
 

-            37
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            37
Matched data: 0 bytes
 

-            38
This is xwing.info / alderaan.xwing.info
+            38
File list size: 48
 

-            39
+            39
File list generation time: 0.001 seconds
 

-            40
Server Address : 91.134.139.206
+            40
File list transfer time: 0.000 seconds
 

-            41
Contact Name   : webmaster@xwing.info
+            41
Total bytes sent: 85
 

-            42
Hardware       : VPS 2016 SSD 3
+            42
Total bytes received: 134
 

             43
 

-            44
+            44
sent 85 bytes  received 134 bytes  87.60 bytes/sec
 

-            45
Number of files: 1 (reg: 1)
+            45
total size is 32  speedup is 0.15
 

-            46
Number of created files: 0
+            46
This is xwing.info / alderaan.xwing.info
 

-            47
Number of deleted files: 0
+            47
 

-            48
Number of regular files transferred: 1
+            48
Server Address : 91.134.139.206
 

-            49
Total file size: 32 bytes
+            49
Contact Name   : webmaster@xwing.info
 

-            50
Total transferred file size: 32 bytes
+            50
Hardware       : VPS 2016 SSD 3
 

-            51
Literal data: 32 bytes
+            51
 

-            52
Matched data: 0 bytes
+            52
 

-            53
File list size: 47
+            53
Number of files: 164 (reg: 110, dir: 54)
 

-            54
File list generation time: 0.001 seconds
+            54
Number of created files: 0
 

-            55
File list transfer time: 0.000 seconds
+            55
Number of deleted files: 0
 

-            56
Total bytes sent: 85
+            56
Number of regular files transferred: 25
 

-            57
Total bytes received: 133
+            57
Total file size: 127.59K bytes
 

-            58
+            58
Total transferred file size: 32.85K bytes
 

-            59
sent 85 bytes  received 133 bytes  87.20 bytes/sec
+            59
Literal data: 32.85K bytes
 

-            60
total size is 32  speedup is 0.15
+            60
Matched data: 0 bytes
 

-            61
*** syncing xwing
+            61
File list size: 5.29K
 

-            62
*** synced xwing
+            62
File list generation time: 0.001 seconds
 

-            63
 * Sync succeeded
+            63
File list transfer time: 0.000 seconds
 

-            64
$ stat --format=%y .
+            64
Total bytes sent: 650
 

-            65
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 xwing
+            65
Total bytes received: 23.61K
 

-            66
 * Cache regenerated successfully
+            66
+

+            67
sent 650 bytes  received 23.61K bytes  9.70K bytes/sec
+

+            68
total size is 127.59K  speedup is 5.26
+

+            69
*** syncing xwing
+

+            70
*** synced xwing
+

+            71
 * Sync succeeded
+

+            72
$ stat --format=%y .
+

+            73
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 xwing
+

+            74
 * Cache regenerated successfully
 

 
         
diff --git a/xwing.txt b/xwing.txt
index 377b99d6c389..89fcfae97c92 100644
--- a/xwing.txt
+++ b/xwing.txt
@@ -13,28 +13,13 @@
              'uri': 'rsync://gentoo.xwing.info/xwing-overlay'}],
  'status': 'unofficial'}
 $ pmaint sync xwing
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:x11 repo at '/var/lib/repo-mirror-ci/sync/x11', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 This is xwing.info / alderaan.xwing.info
 
 Server Address : 91.134.139.206
@@ -50,14 +35,37 @@ Total file size: 32 bytes
 Total transferred file size: 32 bytes
 Literal data: 32 bytes
 Matched data: 0 bytes
-File list size: 47
+File list size: 48
 File list generation time: 0.001 seconds
 File list transfer time: 0.000 seconds
 Total bytes sent: 85
-Total bytes received: 133
+Total bytes received: 134
 
-sent 85 bytes  received 133 bytes  87.20 bytes/sec
+sent 85 bytes  received 134 bytes  87.60 bytes/sec
 total size is 32  speedup is 0.15
+This is xwing.info / alderaan.xwing.info
+
+Server Address : 91.134.139.206
+Contact Name   : webmaster@xwing.info
+Hardware       : VPS 2016 SSD 3
+
+
+Number of files: 164 (reg: 110, dir: 54)
+Number of created files: 0
+Number of deleted files: 0
+Number of regular files transferred: 25
+Total file size: 127.59K bytes
+Total transferred file size: 32.85K bytes
+Literal data: 32.85K bytes
+Matched data: 0 bytes
+File list size: 5.29K
+File list generation time: 0.001 seconds
+File list transfer time: 0.000 seconds
+Total bytes sent: 650
+Total bytes received: 23.61K
+
+sent 650 bytes  received 23.61K bytes  9.70K bytes/sec
+total size is 127.59K  speedup is 5.26
 *** syncing xwing
 *** synced xwing
  * Sync succeeded
diff --git a/yandex.html b/yandex.html
index 74af52cc4ab5..22ca883f9277 100644
--- a/yandex.html
+++ b/yandex.html
@@ -44,91 +44,61 @@
 

             17
$ pmaint sync yandex
 

-            18
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            23
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            24
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            25
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
warning: Pulling without specifying how to reconcile divergent branches is
 

-            26
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
discouraged. You can squelch this message by running one of the following
 

-            27
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
commands sometime before your next pull:
 

-            28
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
 

-            29
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
  git config pull.rebase false  # merge (the default strategy)
 

-            30
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
  git config pull.rebase true   # rebase
 

-            31
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
  git config pull.ff only       # fast-forward only
 

-            32
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
 

-            33
WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
You can replace "git config" with "git config --global" to set a default
 

-            34
WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            35
WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
or --ff-only on the command line to override the configured default per
 

-            36
WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
invocation.
 

-            37
WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            37
 

-            38
WARNING:pkgcore:x11 repo at '/var/lib/repo-mirror-ci/sync/x11', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            38
Already up to date.
 

-            39
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            39
*** syncing yandex
 

-            40
warning: Pulling without specifying how to reconcile divergent branches is
+            40
*** synced yandex
 

-            41
discouraged. You can squelch this message by running one of the following
+            41
 * Sync succeeded
 

-            42
commands sometime before your next pull:
+            42
$ git log --format=%ci -1
 

-            43
+            43
$ git show -q --pretty=format:%G? HEAD
 

-            44
  git config pull.rebase false  # merge (the default strategy)
+            44
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 yandex
 

-            45
  git config pull.rebase true   # rebase
-

-            46
  git config pull.ff only       # fast-forward only
-

-            47
-

-            48
You can replace "git config" with "git config --global" to set a default
-

-            49
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            50
or --ff-only on the command line to override the configured default per
-

-            51
invocation.
-

-            52
-

-            53
Already up to date.
-

-            54
*** syncing yandex
-

-            55
*** synced yandex
-

-            56
 * Sync succeeded
-

-            57
$ git log --format=%ci -1
-

-            58
$ git show -q --pretty=format:%G? HEAD
-

-            59
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 yandex
-

-            60
 * Cache regenerated successfully
+            45
 * Cache regenerated successfully
 

 
         
diff --git a/yandex.txt b/yandex.txt
index 624464071033..1fdd119c3b2e 100644
--- a/yandex.txt
+++ b/yandex.txt
@@ -15,28 +15,13 @@
             {'type': 'git', 'uri': 'git@github.com:yandex-gentoo/overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync yandex
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:x11 repo at '/var/lib/repo-mirror-ci/sync/x11', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/yarik-overlay.html b/yarik-overlay.html
index 8f8f6375a339..7c69dcaac161 100644
--- a/yarik-overlay.html
+++ b/yarik-overlay.html
@@ -36,93 +36,63 @@
 

             13
$ pmaint sync yarik-overlay
 

-            14
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
warning: Pulling without specifying how to reconcile divergent branches is
 

-            22
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
discouraged. You can squelch this message by running one of the following
 

-            23
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
commands sometime before your next pull:
 

-            24
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 

-            25
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase false  # merge (the default strategy)
 

-            26
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.rebase true   # rebase
 

-            27
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.ff only       # fast-forward only
 

-            28
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
 

-            29
WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
You can replace "git config" with "git config --global" to set a default
 

-            30
WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            31
WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
or --ff-only on the command line to override the configured default per
 

-            32
WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
invocation.
 

-            33
WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
 

-            34
WARNING:pkgcore:x11 repo at '/var/lib/repo-mirror-ci/sync/x11', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
Already up to date.
 

-            35
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
*** syncing yarik-overlay
 

-            36
warning: Pulling without specifying how to reconcile divergent branches is
+            36
*** synced yarik-overlay
 

-            37
discouraged. You can squelch this message by running one of the following
+            37
 * Sync succeeded
 

-            38
commands sometime before your next pull:
+            38
$ git log --format=%ci -1
 

-            39
+            39
$ git show -q --pretty=format:%G? HEAD
 

-            40
  git config pull.rebase false  # merge (the default strategy)
+            40
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 yarik-overlay
 

-            41
  git config pull.rebase true   # rebase
-

-            42
  git config pull.ff only       # fast-forward only
-

-            43
-

-            44
You can replace "git config" with "git config --global" to set a default
-

-            45
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            46
or --ff-only on the command line to override the configured default per
-

-            47
invocation.
-

-            48
-

-            49
Already up to date.
-

-            50
*** syncing yarik-overlay
-

-            51
*** synced yarik-overlay
-

-            52
 * Sync succeeded
-

-            53
$ git log --format=%ci -1
-

-            54
$ git show -q --pretty=format:%G? HEAD
-

-            55
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 yarik-overlay
-

-            56
 * games-arcade/supertux-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            41
 * games-arcade/supertux-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            57
 * Cache regen failed with 1
+            42
 * Cache regen failed with 1
 

 
         
diff --git a/yarik-overlay.txt b/yarik-overlay.txt
index d1e7ea910c44..0cabbde3831b 100644
--- a/yarik-overlay.txt
+++ b/yarik-overlay.txt
@@ -11,28 +11,13 @@
              'uri': 'https://github.com/yarikmsu/yarik-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync yarik-overlay
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:x11 repo at '/var/lib/repo-mirror-ci/sync/x11', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/ycUygB1.html b/ycUygB1.html
index faa9ef279b59..bd7be2939e82 100644
--- a/ycUygB1.html
+++ b/ycUygB1.html
@@ -36,93 +36,63 @@
 

             13
$ pmaint sync ycUygB1
 

-            14
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
warning: Pulling without specifying how to reconcile divergent branches is
 

-            22
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
discouraged. You can squelch this message by running one of the following
 

-            23
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
commands sometime before your next pull:
 

-            24
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 

-            25
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase false  # merge (the default strategy)
 

-            26
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.rebase true   # rebase
 

-            27
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.ff only       # fast-forward only
 

-            28
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
 

-            29
WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
You can replace "git config" with "git config --global" to set a default
 

-            30
WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            31
WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
or --ff-only on the command line to override the configured default per
 

-            32
WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
invocation.
 

-            33
WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
 

-            34
WARNING:pkgcore:x11 repo at '/var/lib/repo-mirror-ci/sync/x11', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
Already up to date.
 

-            35
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
*** syncing ycUygB1
 

-            36
warning: Pulling without specifying how to reconcile divergent branches is
+            36
*** synced ycUygB1
 

-            37
discouraged. You can squelch this message by running one of the following
+            37
 * Sync succeeded
 

-            38
commands sometime before your next pull:
+            38
$ git log --format=%ci -1
 

-            39
+            39
$ git show -q --pretty=format:%G? HEAD
 

-            40
  git config pull.rebase false  # merge (the default strategy)
+            40
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 ycUygB1
 

-            41
  git config pull.rebase true   # rebase
-

-            42
  git config pull.ff only       # fast-forward only
-

-            43
-

-            44
You can replace "git config" with "git config --global" to set a default
-

-            45
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            46
or --ff-only on the command line to override the configured default per
-

-            47
invocation.
-

-            48
-

-            49
Already up to date.
-

-            50
*** syncing ycUygB1
-

-            51
*** synced ycUygB1
-

-            52
 * Sync succeeded
-

-            53
$ git log --format=%ci -1
-

-            54
$ git show -q --pretty=format:%G? HEAD
-

-            55
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 ycUygB1
-

-            56
 * dev-python/python-dateutil-2.3: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
+            41
 * dev-python/python-dateutil-2.3: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
 
[FATAL]
-            57
 * Cache regen failed with 1
+            42
 * Cache regen failed with 1
 

 
         
diff --git a/ycUygB1.txt b/ycUygB1.txt
index b6f671082728..f9f9d310a312 100644
--- a/ycUygB1.txt
+++ b/ycUygB1.txt
@@ -11,28 +11,13 @@
             {'type': 'git', 'uri': 'git@github.com:ycUygB1/overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync ycUygB1
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:x11 repo at '/var/lib/repo-mirror-ci/sync/x11', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/yoreek.html b/yoreek.html
index c10f1ec089bf..1d8ed6d201cd 100644
--- a/yoreek.html
+++ b/yoreek.html
@@ -34,109 +34,63 @@
 

             12
 'status': 'unofficial'}
 

-            13
 * Adding new repository
+            13
$ pmaint sync yoreek
 

-            14
$ pmaint sync yoreek
+            14
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
warning: Pulling without specifying how to reconcile divergent branches is
 

-            22
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
discouraged. You can squelch this message by running one of the following
 

-            23
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
commands sometime before your next pull:
 

-            24
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 

-            25
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase false  # merge (the default strategy)
 

-            26
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.rebase true   # rebase
 

-            27
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.ff only       # fast-forward only
 

-            28
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
 

-            29
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
You can replace "git config" with "git config --global" to set a default
 

-            30
WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            31
WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
or --ff-only on the command line to override the configured default per
 

-            32
WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
invocation.
 

-            33
WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
 

-            34
WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
Already up to date.
 

-            35
WARNING:pkgcore:x11 repo at '/var/lib/repo-mirror-ci/sync/x11', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
*** syncing yoreek
 

-            36
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
*** synced yoreek
 

-            37
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            37
 * Sync succeeded
 

-            38
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            38
$ git log --format=%ci -1
 

-            39
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            39
$ git show -q --pretty=format:%G? HEAD
 

-            40
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            40
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 yoreek
 

-            41
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            42
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            43
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            44
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            45
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            46
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            47
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            48
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            49
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            50
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            51
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            52
WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            53
WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            54
WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            55
WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            56
WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-

-            57
Cloning into '/var/lib/repo-mirror-ci/sync/yoreek'...
-

-            58
*** syncing yoreek
-

-            59
*** synced yoreek
-

-            60
 * Sync succeeded
-

-            61
$ git log --format=%ci -1
-

-            62
$ git show -q --pretty=format:%G? HEAD
-

-            63
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 yoreek
-

-            64
 * Cache regenerated successfully
+            41
 * Cache regenerated successfully
 

 
         
diff --git a/yoreek.txt b/yoreek.txt
index a57d44d5459e..7ff871ebed7b 100644
--- a/yoreek.txt
+++ b/yoreek.txt
@@ -10,51 +10,28 @@
             {'type': 'git',
              'uri': 'git+ssh://git@git.gentoo.org/user/yoreek.git'}],
  'status': 'unofficial'}
- * Adding new repository
 $ pmaint sync yoreek
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:x11 repo at '/var/lib/repo-mirror-ci/sync/x11', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-Cloning into '/var/lib/repo-mirror-ci/sync/yoreek'...
+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.
+
+Already up to date.
 *** syncing yoreek
 *** synced yoreek
  * Sync succeeded
diff --git a/youbroketheinternet.html b/youbroketheinternet.html
index 2bec01de7399..3925f08c5dbd 100644
--- a/youbroketheinternet.html
+++ b/youbroketheinternet.html
@@ -58,91 +58,63 @@
 

             24
$ pmaint sync youbroketheinternet
 

-            25
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            26
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            27
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            28
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            29
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            30
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            31
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            32
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
warning: Pulling without specifying how to reconcile divergent branches is
 

-            33
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
discouraged. You can squelch this message by running one of the following
 

-            34
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
commands sometime before your next pull:
 

-            35
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
 

-            36
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
  git config pull.rebase false  # merge (the default strategy)
 

-            37
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            37
  git config pull.rebase true   # rebase
 

-            38
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            38
  git config pull.ff only       # fast-forward only
 

-            39
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            39
 

-            40
WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            40
You can replace "git config" with "git config --global" to set a default
 

-            41
WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            41
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            42
WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            42
or --ff-only on the command line to override the configured default per
 

-            43
WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            43
invocation.
 

-            44
WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            44
 

-            45
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            45
warning: redirecting to https://git.gnunet.org/youbroketheinternet-overlay.git/
 

-            46
warning: Pulling without specifying how to reconcile divergent branches is
+            46
Already up to date.
 

-            47
discouraged. You can squelch this message by running one of the following
+            47
*** syncing youbroketheinternet
 

-            48
commands sometime before your next pull:
+            48
*** synced youbroketheinternet
 

-            49
+            49
 * Sync succeeded
 

-            50
  git config pull.rebase false  # merge (the default strategy)
+            50
$ git log --format=%ci -1
 

-            51
  git config pull.rebase true   # rebase
+            51
$ git show -q --pretty=format:%G? HEAD
 

-            52
  git config pull.ff only       # fast-forward only
+            52
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 youbroketheinternet
 

-            53
-

-            54
You can replace "git config" with "git config --global" to set a default
-

-            55
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            56
or --ff-only on the command line to override the configured default per
-

-            57
invocation.
-

-            58
-

-            59
warning: redirecting to https://git.gnunet.org/youbroketheinternet-overlay.git/
-

-            60
Already up to date.
-

-            61
*** syncing youbroketheinternet
-

-            62
*** synced youbroketheinternet
-

-            63
 * Sync succeeded
-

-            64
$ git log --format=%ci -1
-

-            65
$ git show -q --pretty=format:%G? HEAD
-

-            66
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 youbroketheinternet
-

-            67
 * Cache regenerated successfully
+            53
 * Cache regenerated successfully
 

 
         
diff --git a/youbroketheinternet.txt b/youbroketheinternet.txt
index 5e03d9e22113..301331227e64 100644
--- a/youbroketheinternet.txt
+++ b/youbroketheinternet.txt
@@ -22,27 +22,13 @@
              'uri': 'git://gnunet.org/youbroketheinternet-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync youbroketheinternet
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/yurij-overlay.html b/yurij-overlay.html
index 68a2e6b9f0c1..952d25a32ef1 100644
--- a/yurij-overlay.html
+++ b/yurij-overlay.html
@@ -42,91 +42,59 @@
 

             16
$ pmaint sync yurij-overlay
 

-            17
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            23
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
warning: Pulling without specifying how to reconcile divergent branches is
 

-            24
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
discouraged. You can squelch this message by running one of the following
 

-            25
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
commands sometime before your next pull:
 

-            26
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
 

-            27
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.rebase false  # merge (the default strategy)
 

-            28
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
  git config pull.rebase true   # rebase
 

-            29
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
  git config pull.ff only       # fast-forward only
 

-            30
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
 

-            31
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
You can replace "git config" with "git config --global" to set a default
 

-            32
WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            33
WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
or --ff-only on the command line to override the configured default per
 

-            34
WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
invocation.
 

-            35
WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
 

-            36
WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
Already up to date.
 

-            37
WARNING:pkgcore:yoreek repo at '/var/lib/repo-mirror-ci/sync/yoreek', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            37
*** syncing yurij-overlay
 

-            38
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            38
*** synced yurij-overlay
 

-            39
warning: Pulling without specifying how to reconcile divergent branches is
+            39
 * Sync succeeded
 

-            40
discouraged. You can squelch this message by running one of the following
+            40
$ git log --format=%ci -1
 

-            41
commands sometime before your next pull:
+            41
$ git show -q --pretty=format:%G? HEAD
 

-            42
+            42
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 yurij-overlay
 

-            43
  git config pull.rebase false  # merge (the default strategy)
-

-            44
  git config pull.rebase true   # rebase
-

-            45
  git config pull.ff only       # fast-forward only
-

-            46
-

-            47
You can replace "git config" with "git config --global" to set a default
-

-            48
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            49
or --ff-only on the command line to override the configured default per
-

-            50
invocation.
-

-            51
-

-            52
Already up to date.
-

-            53
*** syncing yurij-overlay
-

-            54
*** synced yurij-overlay
-

-            55
 * Sync succeeded
-

-            56
$ git log --format=%ci -1
-

-            57
$ git show -q --pretty=format:%G? HEAD
-

-            58
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 yurij-overlay
-

-            59
 * Cache regenerated successfully
+            43
 * Cache regenerated successfully
 

 
         
diff --git a/yurij-overlay.txt b/yurij-overlay.txt
index 7fd81a77436a..de494d5a9f99 100644
--- a/yurij-overlay.txt
+++ b/yurij-overlay.txt
@@ -14,28 +14,12 @@
              'uri': 'git@github.com:yurijmikhalevich/yurij-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync yurij-overlay
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:yoreek repo at '/var/lib/repo-mirror-ci/sync/yoreek', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/yuzu-overlay.html b/yuzu-overlay.html
index d124bb852b13..e405b98d5701 100644
--- a/yuzu-overlay.html
+++ b/yuzu-overlay.html
@@ -44,91 +44,59 @@
 

             17
$ pmaint sync yuzu-overlay
 

-            18
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            23
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            24
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
warning: Pulling without specifying how to reconcile divergent branches is
 

-            25
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
discouraged. You can squelch this message by running one of the following
 

-            26
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
commands sometime before your next pull:
 

-            27
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
 

-            28
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
  git config pull.rebase false  # merge (the default strategy)
 

-            29
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
  git config pull.rebase true   # rebase
 

-            30
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
  git config pull.ff only       # fast-forward only
 

-            31
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
 

-            32
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
You can replace "git config" with "git config --global" to set a default
 

-            33
WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            34
WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
or --ff-only on the command line to override the configured default per
 

-            35
WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
invocation.
 

-            36
WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
 

-            37
WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            37
Already up to date.
 

-            38
WARNING:pkgcore:yoreek repo at '/var/lib/repo-mirror-ci/sync/yoreek', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            38
*** syncing yuzu-overlay
 

-            39
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            39
*** synced yuzu-overlay
 

-            40
warning: Pulling without specifying how to reconcile divergent branches is
+            40
 * Sync succeeded
 

-            41
discouraged. You can squelch this message by running one of the following
+            41
$ git log --format=%ci -1
 

-            42
commands sometime before your next pull:
+            42
$ git show -q --pretty=format:%G? HEAD
 

-            43
+            43
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 yuzu-overlay
 

-            44
  git config pull.rebase false  # merge (the default strategy)
-

-            45
  git config pull.rebase true   # rebase
-

-            46
  git config pull.ff only       # fast-forward only
-

-            47
-

-            48
You can replace "git config" with "git config --global" to set a default
-

-            49
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            50
or --ff-only on the command line to override the configured default per
-

-            51
invocation.
-

-            52
-

-            53
Already up to date.
-

-            54
*** syncing yuzu-overlay
-

-            55
*** synced yuzu-overlay
-

-            56
 * Sync succeeded
-

-            57
$ git log --format=%ci -1
-

-            58
$ git show -q --pretty=format:%G? HEAD
-

-            59
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 yuzu-overlay
-

-            60
 * Cache regenerated successfully
+            44
 * Cache regenerated successfully
 

 
         
diff --git a/yuzu-overlay.txt b/yuzu-overlay.txt
index 7c6cf9687632..7a438dff93f6 100644
--- a/yuzu-overlay.txt
+++ b/yuzu-overlay.txt
@@ -15,28 +15,12 @@
              'uri': 'git@github.com:Alex-Aralis/yuzu-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync yuzu-overlay
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:yoreek repo at '/var/lib/repo-mirror-ci/sync/yoreek', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/zerodaysfordays.html b/zerodaysfordays.html
index 22f401ceb818..1ec6e63d4eb2 100644
--- a/zerodaysfordays.html
+++ b/zerodaysfordays.html
@@ -30,87 +30,59 @@
 

             10
$ pmaint sync zerodaysfordays
 

-            11
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            11
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            12
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
warning: Pulling without specifying how to reconcile divergent branches is
 

-            18
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
discouraged. You can squelch this message by running one of the following
 

-            19
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
commands sometime before your next pull:
 

-            20
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
 

-            21
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
  git config pull.rebase false  # merge (the default strategy)
 

-            22
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase true   # rebase
 

-            23
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.ff only       # fast-forward only
 

-            24
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 

-            25
WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
You can replace "git config" with "git config --global" to set a default
 

-            26
WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            27
WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
or --ff-only on the command line to override the configured default per
 

-            28
WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
invocation.
 

-            29
WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
 

-            30
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
Already up to date.
 

-            31
warning: Pulling without specifying how to reconcile divergent branches is
+            31
*** syncing zerodaysfordays
 

-            32
discouraged. You can squelch this message by running one of the following
+            32
*** synced zerodaysfordays
 

-            33
commands sometime before your next pull:
+            33
 * Sync succeeded
 

-            34
+            34
$ git log --format=%ci -1
 

-            35
  git config pull.rebase false  # merge (the default strategy)
+            35
$ git show -q --pretty=format:%G? HEAD
 

-            36
  git config pull.rebase true   # rebase
+            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 zerodaysfordays
 

-            37
  git config pull.ff only       # fast-forward only
-

-            38
-

-            39
You can replace "git config" with "git config --global" to set a default
-

-            40
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            41
or --ff-only on the command line to override the configured default per
-

-            42
invocation.
-

-            43
-

-            44
Already up to date.
-

-            45
*** syncing zerodaysfordays
-

-            46
*** synced zerodaysfordays
-

-            47
 * Sync succeeded
-

-            48
$ git log --format=%ci -1
-

-            49
$ git show -q --pretty=format:%G? HEAD
-

-            50
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 zerodaysfordays
-

-            51
 * Cache regenerated successfully
+            37
 * Cache regenerated successfully
 

 
         
diff --git a/zerodaysfordays.txt b/zerodaysfordays.txt
index efba78b392e3..ac7f4d8fd734 100644
--- a/zerodaysfordays.txt
+++ b/zerodaysfordays.txt
@@ -8,26 +8,12 @@
  'source': [{'type': 'git', 'uri': 'https://git.sr.ht/~jakob/zerodaysfordays'}],
  'status': 'unofficial'}
 $ pmaint sync zerodaysfordays
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/zoobab.html b/zoobab.html
index 3e8c809b374c..6cf78b99ef8d 100644
--- a/zoobab.html
+++ b/zoobab.html
@@ -40,91 +40,63 @@
 

             15
$ pmaint sync zoobab
 

-            16
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
warning: Pulling without specifying how to reconcile divergent branches is
 

-            23
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
discouraged. You can squelch this message by running one of the following
 

-            24
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
commands sometime before your next pull:
 

-            25
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 

-            26
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.rebase false  # merge (the default strategy)
 

-            27
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.rebase true   # rebase
 

-            28
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
  git config pull.ff only       # fast-forward only
 

-            29
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
 

-            30
WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
You can replace "git config" with "git config --global" to set a default
 

-            31
WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            32
WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
or --ff-only on the command line to override the configured default per
 

-            33
WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
invocation.
 

-            34
WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
 

-            35
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
Already up to date.
 

-            36
warning: Pulling without specifying how to reconcile divergent branches is
+            36
*** syncing zoobab
 

-            37
discouraged. You can squelch this message by running one of the following
+            37
*** synced zoobab
 

-            38
commands sometime before your next pull:
+            38
 * Sync succeeded
 

-            39
+            39
$ git log --format=%ci -1
 

-            40
  git config pull.rebase false  # merge (the default strategy)
+            40
$ git show -q --pretty=format:%G? HEAD
 

-            41
  git config pull.rebase true   # rebase
+            41
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 zoobab
 

-            42
  git config pull.ff only       # fast-forward only
-

-            43
-

-            44
You can replace "git config" with "git config --global" to set a default
-

-            45
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            46
or --ff-only on the command line to override the configured default per
-

-            47
invocation.
-

-            48
-

-            49
Already up to date.
-

-            50
*** syncing zoobab
-

-            51
*** synced zoobab
-

-            52
 * Sync succeeded
-

-            53
$ git log --format=%ci -1
-

-            54
$ git show -q --pretty=format:%G? HEAD
-

-            55
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 zoobab
-

-            56
 * net-libs/czmq-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            42
 * net-libs/czmq-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            57
 * net-misc/malamute-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            43
 * net-misc/malamute-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            58
 * Cache regen failed with 1
+            44
 * Cache regen failed with 1
 

 
         
diff --git a/zoobab.txt b/zoobab.txt
index d5f1c716acef..76be494d07fe 100644
--- a/zoobab.txt
+++ b/zoobab.txt
@@ -13,26 +13,12 @@
             {'type': 'git', 'uri': 'git@github.com:zoobab/overlay4gentoo.git'}],
  'status': 'unofficial'}
 $ pmaint sync zoobab
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/zscheile.html b/zscheile.html
index 3a77ede5e14c..8fb1c50e4488 100644
--- a/zscheile.html
+++ b/zscheile.html
@@ -42,87 +42,59 @@
 

             16
$ pmaint sync zscheile
 

-            17
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            23
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
warning: Pulling without specifying how to reconcile divergent branches is
 

-            24
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
discouraged. You can squelch this message by running one of the following
 

-            25
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
commands sometime before your next pull:
 

-            26
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
 

-            27
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.rebase false  # merge (the default strategy)
 

-            28
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
  git config pull.rebase true   # rebase
 

-            29
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
  git config pull.ff only       # fast-forward only
 

-            30
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
 

-            31
WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
You can replace "git config" with "git config --global" to set a default
 

-            32
WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            33
WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
or --ff-only on the command line to override the configured default per
 

-            34
WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
invocation.
 

-            35
WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
 

-            36
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
Already up to date.
 

-            37
warning: Pulling without specifying how to reconcile divergent branches is
+            37
*** syncing zscheile
 

-            38
discouraged. You can squelch this message by running one of the following
+            38
*** synced zscheile
 

-            39
commands sometime before your next pull:
+            39
 * Sync succeeded
 

-            40
+            40
$ git log --format=%ci -1
 

-            41
  git config pull.rebase false  # merge (the default strategy)
+            41
$ git show -q --pretty=format:%G? HEAD
 

-            42
  git config pull.rebase true   # rebase
+            42
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 zscheile
 

-            43
  git config pull.ff only       # fast-forward only
-

-            44
-

-            45
You can replace "git config" with "git config --global" to set a default
-

-            46
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            47
or --ff-only on the command line to override the configured default per
-

-            48
invocation.
-

-            49
-

-            50
Already up to date.
-

-            51
*** syncing zscheile
-

-            52
*** synced zscheile
-

-            53
 * Sync succeeded
-

-            54
$ git log --format=%ci -1
-

-            55
$ git show -q --pretty=format:%G? HEAD
-

-            56
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 zscheile
-

-            57
 * Cache regenerated successfully
+            43
 * Cache regenerated successfully
 

 
         
diff --git a/zscheile.txt b/zscheile.txt
index acc7e6a97043..80344c9d0fb8 100644
--- a/zscheile.txt
+++ b/zscheile.txt
@@ -14,26 +14,12 @@
              'uri': 'git@github.com:zserik/portage-zscheile.git'}],
  'status': 'unofficial'}
 $ pmaint sync zscheile
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/zugaina.html b/zugaina.html
index 2e4125f28f22..02a8b585446c 100644
--- a/zugaina.html
+++ b/zugaina.html
@@ -28,93 +28,65 @@
 

             9
$ pmaint sync zugaina
 

-            10
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            10
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            11
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            11
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            12
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
 

-            17
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
 

-            18
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
Number of files: 1,835 (reg: 1,441, dir: 394)
 

-            19
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
Number of created files: 0
 

-            20
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
Number of deleted files: 0
 

-            21
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
Number of regular files transferred: 0
 

-            22
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
Total file size: 2.24M bytes
 

-            23
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
Total transferred file size: 0 bytes
 

-            24
WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
Literal data: 0 bytes
 

-            25
WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
Matched data: 0 bytes
 

-            26
WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
File list size: 45.49K
 

-            27
WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
File list generation time: 0.001 seconds
 

-            28
WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
File list transfer time: 0.000 seconds
 

-            29
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
Total bytes sent: 483
 

-            30
+            30
Total bytes received: 47.20K
 

             31
 

-            32
Number of files: 1,835 (reg: 1,441, dir: 394)
+            32
sent 483 bytes  received 47.20K bytes  10.60K bytes/sec
 

-            33
Number of created files: 0
+            33
total size is 2.24M  speedup is 46.89
 

-            34
Number of deleted files: 0
+            34
*** syncing zugaina
 

-            35
Number of regular files transferred: 0
+            35
*** synced zugaina
 

-            36
Total file size: 2.24M bytes
+            36
 * Sync succeeded
 

-            37
Total transferred file size: 0 bytes
+            37
$ stat --format=%y .
 

-            38
Literal data: 0 bytes
+            38
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 zugaina
 

-            39
Matched data: 0 bytes
-

-            40
File list size: 28.17K
-

-            41
File list generation time: 0.001 seconds
-

-            42
File list transfer time: 0.000 seconds
-

-            43
Total bytes sent: 475
-

-            44
Total bytes received: 47.20K
-

-            45
-

-            46
sent 475 bytes  received 47.20K bytes  13.62K bytes/sec
-

-            47
total size is 2.24M  speedup is 46.89
-

-            48
*** syncing zugaina
-

-            49
*** synced zugaina
-

-            50
 * Sync succeeded
-

-            51
$ stat --format=%y .
-

-            52
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 zugaina
-

-            53
 * Cache regenerated successfully
+            39
 * Cache regenerated successfully
 

 
         
diff --git a/zugaina.txt b/zugaina.txt
index 28cbeb3771a5..423ed5fd756a 100644
--- a/zugaina.txt
+++ b/zugaina.txt
@@ -7,26 +7,12 @@
              'uri': 'rsync://gentoo.zugaina.org/zugaina-portage'}],
  'status': 'unofficial'}
 $ pmaint sync zugaina
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 
 
 Number of files: 1,835 (reg: 1,441, dir: 394)
@@ -37,13 +23,13 @@ Total file size: 2.24M bytes
 Total transferred file size: 0 bytes
 Literal data: 0 bytes
 Matched data: 0 bytes
-File list size: 28.17K
+File list size: 45.49K
 File list generation time: 0.001 seconds
 File list transfer time: 0.000 seconds
-Total bytes sent: 475
+Total bytes sent: 483
 Total bytes received: 47.20K
 
-sent 475 bytes  received 47.20K bytes  13.62K bytes/sec
+sent 483 bytes  received 47.20K bytes  10.60K bytes/sec
 total size is 2.24M  speedup is 46.89
 *** syncing zugaina
 *** synced zugaina
diff --git a/zx2c4.html b/zx2c4.html
index c30905244189..0773675ec198 100644
--- a/zx2c4.html
+++ b/zx2c4.html
@@ -36,87 +36,55 @@
 

             13
$ pmaint sync zx2c4
 

-            14
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
warning: Pulling without specifying how to reconcile divergent branches is
 

-            19
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
discouraged. You can squelch this message by running one of the following
 

-            20
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
commands sometime before your next pull:
 

-            21
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
 

-            22
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.rebase false  # merge (the default strategy)
 

-            23
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
  git config pull.rebase true   # rebase
 

-            24
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
  git config pull.ff only       # fast-forward only
 

-            25
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
 

-            26
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
You can replace "git config" with "git config --global" to set a default
 

-            27
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            28
WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
or --ff-only on the command line to override the configured default per
 

-            29
WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
invocation.
 

-            30
WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
 

-            31
WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
Already up to date.
 

-            32
WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
*** syncing zx2c4
 

-            33
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
*** synced zx2c4
 

-            34
warning: Pulling without specifying how to reconcile divergent branches is
+            34
 * Sync succeeded
 

-            35
discouraged. You can squelch this message by running one of the following
+            35
$ git log --format=%ci -1
 

-            36
commands sometime before your next pull:
+            36
$ git show -q --pretty=format:%G? HEAD
 

-            37
+            37
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 zx2c4
 

-            38
  git config pull.rebase false  # merge (the default strategy)
-

-            39
  git config pull.rebase true   # rebase
-

-            40
  git config pull.ff only       # fast-forward only
-

-            41
-

-            42
You can replace "git config" with "git config --global" to set a default
-

-            43
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            44
or --ff-only on the command line to override the configured default per
-

-            45
invocation.
-

-            46
-

-            47
Already up to date.
-

-            48
*** syncing zx2c4
-

-            49
*** synced zx2c4
-

-            50
 * Sync succeeded
-

-            51
$ git log --format=%ci -1
-

-            52
$ git show -q --pretty=format:%G? HEAD
-

-            53
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 zx2c4
-

-            54
 * Cache regenerated successfully
+            38
 * Cache regenerated successfully
 

 
         
diff --git a/zx2c4.txt b/zx2c4.txt
index 4f6abd91f24b..44b870d9e333 100644
--- a/zx2c4.txt
+++ b/zx2c4.txt
@@ -11,26 +11,10 @@
             {'type': 'git', 'uri': 'ssh://git@git.zx2c4.com/portage'}],
  'status': 'official'}
 $ pmaint sync zx2c4
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
diff --git a/zyrenth.html b/zyrenth.html
index 38bb0fcc45f3..9275fa6383ea 100644
--- a/zyrenth.html
+++ b/zyrenth.html
@@ -42,87 +42,55 @@
 

             16
$ pmaint sync zyrenth
 

-            17
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
warning: Pulling without specifying how to reconcile divergent branches is
 

-            22
WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
discouraged. You can squelch this message by running one of the following
 

-            23
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
commands sometime before your next pull:
 

-            24
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
 

-            25
WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
  git config pull.rebase false  # merge (the default strategy)
 

-            26
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            26
  git config pull.rebase true   # rebase
 

-            27
WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
  git config pull.ff only       # fast-forward only
 

-            28
WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
 

-            29
WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            29
You can replace "git config" with "git config --global" to set a default
 

-            30
WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            31
WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
or --ff-only on the command line to override the configured default per
 

-            32
WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
invocation.
 

-            33
WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
 

-            34
WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
Already up to date.
 

-            35
WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
*** syncing zyrenth
 

-            36
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
*** synced zyrenth
 

-            37
warning: Pulling without specifying how to reconcile divergent branches is
+            37
 * Sync succeeded
 

-            38
discouraged. You can squelch this message by running one of the following
+            38
$ git log --format=%ci -1
 

-            39
commands sometime before your next pull:
+            39
$ git show -q --pretty=format:%G? HEAD
 

-            40
+            40
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 zyrenth
 

-            41
  git config pull.rebase false  # merge (the default strategy)
-

-            42
  git config pull.rebase true   # rebase
-

-            43
  git config pull.ff only       # fast-forward only
-

-            44
-

-            45
You can replace "git config" with "git config --global" to set a default
-

-            46
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            47
or --ff-only on the command line to override the configured default per
-

-            48
invocation.
-

-            49
-

-            50
Already up to date.
-

-            51
*** syncing zyrenth
-

-            52
*** synced zyrenth
-

-            53
 * Sync succeeded
-

-            54
$ git log --format=%ci -1
-

-            55
$ git show -q --pretty=format:%G? HEAD
-

-            56
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 zyrenth
-

-            57
 * Cache regenerated successfully
+            41
 * Cache regenerated successfully
 

 
         
diff --git a/zyrenth.txt b/zyrenth.txt
index 0115530ffe9d..11d3a6520db1 100644
--- a/zyrenth.txt
+++ b/zyrenth.txt
@@ -14,26 +14,10 @@
              'uri': 'git@github.com:kabili207/zyrenth-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync zyrenth
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:triquetra repo at '/var/lib/repo-mirror-ci/sync/triquetra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 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:
-- 
cgit v1.2.3-18-g5258