gentoo resync : 20.12.2017

23 files changed, 23 insertions, 616 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 882fa8de9e13..2140ae8aa49d 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/anki/Manifest b/app-misc/anki/Manifest
index b6f87436d548..cba6fec99d7c 100644
--- a/app-misc/anki/Manifest
+++ b/app-misc/anki/Manifest
@@ -1,22 +1,6 @@
 AUX anki-2.1.0_beta25-web-folder.patch 498 BLAKE2B 5a89ac454e8b4c551c7593bc8d428f9512d1304bd7fd5aa9380a301d92f10ca126a1a319c2ec831d1d5be99c6941c4307a2b674f0a15d2d554b1443fdf053421 SHA512 779806afd6c0eaaac149c89bbe8da2394630aa5a611001307808339f29237b4d7f3db7e1f66241ef67e179a5ab96d64371e1b198044cd9f88389d03a5c9d8478
-DIST anki-2.0.31.tgz 3329290 BLAKE2B e0aeb020e545b308d56893c1864f5a4e8835a85444066fb325fd0394c334189324b7be012429642503c4dcb113bfaf10c7a4d0c140bd43ab2a862960b79c3b12 SHA512 3e6e29247d83b026ece6974007c848822360a812838dbb718cf3f1423fc9d015236b027944cd99f3b419e0fe4fe6cb2390d185f00646af727ec8e76f4aa3cbb8
-DIST anki-2.0.33.tgz 3376646 BLAKE2B 0118c08dc903387b0b17255addc1efa550e4b9408f21804d35207cf1bb58006f2a5114bf6425b30ceeb8d438d8da7cd2a56274a9bceb24a8eaeb98646d2ba6a8 SHA512 ac2df1ac94e5aa4cc04c17d41b8f96788b5f321860bc20b4a167d5ee0161ca4f7f586fda08ac9910a706ec3e7d1bd692d2e74f3de56997c9ce480122396e0d6d
-DIST anki-2.0.34.tgz 3411136 BLAKE2B 7d488077165d2b01b89b62bb4d81b084b38a7d0bbf4a376ba0f7694cfef95d2a148a05af13d8a14babedf2fac835f2c8d196b380f422902f311779b020ea64d6 SHA512 289e937be7174b24b5213166d5d434a265ebef313815dbe105de6e21c83c6cf0cba93000e489b050fc5a04fc80bac25a71e7a42adad55bf2a1a2a246890dacdd
-DIST anki-2.0.35.tgz 3410475 BLAKE2B 49f5823a0cad4bc1164fa121a141edec2def18de0739bf4bc5fb71eb44ad992f4ac7a2a0edf183b73fe45dacda59f25ee642280e8e7def91b54d5c5024820447 SHA512 4877e564bf052220b6ba8b59d18d7a1a3a326b01339dfdf85cc13513c6f54a8927f3fad2861f6edff0db691ea208dd1a481afa3f412d7b4af4ee94d645ee6e6e
-DIST anki-2.0.36.tgz 3410538 BLAKE2B 957858fc277c31c4b842b937f9cdfd9950e5dd8832704db2c3494fe26fbd2121b09c31ab68aaefdc3e6cf061d52e5feb9a252cb695a97da7353add925466840f SHA512 34ef4c06a21c786d9a82f41bd2bc8308a12860f17d0cbb45466ac7f0e3867b669f8bae65442bb74af51ad906393b790b049c82f2bfa0871cb465d96dd057e147
-DIST anki-2.0.41.tgz 3422038 BLAKE2B 43f816b47ec17381de192f71680b3df8a0dade74379eb028177a8ad820d7fa876fe29fe3a22f1e6b33a794ae3d2b23530cc3e9fe8a7c10adbf9214d73d66c9ce SHA512 b5f58fdd690cca84fbe26f6b626d04e638b9d814a51fa6bad33f86eccc3c8d41712594a60a6621b1103fe974350a6ecffcd4e5cc1702eb3d79d3187fe30b8872
-DIST anki-2.0.43.tgz 3422113 BLAKE2B 04bd8c028122dfd74fdeb92297da7bd7af04fc093e87bd156bc61558a328a8249115baf14a666eeb7a7ce7b29e2276d1ef03e028a916d178fa88080ad229aea2 SHA512 e50ee4cf6fd7be266b6d38682e28a06b51cc42a2667f35fbafa755152d47bbadb2fbd2baa771d13e73f39973a4102d626fbe7327a5de05efbc3700d7a2c9909c
-DIST anki-2.0.47.tgz 3422231 BLAKE2B 192803df52a97cfe31f58914453836aa8dfd341572f812855e551faf9345506acce0176c0966c08e6b8ffac4f5ff36eb5eb76eac9ebc397ebe27e1fec0233e62 SHA512 5e4bbaac6d60506f43adfec1c4ff83285ac423405bfba57b566e7a9d632a22cf0f9ca7fe3eff3ce56c516a6cbb0112e5251319f11ba984d74bffd2c25e04c64a
 DIST anki-2.1.0_beta25.tgz 4117303 BLAKE2B 0f7021c4da4efa918c285fa6bf85242e52999d0f340d4a882651cf1e2857ac015f6f99967d4a7fee6df92a2b3c4849eb838707b08abd04d534f4d21ce28eb749 SHA512 9ddf984c575df00fe9b7974f24166a0f18d63e904b3d9bd4370de506828a251efed0fb319f06dc23c6852aae46e552994c6633880603a6e746d4d242b9e627f8
 DIST anki-2.1.0_beta27.tgz 4127906 BLAKE2B b4f83cc30dc3e89f3ca17c03ba8dcfc9a487de43d8ac564d5dc83488e286c302816c8a8140aa764b596404194c5f3727218deec303ef201ccaef38b945d8b32d SHA512 50b4ece1361ecafdfe08dad04e9b622b1e8ba2224bfef7e4660c95f81cb8f525d892170548d741ff53bc19ff4c13863f488a71c31c8328511fea3203d2c345f1
-EBUILD anki-2.0.31.ebuild 1548 BLAKE2B 86eeb8986612f9772848c51ae3106e4b3cf0aaa1462266d6312f48be41f2ea6448df8477f6699f92a19270fe5a63cfb51309b51b5f66d3fce2657396abb4e9d5 SHA512 c53dadfb9ed9106915de6f456de56975688578f01617e928e043c79271ee573150d64b0f010d6026423833a065faf63e24410bf42859920911258ea49093aca4
-EBUILD anki-2.0.33.ebuild 1294 BLAKE2B ab10bda89d0b1b2801e2b7690fb5cbb2015f7673427934f9c2cf4f3909d33bea9131e50b6154b00260d850e87c6580b34b34bf8d49569ec891665cb6361ded17 SHA512 1a2abf48874cb5facea0c85ad10278d7a6e90d7c0d23e5fc9e7de203f12a221450673ed11f54d8f1f400368691b2d8d64c7c15bbe7596fa01a497e42c1a838cd
-EBUILD anki-2.0.34.ebuild 1296 BLAKE2B 4d3c6ed18c4dafac170ff8584908857d6b67dcdd511cf7ab7e5aedbc233fbcdec51c6031599728959615d269afc5eb249d6955c5b8790e5e00402c500049558b SHA512 88a5c498fa2ff9aeda8ccbce9ad2ba515e1e3a088531e00310052298fa60eae6b40ec640418ff37c9f451f11dfc87971e71a3c8c628ab4271ff2702003468aef
-EBUILD anki-2.0.35.ebuild 1296 BLAKE2B 4d3c6ed18c4dafac170ff8584908857d6b67dcdd511cf7ab7e5aedbc233fbcdec51c6031599728959615d269afc5eb249d6955c5b8790e5e00402c500049558b SHA512 88a5c498fa2ff9aeda8ccbce9ad2ba515e1e3a088531e00310052298fa60eae6b40ec640418ff37c9f451f11dfc87971e71a3c8c628ab4271ff2702003468aef
-EBUILD anki-2.0.36.ebuild 1296 BLAKE2B 4d3c6ed18c4dafac170ff8584908857d6b67dcdd511cf7ab7e5aedbc233fbcdec51c6031599728959615d269afc5eb249d6955c5b8790e5e00402c500049558b SHA512 88a5c498fa2ff9aeda8ccbce9ad2ba515e1e3a088531e00310052298fa60eae6b40ec640418ff37c9f451f11dfc87971e71a3c8c628ab4271ff2702003468aef
-EBUILD anki-2.0.41.ebuild 1325 BLAKE2B 5ee3436415524e8e515d2882757171e047679a0a06858c2f83ac277dc7f95aff174ddd86e5bc4b0443a7b5a13d8265f84b0efc08b2d52074141be2cb2e838751 SHA512 5dc09ba11eb492f6d77ed90cd113e29bca357f6d49b357481e1c99ec73d22bbcf0423db9abf1dda8dc0488927455970007c851ce188738625cadde6a46f3a5bc
-EBUILD anki-2.0.43.ebuild 1407 BLAKE2B 45724e254c0ec8523144634d20010efb9898447285991ba3f4ad0faf4be76786e5d36ef3bf5a4e2aa942a02bbdcb2f2f0b75ef7cacd374b971f4225de1e169dc SHA512 6d52decb78cfd69476ec57e135b00fe77dd83fdd51af9ca92938e8208016fd381296d287e4213be50ed4243e6680b12606a792d8a8916f150899a60665464fb9
-EBUILD anki-2.0.47.ebuild 1407 BLAKE2B 45724e254c0ec8523144634d20010efb9898447285991ba3f4ad0faf4be76786e5d36ef3bf5a4e2aa942a02bbdcb2f2f0b75ef7cacd374b971f4225de1e169dc SHA512 6d52decb78cfd69476ec57e135b00fe77dd83fdd51af9ca92938e8208016fd381296d287e4213be50ed4243e6680b12606a792d8a8916f150899a60665464fb9
 EBUILD anki-2.1.0_beta25.ebuild 1881 BLAKE2B ff530eefc984bd972004a51c5b958102e31ace78ce8042b567311e8a79ed65b44ed901c675f58b7a386400a1bb3beee6dffe9ecc598ced33d10afd6fb7ce565c SHA512 8faab45dd5c2def4a01083669569f4389f975ed43359b072b24f62e80f32009de34b6b6c5939998f829d4f90d47eb6be310e589f2410b038f7cf7d40bbdf121a
 EBUILD anki-2.1.0_beta27.ebuild 1906 BLAKE2B e59b807d0f57e661c8ebe916dca9cb2b67c3e4161229d2d1af30b5c4dc59aa497678ec8ac4fead542b36677de2395d19f890d02acf83c6b1e8d33e3553938751 SHA512 e5d6b3ee23ab3a5aad0c77f23281e3bc3ba50e26ea66de5d1885d55e6639f70f46ce019ba2b309d86b6a6900c5ba3ab26d42542d743dc8c8d10479436aecf44c
 MISC metadata.xml 619 BLAKE2B a41d6e72dccb367627bfc34855a7f2dc657021907f1940c837ea99f134bf30cccb84157c6eea96944fee4e4d5275c329b5721abcabfb31b3a572b86789cd0ed2 SHA512 8b6656964a3c2cee9761b278839f31546a3fe2a4efd500cd015658af3502b548888e939bbeee45ead9c88632ade12c7f0ed33fcf8cdfc6d0ac91de63ac8bb351
diff --git a/app-misc/anki/anki-2.0.31.ebuild b/app-misc/anki/anki-2.0.31.ebuild
deleted file mode 100644
index b382762b9710..000000000000
--- a/app-misc/anki/anki-2.0.31.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit eutils python-single-r1
-
-DESCRIPTION="A spaced-repetition memory training program (flash cards)"
-HOMEPAGE="http://ichi2.net/anki/"
-SRC_URI="http://ankisrs.net/download/mirror/${P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="latex +recording +sound"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	 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 )"
-DEPEND=""
-
-pkg_setup(){
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	rm -r thirdparty || die
-	sed -i -e "s/updates=True/updates=False/" \
-		aqt/profiles.py || die
-}
-
-# Nothing to configure or compile
-src_configure() {
-	true;
-}
-
-src_compile() {
-	true;
-}
-
-src_install() {
-	doicon ${PN}.png
-	domenu ${PN}.desktop
-	doman ${PN}.1
-
-	dodoc README README.development
-	python_domodule aqt anki
-	python_doscript anki/anki
-}
-
-pkg_preinst() {
-	if has_version "<app-misc/anki-2" ; then
-		elog "Anki 2 is a rewrite of Anki with many new features and"
-		elog "a new database format.  On the first run your decks are"
-		elog "converted to the new format and a backup of your Anki-1"
-		elog "decks is created.  Please read the following:"
-		elog "http://ankisrs.net/anki2.html"
-	fi
-}
diff --git a/app-misc/anki/anki-2.0.33.ebuild b/app-misc/anki/anki-2.0.33.ebuild
deleted file mode 100644
index 810ea6120f91..000000000000
--- a/app-misc/anki/anki-2.0.33.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit eutils python-single-r1
-
-DESCRIPTION="A spaced-repetition memory training program (flash cards)"
-HOMEPAGE="http://ichi2.net/anki/"
-SRC_URI="http://ankisrs.net/download/mirror/${P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="latex +recording +sound"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	 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 )"
-DEPEND=""
-
-pkg_setup(){
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	rm -r thirdparty || die
-	sed -i -e "s/updates=True/updates=False/" \
-		aqt/profiles.py || die
-}
-
-# Nothing to configure or compile
-src_configure() {
-	true;
-}
-
-src_compile() {
-	true;
-}
-
-src_install() {
-	doicon ${PN}.png
-	domenu ${PN}.desktop
-	doman ${PN}.1
-
-	dodoc README README.development
-	python_domodule aqt anki
-	python_doscript anki/anki
-
-	# Localization files go into the anki directory:
-	python_moduleinto anki
-	python_domodule locale
-}
diff --git a/app-misc/anki/anki-2.0.34.ebuild b/app-misc/anki/anki-2.0.34.ebuild
deleted file mode 100644
index 8aba24bbdc44..000000000000
--- a/app-misc/anki/anki-2.0.34.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit eutils python-single-r1
-
-DESCRIPTION="A spaced-repetition memory training program (flash cards)"
-HOMEPAGE="http://ichi2.net/anki/"
-SRC_URI="http://ankisrs.net/download/mirror/${P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="latex +recording +sound"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	 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 )"
-DEPEND=""
-
-pkg_setup(){
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	rm -r thirdparty || die
-	sed -i -e "s/updates=True/updates=False/" \
-		aqt/profiles.py || die
-}
-
-# Nothing to configure or compile
-src_configure() {
-	true;
-}
-
-src_compile() {
-	true;
-}
-
-src_install() {
-	doicon ${PN}.png
-	domenu ${PN}.desktop
-	doman ${PN}.1
-
-	dodoc README README.development
-	python_domodule aqt anki
-	python_doscript anki/anki
-
-	# Localization files go into the anki directory:
-	python_moduleinto anki
-	python_domodule locale
-}
diff --git a/app-misc/anki/anki-2.0.35.ebuild b/app-misc/anki/anki-2.0.35.ebuild
deleted file mode 100644
index 8aba24bbdc44..000000000000
--- a/app-misc/anki/anki-2.0.35.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit eutils python-single-r1
-
-DESCRIPTION="A spaced-repetition memory training program (flash cards)"
-HOMEPAGE="http://ichi2.net/anki/"
-SRC_URI="http://ankisrs.net/download/mirror/${P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="latex +recording +sound"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	 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 )"
-DEPEND=""
-
-pkg_setup(){
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	rm -r thirdparty || die
-	sed -i -e "s/updates=True/updates=False/" \
-		aqt/profiles.py || die
-}
-
-# Nothing to configure or compile
-src_configure() {
-	true;
-}
-
-src_compile() {
-	true;
-}
-
-src_install() {
-	doicon ${PN}.png
-	domenu ${PN}.desktop
-	doman ${PN}.1
-
-	dodoc README README.development
-	python_domodule aqt anki
-	python_doscript anki/anki
-
-	# Localization files go into the anki directory:
-	python_moduleinto anki
-	python_domodule locale
-}
diff --git a/app-misc/anki/anki-2.0.36.ebuild b/app-misc/anki/anki-2.0.36.ebuild
deleted file mode 100644
index 8aba24bbdc44..000000000000
--- a/app-misc/anki/anki-2.0.36.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit eutils python-single-r1
-
-DESCRIPTION="A spaced-repetition memory training program (flash cards)"
-HOMEPAGE="http://ichi2.net/anki/"
-SRC_URI="http://ankisrs.net/download/mirror/${P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="latex +recording +sound"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	 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 )"
-DEPEND=""
-
-pkg_setup(){
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	rm -r thirdparty || die
-	sed -i -e "s/updates=True/updates=False/" \
-		aqt/profiles.py || die
-}
-
-# Nothing to configure or compile
-src_configure() {
-	true;
-}
-
-src_compile() {
-	true;
-}
-
-src_install() {
-	doicon ${PN}.png
-	domenu ${PN}.desktop
-	doman ${PN}.1
-
-	dodoc README README.development
-	python_domodule aqt anki
-	python_doscript anki/anki
-
-	# Localization files go into the anki directory:
-	python_moduleinto anki
-	python_domodule locale
-}
diff --git a/app-misc/anki/anki-2.0.41.ebuild b/app-misc/anki/anki-2.0.41.ebuild
deleted file mode 100644
index 3c0f5a7aa1e6..000000000000
--- a/app-misc/anki/anki-2.0.41.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit eutils python-single-r1
-
-DESCRIPTION="A spaced-repetition memory training program (flash cards)"
-HOMEPAGE="https://apps.ankiweb.net"
-SRC_URI="https://apps.ankiweb.net/downloads/current/${P}-source.tgz -> ${P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="latex +recording +sound"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	 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 )"
-DEPEND=""
-
-pkg_setup(){
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	rm -r thirdparty || die
-	sed -i -e "s/updates=True/updates=False/" \
-		aqt/profiles.py || die
-}
-
-# Nothing to configure or compile
-src_configure() {
-	true;
-}
-
-src_compile() {
-	true;
-}
-
-src_install() {
-	doicon ${PN}.png
-	domenu ${PN}.desktop
-	doman ${PN}.1
-
-	dodoc README README.development
-	python_domodule aqt anki
-	python_doscript anki/anki
-
-	# Localization files go into the anki directory:
-	python_moduleinto anki
-	python_domodule locale
-}
diff --git a/app-misc/anki/anki-2.0.43.ebuild b/app-misc/anki/anki-2.0.43.ebuild
deleted file mode 100644
index feccd2b7074f..000000000000
--- a/app-misc/anki/anki-2.0.43.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit eutils python-single-r1
-
-DESCRIPTION="A spaced-repetition memory training program (flash cards)"
-HOMEPAGE="https://apps.ankiweb.net"
-SRC_URI="https://apps.ankiweb.net/downloads/current/${P}-source.tgz -> ${P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="latex +recording +sound"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/PyQt4[X,svg,webkit,${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.7.4[${PYTHON_USEDEP}]
-	dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
-	dev-python/send2trash[${PYTHON_USEDEP}]
-	recording? (
-		media-sound/lame
-		>=dev-python/pyaudio-0.2.4[${PYTHON_USEDEP}]
-	)
-	sound? ( media-video/mplayer )
-	latex? (
-		app-text/texlive
-		app-text/dvipng
-	)"
-DEPEND=""
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	rm -r thirdparty || die
-	sed -i -e "s/updates=True/updates=False/" \
-		aqt/profiles.py || die
-}
-
-# Nothing to configure or compile
-src_configure() {
-	true
-}
-
-src_compile() {
-	true
-}
-
-src_install() {
-	doicon ${PN}.png
-	domenu ${PN}.desktop
-	doman ${PN}.1
-
-	dodoc README README.development
-	python_domodule aqt anki
-	python_doscript anki/anki
-
-	# Localization files go into the anki directory:
-	python_moduleinto anki
-	python_domodule locale
-}
diff --git a/app-misc/anki/anki-2.0.47.ebuild b/app-misc/anki/anki-2.0.47.ebuild
deleted file mode 100644
index feccd2b7074f..000000000000
--- a/app-misc/anki/anki-2.0.47.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit eutils python-single-r1
-
-DESCRIPTION="A spaced-repetition memory training program (flash cards)"
-HOMEPAGE="https://apps.ankiweb.net"
-SRC_URI="https://apps.ankiweb.net/downloads/current/${P}-source.tgz -> ${P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="latex +recording +sound"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/PyQt4[X,svg,webkit,${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.7.4[${PYTHON_USEDEP}]
-	dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
-	dev-python/send2trash[${PYTHON_USEDEP}]
-	recording? (
-		media-sound/lame
-		>=dev-python/pyaudio-0.2.4[${PYTHON_USEDEP}]
-	)
-	sound? ( media-video/mplayer )
-	latex? (
-		app-text/texlive
-		app-text/dvipng
-	)"
-DEPEND=""
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	rm -r thirdparty || die
-	sed -i -e "s/updates=True/updates=False/" \
-		aqt/profiles.py || die
-}
-
-# Nothing to configure or compile
-src_configure() {
-	true
-}
-
-src_compile() {
-	true
-}
-
-src_install() {
-	doicon ${PN}.png
-	domenu ${PN}.desktop
-	doman ${PN}.1
-
-	dodoc README README.development
-	python_domodule aqt anki
-	python_doscript anki/anki
-
-	# Localization files go into the anki directory:
-	python_moduleinto anki
-	python_domodule locale
-}
diff --git a/app-misc/bijiben/Manifest b/app-misc/bijiben/Manifest
index b6c9d4527bf8..5a788023b26b 100644
--- a/app-misc/bijiben/Manifest
+++ b/app-misc/bijiben/Manifest
@@ -1,5 +1,5 @@
 DIST bijiben-3.24.0.tar.xz 830884 BLAKE2B 7b982ef6b318d9b425b5bc2b6352a4674a8fe4a1e44da663771b834a083f946b055ab091de3fc0dadf25c4bd45496611ff9bc8322b747e6e84082d1f6faac480 SHA512 aba794d275b05f2267b7dfdd3f3933c5197d3596e06e72b0ae3d1f9855310761e5ff1b42ec7088fe7c90f55a6ffc64f6c508d72edc389d74256a9bcec90767d1
 DIST bijiben-3.24.2.tar.xz 843548 BLAKE2B 2441e3e9f672c7a9796dd1786bedf29ae1b5a6c4563b07943c4bfc252dc2ad9be0e8ab0569cbceb2b2c839a93d45ef3cd671d68d9b6717f880ffbb3f80d3392f SHA512 e5571c793fc75b1038a024f0f73b539079ca4415c7f4fd0756314a14baa1fe679d9513bf8c291aa20170f35616be409ebd0360e3d3ec8f962f2d3d143e02185e
 EBUILD bijiben-3.24.0.ebuild 857 BLAKE2B 52520d05517e8321223c5ce0853d5f8ce28d95be841e4cbc936209c1668d322f44e7c9e5a5300430e9a91dd895802612a4974495f678433ad3f47ebebe626afb SHA512 8356398ceefc060a72632e6f77bd0221e152e25060da61e7223cf4b4d0080512e0474136cd2dd268aa8dbeee34ec18337b26a91a0127d4104d387aa02b88389d
-EBUILD bijiben-3.24.2.ebuild 915 BLAKE2B e43ff4fd469deb4d3fe9b4c787fde0fc08db5aa30cc42a7659556a3ac3ff329ff1526c784992a4c75266a96f0b48d03273579617114231a37f80a2421658f4e2 SHA512 9ac9b48506cff632fca5e648862a7cc1da019a870ac03af387662827cfff0f916e57305270ad23dcf651d626e8aa635a6853ccb545ab914ecc8a7fa1fb4683e7
+EBUILD bijiben-3.24.2.ebuild 914 BLAKE2B e12f3b3c65d9527afe15ec443cedb2b4acf1c8966a9a12a4b270e9e32a9050ae69a964fa75e6f3659ce5dea64919458c812a676ca1423d49d8f8ed984595d6b4 SHA512 07d5b7a736034ccc7b8898ade58aa1a4134538f5777afe4a8bb4ab13be5f6d89191fe2a7d604cd05acb58f53e87ea94b64fd098e66f772757b3dd9c85c4acf48
 MISC metadata.xml 363 BLAKE2B a4f7c4f3811e2cecfb5f7977ac819be969e120c12e8c0a0d2cb006f68dabb8e64fe9c9a8258792690b3da217c30d422b37691276ee84d76b487307b0d94715cd SHA512 e891b4270a6c2c77ffe9e5efd945c6e6d7fc058e6315fac0793fbf86ca68251fa9a3d2fce796419fce6be1ca0fca215d50b77e9a4da6667475d0e0a155bcc747
diff --git a/app-misc/bijiben/bijiben-3.24.2.ebuild b/app-misc/bijiben/bijiben-3.24.2.ebuild
index 11d99664604a..abe626514cb9 100644
--- a/app-misc/bijiben/bijiben-3.24.2.ebuild
+++ b/app-misc/bijiben/bijiben-3.24.2.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Bijiben"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="zeitgeist"
 
 # XXX: raise glib dependency when Gnome 3.26 enters tree
diff --git a/app-misc/countrycodes/Manifest b/app-misc/countrycodes/Manifest
index f9cb73a1ac69..d4134bde429c 100644
--- a/app-misc/countrycodes/Manifest
+++ b/app-misc/countrycodes/Manifest
@@ -2,5 +2,5 @@ AUX 1.0.5-Makefile.patch 1034 BLAKE2B 54c932527ba2eb9cfc9906571ab4e683e854359b67
 DIST countrycodes-1.0.5.tar.gz 18621 BLAKE2B 1f2e1fb0f96d1388687929895c310e1e93c320f4d3f3f4cfe19c50d2ab850bafcefb5e13cfdaed546237ae5873eb95ae574ac47c0048bc2fa37c96158b5082fe SHA512 d62beaaccdbc8f7e14f3edf0044aeeef6375a3deffc0e4246a49fb8209ed7256208c878f811950c5c3bfda729988a46c173aecec72ee66e8843932d97064f035
 EBUILD countrycodes-1.0.5-r1.ebuild 779 BLAKE2B 3ed03fcf595652fd0cbccb4ab35add74a243a546e5b7776a1201a166ba9e20001f9bf51789f530021f6903d8b1fdb49e34a69987081be3d0d47c57f251db3f81 SHA512 df6a20cdb6634bded9ff057623280d36989df3337bbde00b175fe8d75f095d2e3c02740c5e13994a188d7916fa5227b92f835368aad4a1e9dab6ff7c913d0ac9
 EBUILD countrycodes-1.0.5-r2.ebuild 740 BLAKE2B 83c64a8aa6ef050c3b806995cbf97186278ce7b443590a2adcd6400a2f259b58ecdcb8d5ff4896036b79d77ba1ab8b080e24d0586bb2805add75c787104799eb SHA512 d086a6445262ac67c4785d42f05d9067adeda4f7b8a1457f487393ca8bcd7db5556d7df20ddaf4a2fe7e2ec3d5abbc62ec4b1680138fad05d7bfce83b7d19e12
-EBUILD countrycodes-1.0.5-r3.ebuild 722 BLAKE2B 1fbb1a60ec2a7c46863836660730b17c45b718e7640a710d5e2bfa237e0ca9f213d03b16331d2cc7e4f14954314b1c9725c23e17746bcffeb739eeeb4453f5e2 SHA512 579efc2e84cf9876b693b88a07f741a55dd3977df76d71cfcf84143427e772d0ef27b14c8deca8ac5171da9a5e83e972251195f811d5e2abdbc044d1f1b93734
+EBUILD countrycodes-1.0.5-r3.ebuild 721 BLAKE2B 638dc959e7dfaa2e665990565aa1e2cc7b0bf99dd8a6fc95d57673bb91da3c5234fe2ed5384b00e21414c0b929463c708bab9dbe725a8a0d4fd8d518beecef22 SHA512 81400eb29501282a901623d145eb97dc6d89fb0580e8fe3c695e5adf54514ed15106d35158a1a521572f4807d284af7819c8202ee862a7f8f104546cf4108d55
 MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/app-misc/countrycodes/countrycodes-1.0.5-r3.ebuild b/app-misc/countrycodes/countrycodes-1.0.5-r3.ebuild
index ce3a3d069812..d8c9b7ad8834 100644
--- a/app-misc/countrycodes/countrycodes-1.0.5-r3.ebuild
+++ b/app-misc/countrycodes/countrycodes-1.0.5-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.grigna.com/diego/linux/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 
 S="${WORKDIR}"/${P}/src
 
diff --git a/app-misc/neofetch/Manifest b/app-misc/neofetch/Manifest
index 46a071ab9315..ffe20ef6a48d 100644
--- a/app-misc/neofetch/Manifest
+++ b/app-misc/neofetch/Manifest
@@ -5,6 +5,6 @@ DIST neofetch-3.3.0.tar.gz 76325 BLAKE2B c7bd860dd1f89f4b0e64a5a4dcc6551d548103a
 EBUILD neofetch-3.0.1.ebuild 912 BLAKE2B 233c7ffd606a56714be33719e8839d8cb3b9d538579e2c225a5491bb4c43d7ec297c44094f8b2e4386fcdccadb6ab10362626a7e2265b3783b72f8e3f4119054 SHA512 f8ca26243ee92ef9607ec0f2ea11a47db3f770861dec53b434f01f17806b4f964aa3780db74c1c97fed7f2b9c7dfbade276c63aec3f4e9b17a3490f333253185
 EBUILD neofetch-3.1.0.ebuild 518 BLAKE2B 3b3600dbe4f7256f3df6263d3c59e0d301f85c2e4ba44c52ea2cb03d62ed41a85c5d81e3d7cc02f2587a442b139aaae96afce8053f4ad5dbb5c7df764b03fdb2 SHA512 a47a3a932714aee7e3abb3806bf67992d97f9e66250bf17f2dd90d8507f7d5b1e04b923f0acbfba28a93b7a08f21030f71d19289fd42ca0b3041df636d08faa7
 EBUILD neofetch-3.2.0.ebuild 518 BLAKE2B 3b3600dbe4f7256f3df6263d3c59e0d301f85c2e4ba44c52ea2cb03d62ed41a85c5d81e3d7cc02f2587a442b139aaae96afce8053f4ad5dbb5c7df764b03fdb2 SHA512 a47a3a932714aee7e3abb3806bf67992d97f9e66250bf17f2dd90d8507f7d5b1e04b923f0acbfba28a93b7a08f21030f71d19289fd42ca0b3041df636d08faa7
-EBUILD neofetch-3.3.0.ebuild 518 BLAKE2B 3b3600dbe4f7256f3df6263d3c59e0d301f85c2e4ba44c52ea2cb03d62ed41a85c5d81e3d7cc02f2587a442b139aaae96afce8053f4ad5dbb5c7df764b03fdb2 SHA512 a47a3a932714aee7e3abb3806bf67992d97f9e66250bf17f2dd90d8507f7d5b1e04b923f0acbfba28a93b7a08f21030f71d19289fd42ca0b3041df636d08faa7
+EBUILD neofetch-3.3.0.ebuild 516 BLAKE2B c54d9adc7245148f867989aed059961fa70c5525129ff4a9f8f0b7a8916213d4559dea3f2802e7c06125ddfb3599bba17ab8d83c418f56cd84ae12c1799b2081 SHA512 91c1caf60f4f3b4567aed0cb39c8f4b1b1a016f4823a49fd63830d15cdaa819dbd8440fb1004cf3443a8b134b774f1465713d787d79fa4a0ad2f243975045115
 EBUILD neofetch-9999.ebuild 489 BLAKE2B 133a0e384dc7610bcb2d1b162d9685e0e72607b36f28cf0ab8efdaef19cef8e0715a433fe914c85b4453eae14d3f4bf47b1b33580429c8ffd3b5a22ea8630aff SHA512 e293dea28a15013729353876565e10636de071fae44260180b563324b2b760e189019d39b216cfd0a2912cf09a70cececc2a391cce625c018f0c500e91a6f11b
 MISC metadata.xml 816 BLAKE2B ab46f262d12ed9915bd6aca44525f89e8489771ed89b9a9848f7a1403e603038a03493e1fe6ceffe2039dcaf1da91794dd8d6812eb914c0acfb7170418247d51 SHA512 c25f8072a2d86b13b31df6e78f037212df3ed28a13a7c954f8d6f59cdf15eb08b5c347ee4ef4b362935f983361b07883aff05b7454a0e2d41f511404e1ca9702
diff --git a/app-misc/neofetch/neofetch-3.3.0.ebuild b/app-misc/neofetch/neofetch-3.3.0.ebuild
index 74d58f581757..d80e7afe694c 100644
--- a/app-misc/neofetch/neofetch-3.3.0.ebuild
+++ b/app-misc/neofetch/neofetch-3.3.0.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://github.com/dylanaraps/neofetch"
 SRC_URI="https://github.com/dylanaraps/${PN}/archive/${PV}/${P}.tar.gz"
 LICENSE="MIT-with-advertising"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="X"
 
 RDEPEND="sys-apps/pciutils
diff --git a/app-misc/supercat/Manifest b/app-misc/supercat/Manifest
index 19a73d530ab8..6ec608e91d39 100644
--- a/app-misc/supercat/Manifest
+++ b/app-misc/supercat/Manifest
@@ -1,4 +1,4 @@
 DIST supercat-0.5.5.tar.gz 103545 BLAKE2B dfe8b823307fe39762d050e8676ff3f296b0ba206a618695fd3c699bc51d1c52cc552764ba52c45cc2eb0af2e8565a5dc4f86871489f082f15ba579aa80a51f5 SHA512 24989935ea7b863638165f7102ae511b9be00ff4399f433fc9ec2fc33543eea907b8bd46e819d815344c8c8467bc702b9a5b32aa55bd21be2670237fa1d711de
 EBUILD supercat-0.5.5-r1.ebuild 559 BLAKE2B 57c084a098cd29b363358f0a7b67df5c28dd9b18655a6125484eeff84f5b578cfbc471b95abcbffce092f0b2afcb93e6a5ad9d22129990e7ff55494bb746d800 SHA512 49e8e63eef13a42cbb81e3ae752f6b6498c26c98b9c14de3d097d969679ec8e61a562bccf8d42179bb2a69c53efead3d66cae89d2afcbc2ade3fdadd9fb91998
-EBUILD supercat-0.5.5-r2.ebuild 482 BLAKE2B f5d7deaacd57aca6cdc0a3fc4611c02154cd7306c4b9d64ecb68f128a387cc36e4d9ceb0af95b5dd46bff2c146e91ae7182bdcaeed4151305f32c29fc8f220a6 SHA512 83830ec6378bb1f4de90230175757ae4dc3d9e773f2885633f37ad017936a0040fb54c5e23f92855a8064c71ab0cb64ea69f0f18f081dca24cc968b1e041286e
+EBUILD supercat-0.5.5-r2.ebuild 480 BLAKE2B 5d3df04f978fc96d75c73b43be111694b70f452da064c957d840953bbd6022fd6f4dd6394b3ab5efe39fab07266770e0c1a3c58e1c8c13933d293baaa302b2c4 SHA512 83fb29c6ee6859e4ba73753a77c8e8f89a4f0702337f742730178195aa167356f6d6125cc26eb5010ff0b594515586935f7bedee05d3c226d16efefe960d618e
 MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/app-misc/supercat/supercat-0.5.5-r2.ebuild b/app-misc/supercat/supercat-0.5.5-r2.ebuild
index 392098904277..df1963a767e0 100644
--- a/app-misc/supercat/supercat-0.5.5-r2.ebuild
+++ b/app-misc/supercat/supercat-0.5.5-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://supercat.nosredna.net/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 
 src_configure() {
 	econf --with-system-directory="${EPREFIX}/etc/supercat"
diff --git a/app-misc/vlock/Manifest b/app-misc/vlock/Manifest
index 8dfce83c55bf..d9f289f7e4dc 100644
--- a/app-misc/vlock/Manifest
+++ b/app-misc/vlock/Manifest
@@ -1,7 +1,5 @@
-AUX vlock-2.2.2-asneeded.patch 393 BLAKE2B d32fb731251246dc26d5079eaaf781a1134c1ed5f6ef0f8f4f9293b9c2edf2ea105c6d1a9e546ad0ea385ad0ff3fed3b80590f789d85ece63e44ef5176e4ef81 SHA512 ad73953d0632f6b05be6dc2fd300f58cd9463ea7af082b0353df0e6e4850b7055c9957c27def4f5d745e02b7535058bd3f8622847cbf2124c023d1d309e59886
-AUX vlock-2.2.2-test_process.patch 905 BLAKE2B 43179e0763a90bd44d3ac9699cf65c80314e24c31433d8f7da9be7633d99a9ab3ba4663591c6e4eef091aceaf62f5e8ddd1b3e3d56960439c45ea9240a14a372 SHA512 959d10b3c777936ce7b29b6a8efea55d8d76cf0007704c6b17217be4687516d2fb8d4d268d58175ebaca8594c9d5b47724788b235a5386ee2a458ed640fd63eb
+AUX vlock-2.2.2-asneeded.patch 393 BLAKE2B 1434b168d0f55c3a88e08f280d213850ed676343296f6a9244d6b8e2726aea1b67ef19a8813a402bb0d8e3257cc6478d9a8559d5a035d9413dfe3c9e1b966f25 SHA512 5fa18db0c5ce37d15ea1d1b0b1653b43cf33a2c0f8f56708973a6d5fc59f5357efa2e6cab7113893ebedb1eb3943c6a1c8a9649c7bb407ddf4c6cfaded6e52df
+AUX vlock-2.2.2-test_process.patch 905 BLAKE2B 89d80dddc8b13c23a9da34b3570d44984f66156a756027ae6787e1678973375dfdaaae449f771cf925411f17bd03f733ec2bdb94be9736a75a7f3be0da8c097b SHA512 5963bad2bbbaa639cc917adb594e47df156a12dd832bc252343416152934b9e78b3b0ed2f46d529fd7612fc2c8188340a84d249ea9b7e5e31638711428efa597
 DIST vlock-2.2.3.tar.gz 54860 BLAKE2B 140b38dda15dd5c269729db1fbc3cc36dfea035c79e7998adb7f6ec56806408748701b986a2a1509aab6118a796a13b96a1de24f2837f94c4cdf058df736f37c SHA512 7eba8fe4f7085be7ef9169843d0814e55840b823dfc061727db037d2420e8ff4b669a3b08e15f61cdd9d5048c1e088288a46acad341cbe97585e64da2b58c855
-DIST vlock-2.2.3.zip 85751 BLAKE2B 83ef3b55f84cd7bd9f173dbe574d004fc4fd002820aeea0c5a40d3f09d0db0eccdc063f84e019958b71c12867326fbac17c09b31b4fb0d540ed461c11b15df70 SHA512 90390bcecbc5cd55a19f9d3a6007fd39257183f63366d667263c8d49217206ba5d929814c32181bf3d3fa82197a544211ee815b65ab1c7e09a2502c4ab079b07
-EBUILD vlock-2.2.3-r1.ebuild 1113 BLAKE2B 572663f5263af2b67848f3275f08f5606891e0acb679743658957e224a6bbb99d157e60c6b8d2c564a54f224dfe140a2abd8d6a419df58cb6b3621074b8a486f SHA512 9dfd5483ceb711b44a98ce16f300d31c3ff09701128a919a992428d9ec677830575d41c17da166c425e5668eebc251ce4641e3af2a35df4f7a1a4d14a99aca03
-EBUILD vlock-2.2.3.ebuild 1257 BLAKE2B aaaa6c8a91b2fe65472543f5b8bf3279038384e44fd57ad90281b4ee20181b12aac617baf0b0260539933c4731d8dd24627b851570878d2b3ee7e151f4a4afd4 SHA512 200ee863b096f0601080f4851e13c8deddfabfff0aafceee4a1ac33c5b25323436361d8e47c9e61e4bd3518df236c75b2a3bbca7c19aafdb695bb169c6e0d1d2
+EBUILD vlock-2.2.3-r1.ebuild 1228 BLAKE2B 0c971292f98b419f7d19829cecef6c791cd1532b251647553ae3a38518984fc697e3506c09a4f70e5ac14feca914db70ccdecf9f0848f25a4f2a345429289070 SHA512 3854598d34688ea6c42b72504209d8760b49cff414e84c6ba2a34e7431bccb391e99d2649774716ac3fe5daa0810cfe516964f362e4efdf37ce03a46ea173d27
 MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/app-misc/vlock/files/vlock-2.2.2-asneeded.patch b/app-misc/vlock/files/vlock-2.2.2-asneeded.patch
index 8baeed37caf6..cb4c3f42422b 100644
--- a/app-misc/vlock/files/vlock-2.2.2-asneeded.patch
+++ b/app-misc/vlock/files/vlock-2.2.2-asneeded.patch
@@ -1,5 +1,5 @@
---- tests/Makefile.old	2008-10-16 13:48:37.000000000 +0200
-+++ tests/Makefile	2008-10-16 13:48:53.000000000 +0200
+--- a/tests/Makefile	2008-10-16 13:48:37.000000000 +0200
++++ b/tests/Makefile	2008-10-16 13:48:53.000000000 +0200
 @@ -16,7 +16,7 @@
  TEST_SOURCES = $(TESTED_SOURCES:%=test_%)
  TEST_OBJECTS = $(TEST_SOURCES:.c=.o)
diff --git a/app-misc/vlock/files/vlock-2.2.2-test_process.patch b/app-misc/vlock/files/vlock-2.2.2-test_process.patch
index 83ecd4b14e2c..a725e9a5a851 100644
--- a/app-misc/vlock/files/vlock-2.2.2-test_process.patch
+++ b/app-misc/vlock/files/vlock-2.2.2-test_process.patch
@@ -1,5 +1,5 @@
---- tests/test_process.c.old	2008-10-16 14:10:16.000000000 +0200
-+++ tests/test_process.c	2008-10-16 14:11:26.000000000 +0200
+--- a/tests/test_process.c	2008-10-16 14:10:16.000000000 +0200
++++ b/tests/test_process.c	2008-10-16 14:11:26.000000000 +0200
 @@ -12,6 +12,7 @@
  
  #include "test_process.h"
diff --git a/app-misc/vlock/vlock-2.2.3-r1.ebuild b/app-misc/vlock/vlock-2.2.3-r1.ebuild
index d8f1739be0ed..a824254c0335 100644
--- a/app-misc/vlock/vlock-2.2.3-r1.ebuild
+++ b/app-misc/vlock/vlock-2.2.3-r1.ebuild
@@ -5,13 +5,15 @@ EAPI=6
 
 inherit pam toolchain-funcs user
 
+COMMIT="f2afd55704bfe0a2d66e6b270d247e9b8a7b1664"
+
 DESCRIPTION="A console screen locker"
 HOMEPAGE="https://github.com/WorMzy/vlock"
-SRC_URI="https://github.com/WorMzy/vlock/archive/master.zip -> ${P}.zip"
+SRC_URI="https://github.com/WorMzy/vlock/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="pam test"
 
 RDEPEND="
@@ -23,9 +25,10 @@ DEPEND="
 
 DOCS=( ChangeLog PLUGINS README README.X11 SECURITY STYLE TODO )
 
-S="${WORKDIR}/${PN}-master"
-
-RESTRICT="test"
+PATCHES=(
+	"${FILESDIR}/${PN}-2.2.2-asneeded.patch"
+	"${FILESDIR}/${PN}-2.2.2-test_process.patch"
+)
 
 pkg_setup() {
 	enewgroup "${PN}"
diff --git a/app-misc/vlock/vlock-2.2.3.ebuild b/app-misc/vlock/vlock-2.2.3.ebuild
deleted file mode 100644
index 8f2c3117c2fc..000000000000
--- a/app-misc/vlock/vlock-2.2.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils pam toolchain-funcs multilib user
-
-DESCRIPTION="A console screen locker"
-HOMEPAGE="http://cthulhu.c3d2.de/~toidinamai/vlock/vlock.html"
-SRC_URI="http://cthulhu.c3d2.de/~toidinamai/vlock/archive/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86"
-IUSE="pam test"
-
-RDEPEND="pam? ( sys-libs/pam )"
-DEPEND="${RDEPEND}
-	test? ( dev-util/cunit )"
-
-pkg_setup() {
-	enewgroup vlock
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}/${PN}-2.2.2-asneeded.patch" \
-		"${FILESDIR}/${PN}-2.2.2-test_process.patch"
-}
-
-src_configure() {
-	if use pam; then
-		myconf="--enable-pam"
-	else
-		myconf="--enable-shadow"
-	fi
-	# this package has handmade configure system which fails with econf...
-	./configure --prefix=/usr \
-				--mandir=/usr/share/man \
-				--libdir=/usr/$(get_libdir) \
-				${myconf} \
-				CC="$(tc-getCC)" \
-				LD="$(tc-getLD)" \
-				CFLAGS="${CFLAGS} -pedantic -std=gnu99" \
-				LDFLAGS="${LDFLAGS}" || die "configure failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	use pam && pamd_mimic_system vlock auth
-	dodoc ChangeLog PLUGINS README README.X11 SECURITY STYLE TODO
-}