Update metadata cache for upstream's eclass changes
[ditz] Pushed x86 stabilisation back 30 days

Waiting for upstream stabilisation of trollop.
[gitflow] Pushed x86 stabilisation back 30 days

Waiting for upstream stabilisation of shflags.
Merge branch 'f/keyword/x86'

* f/keyword/x86:
  [gitflow] Pushed x86 stabilisation back 30 days
  [ditz] Pushed x86 stabilisation back 30 days