gentoo resync : 20.12.2017

15 files changed, 11 insertions, 129 deletions

diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index e7d4b0163e0a..cf5df4f6c1f2 100644
--- a/metadata/md5-cache/app-misc/Manifest.gz
+++ b/metadata/md5-cache/app-misc/Manifest.gz
diff --git a/metadata/md5-cache/app-misc/anki-2.0.31 b/metadata/md5-cache/app-misc/anki-2.0.31
deleted file mode 100644
index 653acead42d5..000000000000
--- a/metadata/md5-cache/app-misc/anki-2.0.31
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DESCRIPTION=A spaced-repetition memory training program (flash cards)
-EAPI=5
-HOMEPAGE=http://ichi2.net/anki/
-IUSE=latex +recording +sound python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/PyQt4[X,svg,webkit] >=dev-python/httplib2-0.7.4 dev-python/beautifulsoup:python-2 dev-python/send2trash recording? ( media-sound/lame >=dev-python/pyaudio-0.2.4 ) sound? ( media-video/mplayer ) latex? ( app-text/texlive app-text/dvipng )
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=http://ankisrs.net/download/mirror/anki-2.0.31.tgz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=66fc4a2cf356235a4acfd9f2b4f7f0f1
diff --git a/metadata/md5-cache/app-misc/anki-2.0.33 b/metadata/md5-cache/app-misc/anki-2.0.33
deleted file mode 100644
index 69f0c75d4245..000000000000
--- a/metadata/md5-cache/app-misc/anki-2.0.33
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup
-DESCRIPTION=A spaced-repetition memory training program (flash cards)
-EAPI=5
-HOMEPAGE=http://ichi2.net/anki/
-IUSE=latex +recording +sound python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/PyQt4[X,svg,webkit] >=dev-python/httplib2-0.7.4 dev-python/beautifulsoup:python-2 dev-python/send2trash recording? ( media-sound/lame >=dev-python/pyaudio-0.2.4 ) sound? ( media-video/mplayer ) latex? ( app-text/texlive app-text/dvipng )
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=http://ankisrs.net/download/mirror/anki-2.0.33.tgz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=6a11c050fca1c65045080b6cfff4dba0
diff --git a/metadata/md5-cache/app-misc/anki-2.0.34 b/metadata/md5-cache/app-misc/anki-2.0.34
deleted file mode 100644
index 636939e7b13d..000000000000
--- a/metadata/md5-cache/app-misc/anki-2.0.34
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup
-DESCRIPTION=A spaced-repetition memory training program (flash cards)
-EAPI=5
-HOMEPAGE=http://ichi2.net/anki/
-IUSE=latex +recording +sound python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/PyQt4[X,svg,webkit] >=dev-python/httplib2-0.7.4 dev-python/beautifulsoup:python-2 dev-python/send2trash recording? ( media-sound/lame >=dev-python/pyaudio-0.2.4 ) sound? ( media-video/mplayer ) latex? ( app-text/texlive app-text/dvipng )
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=http://ankisrs.net/download/mirror/anki-2.0.34.tgz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=f812a711243d0531aebcc0cb7499b33d
diff --git a/metadata/md5-cache/app-misc/anki-2.0.35 b/metadata/md5-cache/app-misc/anki-2.0.35
deleted file mode 100644
index 64866105080c..000000000000
--- a/metadata/md5-cache/app-misc/anki-2.0.35
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup
-DESCRIPTION=A spaced-repetition memory training program (flash cards)
-EAPI=5
-HOMEPAGE=http://ichi2.net/anki/
-IUSE=latex +recording +sound python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/PyQt4[X,svg,webkit] >=dev-python/httplib2-0.7.4 dev-python/beautifulsoup:python-2 dev-python/send2trash recording? ( media-sound/lame >=dev-python/pyaudio-0.2.4 ) sound? ( media-video/mplayer ) latex? ( app-text/texlive app-text/dvipng )
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=http://ankisrs.net/download/mirror/anki-2.0.35.tgz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=f812a711243d0531aebcc0cb7499b33d
diff --git a/metadata/md5-cache/app-misc/anki-2.0.36 b/metadata/md5-cache/app-misc/anki-2.0.36
deleted file mode 100644
index 1a6b6f4275e1..000000000000
--- a/metadata/md5-cache/app-misc/anki-2.0.36
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup
-DESCRIPTION=A spaced-repetition memory training program (flash cards)
-EAPI=5
-HOMEPAGE=http://ichi2.net/anki/
-IUSE=latex +recording +sound python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/PyQt4[X,svg,webkit] >=dev-python/httplib2-0.7.4 dev-python/beautifulsoup:python-2 dev-python/send2trash recording? ( media-sound/lame >=dev-python/pyaudio-0.2.4 ) sound? ( media-video/mplayer ) latex? ( app-text/texlive app-text/dvipng )
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=http://ankisrs.net/download/mirror/anki-2.0.36.tgz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=f812a711243d0531aebcc0cb7499b33d
diff --git a/metadata/md5-cache/app-misc/anki-2.0.41 b/metadata/md5-cache/app-misc/anki-2.0.41
deleted file mode 100644
index 327e98b40952..000000000000
--- a/metadata/md5-cache/app-misc/anki-2.0.41
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup
-DESCRIPTION=A spaced-repetition memory training program (flash cards)
-EAPI=5
-HOMEPAGE=https://apps.ankiweb.net
-IUSE=latex +recording +sound python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/PyQt4[X,svg,webkit] >=dev-python/httplib2-0.7.4 dev-python/beautifulsoup:python-2 dev-python/send2trash recording? ( media-sound/lame >=dev-python/pyaudio-0.2.4 ) sound? ( media-video/mplayer ) latex? ( app-text/texlive app-text/dvipng )
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://apps.ankiweb.net/downloads/current/anki-2.0.41-source.tgz -> anki-2.0.41.tgz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=db14ba99a51847132b15953dd4f95667
diff --git a/metadata/md5-cache/app-misc/anki-2.0.43 b/metadata/md5-cache/app-misc/anki-2.0.43
deleted file mode 100644
index b244935f9fba..000000000000
--- a/metadata/md5-cache/app-misc/anki-2.0.43
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup
-DESCRIPTION=A spaced-repetition memory training program (flash cards)
-EAPI=5
-HOMEPAGE=https://apps.ankiweb.net
-IUSE=latex +recording +sound python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/PyQt4[X,svg,webkit,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/httplib2-0.7.4[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/beautifulsoup:python-2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/send2trash[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] recording? ( media-sound/lame >=dev-python/pyaudio-0.2.4[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) sound? ( media-video/mplayer ) latex? ( app-text/texlive app-text/dvipng )
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://apps.ankiweb.net/downloads/current/anki-2.0.43-source.tgz -> anki-2.0.43.tgz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=9533e3015ba9193318d5c9849597396a
diff --git a/metadata/md5-cache/app-misc/anki-2.0.47 b/metadata/md5-cache/app-misc/anki-2.0.47
deleted file mode 100644
index ee363c8e41d5..000000000000
--- a/metadata/md5-cache/app-misc/anki-2.0.47
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup
-DESCRIPTION=A spaced-repetition memory training program (flash cards)
-EAPI=5
-HOMEPAGE=https://apps.ankiweb.net
-IUSE=latex +recording +sound python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/PyQt4[X,svg,webkit,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/httplib2-0.7.4[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/beautifulsoup:python-2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/send2trash[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] recording? ( media-sound/lame >=dev-python/pyaudio-0.2.4[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) sound? ( media-video/mplayer ) latex? ( app-text/texlive app-text/dvipng )
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://apps.ankiweb.net/downloads/current/anki-2.0.47-source.tgz -> anki-2.0.47.tgz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=9533e3015ba9193318d5c9849597396a
diff --git a/metadata/md5-cache/app-misc/bijiben-3.24.2 b/metadata/md5-cache/app-misc/bijiben-3.24.2
index 5c3729ae923f..f2a0343dd559 100644
--- a/metadata/md5-cache/app-misc/bijiben-3.24.2
+++ b/metadata/md5-cache/app-misc/bijiben-3.24.2
@@ -4,10 +4,10 @@ DESCRIPTION=Note editor designed to remain simple to use
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Bijiben
 IUSE=zeitgeist
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.28:2 >=x11-libs/gtk+-3.11.4:3 >=gnome-extra/evolution-data-server-3.13.90:= >=net-libs/webkit-gtk-2.10.0:4 net-libs/gnome-online-accounts:= dev-libs/libxml2 >=app-misc/tracker-1:= sys-apps/util-linux zeitgeist? ( gnome-extra/zeitgeist )
 SLOT=0
 SRC_URI=mirror://gnome/sources/bijiben/3.24/bijiben-3.24.2.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c4578d39d8ea46914805b451739d132b
+_md5_=58e8c50a2fca154ee155a87f4a3f9ac0
diff --git a/metadata/md5-cache/app-misc/countrycodes-1.0.5-r3 b/metadata/md5-cache/app-misc/countrycodes-1.0.5-r3
index e113ddcfbefd..55871c6d8b64 100644
--- a/metadata/md5-cache/app-misc/countrycodes-1.0.5-r3
+++ b/metadata/md5-cache/app-misc/countrycodes-1.0.5-r3
@@ -2,9 +2,9 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=An ISO 3166 country code finder
 EAPI=6
 HOMEPAGE=http://www.grigna.com/diego/linux/countrycodes/
-KEYWORDS=~alpha amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.grigna.com/diego/linux/countrycodes/countrycodes-1.0.5.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=52bc41b1b0aba6a455f1ada614bbe46e
+_md5_=7450fbfc6e5ff4c9e0d30271a9b1220e
diff --git a/metadata/md5-cache/app-misc/neofetch-3.3.0 b/metadata/md5-cache/app-misc/neofetch-3.3.0
index 7512475a1d23..2d77b773ef1c 100644
--- a/metadata/md5-cache/app-misc/neofetch-3.3.0
+++ b/metadata/md5-cache/app-misc/neofetch-3.3.0
@@ -3,9 +3,9 @@ DESCRIPTION=Simple information system script
 EAPI=6
 HOMEPAGE=https://github.com/dylanaraps/neofetch
 IUSE=X
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT-with-advertising
 RDEPEND=sys-apps/pciutils X? ( x11-apps/xprop x11-apps/xwininfo x11-apps/xrandr www-client/w3m[imlib] media-libs/imlib2 media-gfx/imagemagick )
 SLOT=0
 SRC_URI=https://github.com/dylanaraps/neofetch/archive/3.3.0/neofetch-3.3.0.tar.gz
-_md5_=b834e7c394326c1347616625d1690fac
+_md5_=a65ae317dcc7534765c36d86cc48196b
diff --git a/metadata/md5-cache/app-misc/supercat-0.5.5-r2 b/metadata/md5-cache/app-misc/supercat-0.5.5-r2
index 255904a66c7a..241aede39aff 100644
--- a/metadata/md5-cache/app-misc/supercat-0.5.5-r2
+++ b/metadata/md5-cache/app-misc/supercat-0.5.5-r2
@@ -2,8 +2,8 @@ DEFINED_PHASES=configure install
 DESCRIPTION=A text file colorizer using powerful regular expressions
 EAPI=6
 HOMEPAGE=http://supercat.nosredna.net
-KEYWORDS=~amd64 ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=amd64 ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=http://supercat.nosredna.net/supercat-0.5.5.tar.gz
-_md5_=bcca38bedc88c8c03c2661a144d34add
+_md5_=aafb535050d920e685d1a4bcc1d2909f
diff --git a/metadata/md5-cache/app-misc/vlock-2.2.3 b/metadata/md5-cache/app-misc/vlock-2.2.3
deleted file mode 100644
index 46538341d585..000000000000
--- a/metadata/md5-cache/app-misc/vlock-2.2.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=pam? ( sys-libs/pam ) test? ( dev-util/cunit )
-DESCRIPTION=A console screen locker
-EAPI=4
-HOMEPAGE=http://cthulhu.c3d2.de/~toidinamai/vlock/vlock.html
-IUSE=pam test
-KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=pam? ( sys-libs/pam )
-SLOT=0
-SRC_URI=http://cthulhu.c3d2.de/~toidinamai/vlock/archive/vlock-2.2.3.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=8667f1563f32a7eb839955d167618191
diff --git a/metadata/md5-cache/app-misc/vlock-2.2.3-r1 b/metadata/md5-cache/app-misc/vlock-2.2.3-r1
index 7cc7361e7055..593393f20bba 100644
--- a/metadata/md5-cache/app-misc/vlock-2.2.3-r1
+++ b/metadata/md5-cache/app-misc/vlock-2.2.3-r1
@@ -4,11 +4,10 @@ DESCRIPTION=A console screen locker
 EAPI=6
 HOMEPAGE=https://github.com/WorMzy/vlock
 IUSE=pam test
-KEYWORDS=~alpha amd64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86
+KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=pam? ( sys-libs/pam )
-RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/WorMzy/vlock/archive/master.zip -> vlock-2.2.3.zip
+SRC_URI=https://github.com/WorMzy/vlock/archive/f2afd55704bfe0a2d66e6b270d247e9b8a7b1664.tar.gz -> vlock-2.2.3.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=91cc88286cb92a9205b212a1c36fc9e2
+_md5_=bd3bb7ad2b280401afb59f0d9adb893a