Repo fixes and cleanups

31 files changed, 113 insertions, 115 deletions

diff --git a/app-misc/open-plc-utils/Manifest b/app-misc/open-plc-utils/Manifest
index af7b227..e405af1 100644
--- a/app-misc/open-plc-utils/Manifest
+++ b/app-misc/open-plc-utils/Manifest
@@ -1 +1 @@
-EBUILD open-plc-utils-9999.ebuild 779 SHA256 f844a6a5ed7c681b538bfac26c0b84c4805c5010188d07fc8267383febbfe3f8 SHA512 b9d3bc2a411578281b5a4b99e6114edb36edd55534113498763af76a9e5be0975daa7bdf9bf1043323857ee2454fd63d82c5f6fb118fb3d805341cbac7bf81b9 WHIRLPOOL a5ef4c9724e1d5aaabec6cbff45b3ba964546fe9c6fa291d14825a69dc6f7a518a7b17440c585f9ba21cf99b19bd6f8e75a4434bcd209fb88ebb487df9b6f820
+EBUILD open-plc-utils-9999.ebuild 779 BLAKE2B c1a0de1e58ac640d6bdaa84160592478f73e71428dcd424cdede7920a39634865b04ff23224077009a07b56b4324241da53bba9d7f08472a91c139bea20a8a89 SHA512 b9d3bc2a411578281b5a4b99e6114edb36edd55534113498763af76a9e5be0975daa7bdf9bf1043323857ee2454fd63d82c5f6fb118fb3d805341cbac7bf81b9
diff --git a/app-portage/epm/Manifest b/app-portage/epm/Manifest
index cf6c2f2..b367efc 100644
--- a/app-portage/epm/Manifest
+++ b/app-portage/epm/Manifest
@@ -1,3 +1,3 @@
 AUX epm 30664 BLAKE2B 72988b0b08616761367b98dc3c698e0d352e2c442d0bcc1c77b2bfcd0009cb06bd27572e93d727babeca5bc353a3e7db43a8d7997e316a9e3b41b434e1d93a11 SHA512 75ae3fb03be9508f357f020310fba1e2d89513782ea57cb39f5a524b8cf5ded95c45bc4fbe0bfd195902c25f286119cf54501de64a2f082a69ea0ca55968175a
 AUX epm-1.40-prefix.patch 1293 BLAKE2B 6d835610fce455f6089867b2fd7e959b5dffff07f72a96a9a8a2be3fb4033822967098e32f859b836c25cc8d463b9ae950a7337f65c261ceb538a0dac14a842c SHA512 877204c75356b36df74ace94fe26a09f598448cbf502b7d65fec9d4b142368c4734e16807e5e4706671d8a59bc7db09811166f422d43d74a40fae5ff65e8c256
-EBUILD epm-1.40.ebuild 726 BLAKE2B 676c5c1f2ad63ef0e42385557e98ff338df4ff0e4904cd80f4baa70311ca7633138224689349e4a9473ee627d739fd68e5d5c983015d1d671182d961dcda184e SHA512 4daa54a0edb05f6dde4e6bbfbb573a02abb1bf6320b570b90d9fa2000eb8e443c0549d67a2bb28ab9f3df0228885bcdf6ded1c01ddaee571ae38092ab8eeb7cb
+EBUILD epm-1.40.ebuild 675 BLAKE2B 6bacf694e05b2334e72b2686c5340675ab8434102a818c33e252b7bd82c9a8db8f25224f88b8009954ef7cc55ec969db6ee44a880fd95f92baedb5f5d1e5c40c SHA512 f22ddc4e4a5719684e55406970adef1d1bbdbf2a28017465eb7f6d6c37fa1c392b9a56621afc9c3b6dc56daa2e842ecf10cab0c734fc4a569ec83f5994e945ca
diff --git a/app-portage/epm/epm-1.40.ebuild b/app-portage/epm/epm-1.40.ebuild
index 1b89ed4..f03c083 100644
--- a/app-portage/epm/epm-1.40.ebuild
+++ b/app-portage/epm/epm-1.40.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+EAPI="7"
 
 inherit eutils prefix
 
@@ -12,10 +12,10 @@ S="${WORKDIR}/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
-DEPEND=">=dev-lang/perl-5"
+DEPEND="dev-lang/perl"
 RDEPEND="${DEPEND}"
 
 src_unpack() {
diff --git a/dev-lang/squeakvm/Manifest b/dev-lang/squeakvm/Manifest
index c08456e..0478227 100644
--- a/dev-lang/squeakvm/Manifest
+++ b/dev-lang/squeakvm/Manifest
@@ -1,2 +1,2 @@
 DIST Squeak-4.10.2.2614-src.tar.gz 3297314 BLAKE2B 03c89ea96ed005f1d7a25e6b1016f39bec2dbd7e2282a12c1b02ab57859477d87e3098426c55411fc06e250207830b7e50a23e6330ca64fd967613f2af86e180 SHA512 b823fb97f7826dbbae5feeb15ffc3ab7e11cf27c5a3cc3f2cf2f8c39b56af5f9d0078d020a4b8f72b997198d296be6d85ec10e0bca10d5214bf586e1e0587f07
-EBUILD squeakvm-4.10.2.2614.ebuild 3934 BLAKE2B 165a8ba90f496611f3c0e26dfcddf4d4b165540bbca94aa8179f0bbe51b149632fc6ee7c9fe8bf13e1590685eea2d99413674602629fa75007cbc781c5b39bcb SHA512 5f1ff4415a35dfef84c5d680884ab7d142c27b7c7f0dca5a3c40079ec7371e3fcb00b33b4b6510ca039e8e942ed6ff1e9f41fb8925cebf753d34a2a368711bc0
+EBUILD squeakvm-4.10.2.2614.ebuild 3921 BLAKE2B dc33239856722575aa2d2ec0d60f9a0b5f0b95ff125bc8d2826785fe3e9aca299325f81919a4f97b8fb3358adfb50fa440692091d7593560c2d5895846e29ae9 SHA512 c63d2f2880fde6fc3f76a3e11b4fcaf03c36aba8ad048d786271911268409047f514f2333a327ecb6b26ca3022b57bd62e8f296b6f0d3e3efa32bfa89461e4c1
diff --git a/dev-lang/squeakvm/squeakvm-4.10.2.2614.ebuild b/dev-lang/squeakvm/squeakvm-4.10.2.2614.ebuild
index 571ee79..8071784 100644
--- a/dev-lang/squeakvm/squeakvm-4.10.2.2614.ebuild
+++ b/dev-lang/squeakvm/squeakvm-4.10.2.2614.ebuild
@@ -1,20 +1,20 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
-inherit versionator fixheadtails 
+inherit versionator fixheadtails
 DESCRIPTION="Highly-portable Smalltalk-80 implementation"
 HOMEPAGE="http://www.squeak.org/"
 SRC_URI="http://squeakvm.org/unix/release/Squeak-${PV}-src.tar.gz"
 LICENSE="Apple"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="+X +mmx +threads +iconv +opengl image64 alsa oss pulseaudio nas +v4l fbcon dbus +scratch examples"
 
 
-DEPEND="X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXt ) 
+DEPEND="X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXt )
 	dev-util/cmake
 	media-libs/freetype
-    >=x11-libs/cairo-1.8.6
+	>=x11-libs/cairo-1.8.6
 	>=x11-libs/pango-1.20.5
 	>=dev-libs/glib-2.20.1:2
 	virtual/libffi
@@ -133,7 +133,7 @@ src_configure() {
 	#use threads 	&& myconf="${myconf} --enable-mpg-pthread"
 	#use iconv 		|| myconf="${myconf} --disable-iconv"
 	#use opengl 		|| myconf="${myconf} --without-gl"
-	use image64 	&& myconf="${myconf} --image64"
+	use image64 && myconf="${myconf} --image64"
 	#use alsa		|| myconf="${myconf} --without-alsa"
 	#use oss			|| myconf="${myconf} --without-OSS"
 	#use pulseaudio	|| myconf="${myconf} --without-pulse"
@@ -143,12 +143,10 @@ src_configure() {
 	#use dbus		|| myconf="${myconf} --without-DBusPlugin"
 	#use scratch		|| myconf="${myconf} --without-ScratchPlugin"
 
-	
-
 	cd ${S}
-    touch unix/npsqueak/CMakeLists.txt
+	touch unix/npsqueak/CMakeLists.txt
 	mkdir build
-	cd build	
+	cd build
 	../unix/cmake/configure \
 		--prefix=/usr \
 		--infodir=/usr/share/info \
diff --git a/dev-perl/Data-Password/Data-Password-1.10.ebuild b/dev-perl/Data-Password/Data-Password-1.10.ebuild
index dbb740e..1e27220 100644
--- a/dev-perl/Data-Password/Data-Password-1.10.ebuild
+++ b/dev-perl/Data-Password/Data-Password-1.10.ebuild
@@ -7,12 +7,12 @@ EAPI=5
 inherit perl-module
 
 DESCRIPTION="Perl extension for assessing password quality."
-HOMEPAGE=""
+HOMEPAGE="https://metacpan.org/release/Data-Password"
 SRC_URI="mirror://cpan/authors/id/R/RA/RAZINF/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="Artistic"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~am~x86 ~amd64"
 IUSE=""
 SRC_TEST="do"
 
diff --git a/dev-perl/Data-Password/Manifest b/dev-perl/Data-Password/Manifest
index b7e8afb..9508095 100644
--- a/dev-perl/Data-Password/Manifest
+++ b/dev-perl/Data-Password/Manifest
@@ -1,2 +1,2 @@
-DIST Data-Password-1.10.tar.gz 5543 SHA256 07a340ce6ac000723cd831612afc2760a3eb3783d1afd405e8b061ae52b88f85 SHA512 ef0907a782853269c0204db2c14aea5035375b4d3cf42741f0a7ed126a853fe60595daa84c61991487ef013016cf9da5085eced2f00778ae606177dd06054fef WHIRLPOOL 2ea144bd2dae5c9953cb43dc90a619b45d7edc16508652ad5b755fbb4ecf6c10078bf2763abf3badc4e600e4db9b26ffcdf8d813a06452548a29955ac92e3cc9
-EBUILD Data-Password-1.10.ebuild 380 SHA256 1031f9724bccf8fab4fa4fa71091dc4aea1ccf8167ee461e0f366f2904fbc2e3 SHA512 8ddc7b2ba270e2849e2364ef3866819a5a253239e085ac8d0fd3c322a88cd5c29efb59b3b90ea1d3189d4ec658356ab5df27bf3ed2226455883fa8203e9b122d WHIRLPOOL 6215db9fcff656c4790f7a58eb6b7fa293cc5f450eb5ba1b89c49122e91b1827a112b8228dc2aa31ccec525083b65ac84dff2b8f84ca72c44c0e35ed48c5807a
+DIST Data-Password-1.10.tar.gz 5543 BLAKE2B 86acacc416ccd89900d6ab4b8239536921829c663d180addcd4dcde3806ce2b55fbf46a6d0e3c5a764335e7c694fe7982b117cb44f8ea565b55f46169337dde5 SHA512 ef0907a782853269c0204db2c14aea5035375b4d3cf42741f0a7ed126a853fe60595daa84c61991487ef013016cf9da5085eced2f00778ae606177dd06054fef
+EBUILD Data-Password-1.10.ebuild 422 BLAKE2B 3b0fb98a74ce41d61ee137ee96743d48e1eaec937c7e87ca0384b6d075030be62b19b4ec5bc5faa51867062eaf308bd3b86c22747d3ae80dcc9781b5fb483a3f SHA512 44b8139b0ab1ee0179d02309947755dcfd185f17c5dac78388719ff716a1689a5c74dd5400148cd09a800b71a79e308ea468dd01ea35a02d7318fe3527969db2
diff --git a/dev-perl/Unicode-CaseFold/Manifest b/dev-perl/Unicode-CaseFold/Manifest
index acf2b78..7677d1e 100644
--- a/dev-perl/Unicode-CaseFold/Manifest
+++ b/dev-perl/Unicode-CaseFold/Manifest
@@ -1,2 +1,2 @@
-DIST Unicode-CaseFold-1.00.tar.gz 65145 SHA256 c489b5a440e84b0554e866d3fe4077fa1956eeed473e203588e0c24acce1f016 SHA512 e947129b05759f1f0d3efa7b8793f47dd0ed4e3c8f105523badecc58d8e9a7c4d79984c172bd4114fe6462adb45500fbebffb1e4ecbf0427a54d535cfb55874d WHIRLPOOL 86a299886bf59afc020be36a88a5bd2de5d8a216935f2a25cce75c87ddfc14ac6286d846f7f94ae44cbff52bfea94bfb1e9a9405e95fdb6cdf9a178717d57614
-EBUILD Unicode-CaseFold-1.00.ebuild 683 SHA256 f721bb41bfdb1acd462b96852831a22232969ac8795fae3feeb695e677a0208c SHA512 aa4493761d74a6f2fe0b21610bb96db78fba63145c860b05cd0c5af9f092bf2fd510238ebe39c9eaed6941af4d00c326df988c3fa5a69e9f3b616d1288a4c4d0 WHIRLPOOL 5b959b2deff8ec680e28e6166772d131b5ec1fed24556be075643232bcc7f401369d8f45190a124b1524521cdb672de96aba0bd77e5666ddf671f399c5d4129b
+DIST Unicode-CaseFold-1.00.tar.gz 65145 BLAKE2B 7b16031ee06d6f1c6bcde184941c13f64b3f65c4888e59354adf8e9090d28138f08b9534fbf529dca8dab8f6cbe2588b3ff4878a5fd48246ebfe3636dcb760fa SHA512 e947129b05759f1f0d3efa7b8793f47dd0ed4e3c8f105523badecc58d8e9a7c4d79984c172bd4114fe6462adb45500fbebffb1e4ecbf0427a54d535cfb55874d
+EBUILD Unicode-CaseFold-1.00.ebuild 589 BLAKE2B e433b72b4b9243fff32361332c8f2e37bdf22a3165b38bdcec422838ebefed061c3c6ca0e719f4b653607348b60804f5ed69a09246a854def71971d8c5bb28b2 SHA512 56480eed97d63bf90b6ce1e284aef0490b938b8638fac21ffe6916fa56920bf66e5aa1e971674b02d89d93baca8c5b6faac3a435d3a4d5fbbaeeca4bc9411af7
diff --git a/dev-perl/Unicode-CaseFold/Unicode-CaseFold-1.00.ebuild b/dev-perl/Unicode-CaseFold/Unicode-CaseFold-1.00.ebuild
index deecd65..1b81510 100644
--- a/dev-perl/Unicode-CaseFold/Unicode-CaseFold-1.00.ebuild
+++ b/dev-perl/Unicode-CaseFold/Unicode-CaseFold-1.00.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://cpan/authors/id/A/AR/ARODLAND/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="|| ( GPL-1+ Artistic )"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 SRC_TEST="do"
 
diff --git a/games-action/minecraft/Manifest b/games-action/minecraft/Manifest
index 766022c..d56085e 100644
--- a/games-action/minecraft/Manifest
+++ b/games-action/minecraft/Manifest
@@ -1,3 +1,3 @@
 DIST minecraft-29.tar.gz 51153 BLAKE2B c7a3a33353f13a054c7ed9c1642d5732a62d32668058eb901cec42493b40039350bb15ba1aa97c49dc18dc1c2787d5e3fca6ef9b684c285e97f8ad5debc6db2d SHA512 310dcb0e8c97b0748c7f3e431d9c5b817fec0c608a7ab23ed1a52694f262fd5f823c83f3f76fd52904c5327577f7ac12996536074a32c15f64669f184b8b9057
 DIST minecraft.jar 280212 BLAKE2B 91a4c0e1edd8f88df713eb9d20e998000f783b40d18f439fda221013aeeb9f93e497166bf4751ad84d38b084798aaa1263d51743ddc96c0a792620b68798f3c0 SHA512 64201f5d9522c43bded397e39b29eedeed5af224a064e13eede6f5d276d7b61702c5daae998c1fff8b34c6660f8f56a40bf0f43f4024119023c77672d6319659
-EBUILD minecraft-29.ebuild 1215 BLAKE2B 6857a5b6092ca488b126fc125a2e532704f954fa968b3817e3187132eea4d2fb14e4d61661620d464caa7037c45442ca8bcbc1ea0e4f2180e3b1b32149143044 SHA512 61f0a784a2eb154da86e75dc265058c2aab3b9444fd17e4c247b39c79e544354808aee3b7ec9f12c4d6b37a863b7e2a36f8ce801e59688366871282c1d18ea00
+EBUILD minecraft-29.ebuild 1207 BLAKE2B 07b83ee8188af338ddaa017742f88a2e6b7989bfee34942ca01364a6c0cdbdf2249514ccce768cd7311fda8800a097a5c20ce6abd11b9803c4b3dce54f593b4a SHA512 31f20e6c618e483a04580ad69b95c31addb9842ccf04075d52c7ea7e9a2a0cee72c1b008a8423be8b0f31fded3fd5480674e7daba707e9010c411e2934eacc99
diff --git a/games-action/minecraft/minecraft-29.ebuild b/games-action/minecraft/minecraft-29.ebuild
index a091cc1..5ccd5a5 100644
--- a/games-action/minecraft/minecraft-29.ebuild
+++ b/games-action/minecraft/minecraft-29.ebuild
@@ -9,19 +9,20 @@ inherit games java-utils-2
 DESCRIPTION="An open-world game whose gameplay revolves around breaking and placing blocks"
 HOMEPAGE="http://www.minecraft.net"
 SRC_URI="
-  https://github.com/Tabinol/gentoo-minecraft/archive/${PV}.tar.gz -> ${P}.tar.gz
-  https://s3.amazonaws.com/Minecraft.Download/launcher/Minecraft.jar -> ${PN}.jar"
-	
-LICENSE="Minecraft"
+	https://github.com/Tabinol/gentoo-minecraft/archive/${PV}.tar.gz -> ${P}.tar.gz
+	https://s3.amazonaws.com/Minecraft.Download/launcher/Minecraft.jar -> ${PN}.jar"
+
+LICENSE="Mojang"
 SLOT="0"
 KEYWORDS="~amd64"
 RESTRICT="mirror"
 
 S="${WORKDIR}/gentoo-minecraft-${PV}"
 
-RDEPEND=">=virtual/jre-1.8.0
-  >=x11-apps/xrandr-1.4.3
-  virtual/ttf-fonts"
+RDEPEND="
+	>=virtual/jre-1.8.0
+	>=x11-apps/xrandr-1.4.3
+	virtual/ttf-fonts"
 
 DEPEND=""
 
@@ -39,7 +40,7 @@ src_prepare() {
 
 src_install() {
 	java-pkg_dojar "${DISTDIR}/${PN}.jar"
-  dogamesbin "${PN}"
+	dogamesbin "${PN}"
 	doicon "${PN}.png"
 	make_desktop_entry "${PN}" "Minecraft"
 
@@ -54,4 +55,3 @@ pkg_postinst() {
 
 	games_pkg_postinst
 }
-
diff --git a/games-fps/armyops/Manifest b/games-fps/armyops/Manifest
index ddf241c..e142d95 100644
--- a/games-fps/armyops/Manifest
+++ b/games-fps/armyops/Manifest
@@ -1,2 +1,2 @@
-DIST armyops250-linux.run 813453963 SHA256 0acd87ddadee3418dfff98ad270a087aa2386e0cf86f4912ea2e30157657effe SHA512 ed4295c0d4756ae9df76b78620922752e9edeaf41b3d056d9d186b8f594288b3c637223959073d3a1ba4011f6b50db4b4b43d56e6d63880e40c94e3fdfccd215 WHIRLPOOL a75b8dd06a6996d956f6298ea37531077cf5bce92d1271a8cb5595bcb2bb98105183485ddf9ef471678c54a4adb182370b83eac52f6083e26d96d5f6142c392b
-EBUILD armyops-250.ebuild 1726 SHA256 1ce398cf1f99e904acc232de0e4882dbccaae4d77fef3ee96be8a6ed66fc7a17 SHA512 1e74958004f7be7971073030786975a9ab32cae5e6d375aa38834c1ffa1888b2cd67bb91f04a95e9d5e7a288908cd962557c3043611a7a2c9bfea44bb8788c20 WHIRLPOOL 2753a570e89ccf1e7cdcbfaadd756db7daad90d20217e70ac9780fd5fa210c0dc324ac9433e2026410e0c6649a4f8e38b425b01197f9ee2b10cb1965538de658
+DIST armyops250-linux.run 813453963 BLAKE2B 18bcb681d63981fef223b2705e504bd59b921bd5430c8689e528f4e1e5ccf623f22045ce554d75bdff21bfd449f4736cd16a967b6b1d0efc8052352dc61b7e5c SHA512 ed4295c0d4756ae9df76b78620922752e9edeaf41b3d056d9d186b8f594288b3c637223959073d3a1ba4011f6b50db4b4b43d56e6d63880e40c94e3fdfccd215
+EBUILD armyops-250.ebuild 1717 BLAKE2B c6a32a26129dbc777bb5d132599c14bd94402995b051034dcf2a95b738401df98e89e55b54987bef7491fe983db18b53ae34f0b734510667a1d5fa79a400f818 SHA512 9e5e8b9247b35b2cc6ec057b7df75517b4ab5d30f486af96a459f40d9329c4e998d4a0198cb74d2e613bb29c661e4ea273c53d48c62d259436b49e763709b027
diff --git a/games-fps/armyops/armyops-250.ebuild b/games-fps/armyops/armyops-250.ebuild
index 7ed09ff..bc4ebf3 100644
--- a/games-fps/armyops/armyops-250.ebuild
+++ b/games-fps/armyops/armyops-250.ebuild
@@ -4,9 +4,9 @@
 
 inherit eutils unpacker games
 
-DESCRIPTION="military simulations by the U.S. Army to provide civilians with insights on soldiering"
+DESCRIPTION="Military simulations by the U.S. Army to provide insights on soldiering"
 HOMEPAGE="http://www.americasarmy.com/"
-SRC_URI="mirror://3dgamers/${PN/-/}/${PN}${PV}-linux.run"
+SRC_URI="mirror://sourceforge/distrobuild/${PN}${PV}-linux.run"
 
 LICENSE="Army-EULA"
 SLOT="0"
diff --git a/games-kids/scratch/Manifest b/games-kids/scratch/Manifest
index 0e92cb1..55cee7e 100644
--- a/games-kids/scratch/Manifest
+++ b/games-kids/scratch/Manifest
@@ -1,2 +1,2 @@
 DIST scratch-1.4.0.7.src.tar.gz 47617852 BLAKE2B feb4ba25dce3ac5f82974a0b22b95ff22b543f1bdb6362cc53bc16b54b6082fada6783734b38afadde340a097dc8758aa9ab061b050b4f9d4c71342fd1574b40 SHA512 a5dba21855ad2d087e0d76066ee70c6f36c67c66deccb6eb001249bc25391b0f9036d9fd2ab8383ef54c414e743dff23e9e52ab1c73dd7200f36d7d47c62f562
-EBUILD scratch-1.4.0.7.ebuild 2389 BLAKE2B c7fdc5be7218f410d51a10ce6a91335da720117ef1f7c8c9b3260f9c24f1fa9d67305acbeacd297f775a07170ebab71b28f8f54a0182ad174658060d77d6dbb5 SHA512 02dea76331649d4f40f76ab1f3b987f0385de4cdee562683083e69ebec4d4754f9cc571437ee5ddbe9ae815a0678034600ce68847cd8c3461798aece3ca1141f
+EBUILD scratch-1.4.0.7.ebuild 2387 BLAKE2B 8ea5b5f9c44f69c1d4395447928aa8e3df8a290cc04c6e4b52c68ec69af56cce1c205a276dc1edf591b9c9241f5bae903702d32eab103bff37cc61852b8eebf6 SHA512 27a6277a151107c81b6dc0f5e8d99f44edf1851d34bf96b88f52c48a66afca2d7886f27e247a96ed31d37b67df3d8ca7a27009f11f7c0cd4e75519443950cb26
diff --git a/games-kids/scratch/scratch-1.4.0.7.ebuild b/games-kids/scratch/scratch-1.4.0.7.ebuild
index e8b8733..2b16823 100644
--- a/games-kids/scratch/scratch-1.4.0.7.ebuild
+++ b/games-kids/scratch/scratch-1.4.0.7.ebuild
@@ -90,13 +90,13 @@ pkg_preinst() {
 
 pkg_postinst() {
 	xdg_mimeinfo_database_update
-	xdg_desktop_database_update 
+	xdg_desktop_database_update
 	gnome2_icon_cache_update
 
 }
 
 pkg_postrm() {
 	xdg_mimeinfo_database_update
-	xdg_desktop_database_update 
+	xdg_desktop_database_update
 	gnome2_icon_cache_update
 }
diff --git a/mail-filter/greyfix/Manifest b/mail-filter/greyfix/Manifest
index fea6e5b..c62bad7 100644
--- a/mail-filter/greyfix/Manifest
+++ b/mail-filter/greyfix/Manifest
@@ -1,2 +1,2 @@
-DIST greyfix-0.4.0.tar.gz 98051 SHA256 26013edce3a38d586282bfc22eb91bd22df54e3558ea1b3dae54d3e7a769e4fe SHA512 2ad40a5e608b6b44a82bacad434523e0a0b3bb1b1669dc488aaa9c4b687152c0492262b7965ab637243aa6048318dac263a2116bcd3baf6cb7cb271df3d72686 WHIRLPOOL 83f57d94142ed18d11707a54cdfc1c4f3e22eca1748813f83a5027a648015345c45c2cf5b0c6cf7ca0186755cf5201fb9ed2cf0a38357c86f970d56b7af12087
-EBUILD greyfix-0.4.0.ebuild 374 SHA256 e1bd882897a837ee6f941d2c8280f59a60e66e11cb9aeb12e459d7f0914dbd0e SHA512 0ed4e81e426c083ac870f605c49bb7cba6329f220814cd4de6bfc40485deb42d213749e23ed61e7cddd279aba3a4a72747524dc79fcc8d290fc3a25cde3d3ee2 WHIRLPOOL fe83b965f7f0e42582d8026f88b89f253f38e6271d8e8dd4719a13d350eabc5b9a273495347d6fb9c757746e0775ef8600586166ef9ccacf2968fc618a13b0dc
+DIST greyfix-0.4.0.tar.gz 98051 BLAKE2B 9839314ab0e462df2aa3e4ffe04c076a64b29f5a483ae38efcbaa1642a72102827cb4ae2926e0c5f221af2b61e7ae12704871457eb23d7556f82c8c82a8c8b6d SHA512 2ad40a5e608b6b44a82bacad434523e0a0b3bb1b1669dc488aaa9c4b687152c0492262b7965ab637243aa6048318dac263a2116bcd3baf6cb7cb271df3d72686
+EBUILD greyfix-0.4.0.ebuild 374 BLAKE2B 30c68c77d941c4d5e18ae141e1a2ee0fd987ad5f9f0e0d8b1565f95f72b8740de3641e3adff905be150f658453b2e8fd0df5c92a212bcf5b08aa6b74a005ec01 SHA512 e60615b8548f8013ae14ac1bb49ba3595894b38ab03a8a5ef704983936bbdfe196b50e23c0ce6daa593fdda7b40b0e532e49b0855a4f8b966d2a6fe8ac2f2ac4
diff --git a/mail-filter/greyfix/greyfix-0.4.0.ebuild b/mail-filter/greyfix/greyfix-0.4.0.ebuild
index b401b41..b8f5d42 100644
--- a/mail-filter/greyfix/greyfix-0.4.0.ebuild
+++ b/mail-filter/greyfix/greyfix-0.4.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.kim-minh.com/pub/greyfix/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 amd64"
+KEYWORDS="amd64 x86"
 IUSE="doc"
 
 RDEPEND="sys-libs/db"
diff --git a/media-gfx/scangearmp2/Manifest b/media-gfx/scangearmp2/Manifest
index 68e72aa..d5c224b 100644
--- a/media-gfx/scangearmp2/Manifest
+++ b/media-gfx/scangearmp2/Manifest
@@ -1,2 +1,2 @@
 AUX scangearmp2.desktop 252 BLAKE2B 7e2fbf2de587390bcb23c5b5b9cd36f27fa78e6eb3dba3a0128ffe4e8d4e0d607824506d81b0f115e0d2096025d8639c261eb0f7f27388aa39d733700a1f7edb SHA512 71233acc250948f894fad789ce8286486f9dc8ce2c5aca31faf0533a84915076a2a77e769b16c1564dbbd45d79c67eb666aa5101c2844b4d14858e3594ac6e71
-EBUILD scangearmp2-9999.ebuild 2356 BLAKE2B c728c842d864e281339936729ffedfb764511a9995ab6c9a7c484bc34317c1355a0738dfa561b5500e10e9ce8f0be44ca85a2cd8d55d688549d067af03a377a4 SHA512 8ef9fc53714922c8f78c5c7521af10ee9d01ea038c7e8dc14554ae2a8f285322b1e00d5ba79628a35fea1518666200183aba62344f2656a1630710d7677ca591
+EBUILD scangearmp2-9999.ebuild 2361 BLAKE2B 4cacf2a19209c00db2948151675e60dd68a0c9b217acdcb007653f41c9e4eac3831a1a740e0bfad5a049d6911f39c9c7bb8f9d1d2245df310f5849e985f4fb90 SHA512 4e5035f7ad4043263ff0694ed89b8b4eb861575a488750f96218f8b1ab77ecfcf87282ae7a57c1d5e30f72be6d1f525078e03d0fac4c74b0167a0cdb9750ce84
diff --git a/media-gfx/scangearmp2/scangearmp2-9999.ebuild b/media-gfx/scangearmp2/scangearmp2-9999.ebuild
index 68afcee..593a77c 100644
--- a/media-gfx/scangearmp2/scangearmp2-9999.ebuild
+++ b/media-gfx/scangearmp2/scangearmp2-9999.ebuild
@@ -11,20 +11,21 @@ HOMEPAGE="http://support-au.canon.com.au/contents/AU/EN/0100303302.html"
 RESTRICT="nomirror confcache"
 
 if [[ ${PV} == 9999* ]]; then
-    inherit git-r3
-    EGIT_REPO_URI="https://github.com/Ordissimo/${PN}.git"
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Ordissimo/${PN}.git"
 	S="${WORKDIR}/${P}"
 else
-    SRC_URI="http://gdlp01.c-wss.com/gds/3/0100009933/01/${PN}-source-${PV}-1.tar.gz"
+	SRC_URI="http://gdlp01.c-wss.com/gds/3/0100009933/01/${PN}-source-${PV}-1.tar.gz"
 	S="${WORKDIR}/${PN}-source-${PV}-1"
 fi
 
-LICENSE="UNKNOWN" # GPL-2 source and proprietary binaries 
+LICENSE="UNKNOWN" # GPL-2 source and proprietary binaries
 
 SLOT="2"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="+sane usb"
-DEPEND=">=dev-libs/libusb-1.0.0
+DEPEND="
+	virtual/libusb:1
 	>=x11-libs/gtk+-2.16.0"
 
 src_prepare() {
@@ -54,7 +55,7 @@ src_compile() {
 
 src_install() {
 	pushd ${PN}
-	make DESTDIR=${D} install || die "Couldn't make install ${PN}"
+	make DESTDIR="${D}" install || die "Couldn't make install ${PN}"
 	popd
 	domenu "${FILESDIR}"/${PN}.desktop
 
@@ -63,22 +64,22 @@ src_install() {
 
 	dodir ${_libdir}
 	if use x86; then
-		cp -a com/libs_bin32/* ${D}${_libdir}
+		cp -a com/libs_bin32/* "${D}${_libdir}"
 	else
-		cp -a com/libs_bin64/* ${D}${_libdir}
+		cp -a com/libs_bin64/* "${D}${_libdir}"
 	fi
 
 	# usb
 	if use usb; then
-		install -D -m 644 scangearmp2/etc/80-canon_mfp2.rules ${D}${_udevdir}/80-canon_mfp2.rules
+		install -D -m 644 scangearmp2/etc/80-canon_mfp2.rules "${D}${_udevdir}"/80-canon_mfp2.rules
 	fi
 	# sane
 	if use sane; then
-		install -D -m 755 scangearmp2/src/.libs/libsane-canon_pixma.so.1.0.0 ${D}${_libdir}/sane/libsane-canon_pixma.so.1.0.0
-		ln -sf ${_libdir}/sane/libsane-canon_pixma.so.1.0.0 ${D}${_libdir}/sane/libsane-canon_pixma.so.1
-		ln -sf ${_libdir}/sane/libsane-canon_pixma.so.1.0.0 ${D}${_libdir}/sane/libsane-canon_pixma.so
+		install -D -m 755 scangearmp2/src/.libs/libsane-canon_pixma.so.1.0.0 "${D}${_libdir}"/sane/libsane-canon_pixma.so.1.0.0
+		ln -sf "${_libdir}"/sane/libsane-canon_pixma.so.1.0.0 "${D}${_libdir}"/sane/libsane-canon_pixma.so.1
+		ln -sf "${_libdir}"/sane/libsane-canon_pixma.so.1.0.0 "${D}${_libdir}"/sane/libsane-canon_pixma.so
 		install -d ${D}/etc/sane.d/dll.d
-		echo canon_pixma > ${D}/etc/sane.d/dll.d/canon_pixma.conf
+		echo canon_pixma > "${D}"/etc/sane.d/dll.d/canon_pixma.conf
 	fi
 }
 
diff --git a/media-tv/sopcast/Manifest b/media-tv/sopcast/Manifest
index 579fc7c..71704ef 100644
--- a/media-tv/sopcast/Manifest
+++ b/media-tv/sopcast/Manifest
@@ -1,2 +1,2 @@
-DIST sp-auth.tgz 345711 SHA256 5ca407429dd54b0c195e05f06b33f79730a5dfdb8e7b14bf96b384f9ae8391d9 SHA512 8460c51eb2fb4e8f00595d813f8dcf910154f9d9fc12d0bebc3b71be7f263b4987605391e61a94fb0118508a768ebd2732d1618f7cc6fe71d0e8adfc15d4c096 WHIRLPOOL 2cfe4c531fb6ca050ae659f665175490e661e22adfcfe3fc839b2cecbba3300e3553f3d5c0dfb7ba75d2757152effa78d0e677f9217199a5bbe6aa69f774346b
-EBUILD sopcast-3.2.6.ebuild 1035 SHA256 b91b2f2910189cf7590c925e86232b6a1fdbf6ebbf5024a8ad7f947018ec4124 SHA512 daeb0899f154cdd4a9a163bf9c705e912a0f3fcc96c852c51150b18b344f873c6fefb4953bc562622970ce3229692e3877fd954625266cf3f4a559a2a8c6dd9b WHIRLPOOL 2c4682167afd7a86044a32844e9514f97e7e0c0ee3a5f58f62f6bd607aae8806cd0ac476717023d8f1d3fa98a1ae198952ae672499e8bab5c9d50248d915e5d1
+DIST sp-auth.tgz 345711 BLAKE2B d647a188738f51951f406d5ef435cba97ad7bee542758a8aee86b2f4d632bede22c484595d4ffa58d3b519794d3430d70ef697ec26dc7ae6af11ee79cf14ab57 SHA512 8460c51eb2fb4e8f00595d813f8dcf910154f9d9fc12d0bebc3b71be7f263b4987605391e61a94fb0118508a768ebd2732d1618f7cc6fe71d0e8adfc15d4c096
+EBUILD sopcast-3.2.6.ebuild 1035 BLAKE2B 7597a000a6719027b49bbb1c2991bc770e4d1241b9cb9052e30bad23faf20b0583b87a83c579c6758777c8b586a882cda472dab1c7df957940e1255b07bf932d SHA512 daeb0899f154cdd4a9a163bf9c705e912a0f3fcc96c852c51150b18b344f873c6fefb4953bc562622970ce3229692e3877fd954625266cf3f4a559a2a8c6dd9b
diff --git a/net-mail/sympa/Manifest b/net-mail/sympa/Manifest
index b1f8a46..ba612f9 100644
--- a/net-mail/sympa/Manifest
+++ b/net-mail/sympa/Manifest
@@ -5,4 +5,4 @@ AUX sympa-lighttpd.conf 372 BLAKE2B 701e0bc7ed328257a62d29eb5899da255a5102e8fc1c
 AUX sympa-lighttpd_soap.conf 382 BLAKE2B 08456e6603a4a2f960a818c5ab5374d03c15e5cc30aae83ad6602758d7cad857fd0b2a1995f23c37b17f3046a2f45f57e14f9b5cf7742fde0b4c23c86798d5b2 SHA512 1aac44ca4c410d90e384ac092cfbb2ead8a144ed472998266ccc9b1411e6ce6d4c02edbf46496c14585c65cfbf23cf8276901df2d54895bdf4edd3cecf447f2d
 AUX sympa-nginx.conf 252 BLAKE2B 51471cdc0151a10d86b396bb7d3ecca51508d53fbcce91804c2ffcfefd6ee9170502d2cc36519eb66570371150fafa81ae7ed991d38ba901e1c4248f806d06e5 SHA512 076900022f1d6c03e26301ed15514dc922a9ba9718c8a344722ad755c5caf0277daae944959f061445f58ef163d6d243670fb97b92f06e6370a1f8621762221f
 DIST sympa-6.2.48.tar.gz 12768937 BLAKE2B 188189eac2712bdab4673ca09e4a4c37d035906524a0a73d7eac74e517906b3e63c588af4636c31c3dd861850fa0e452474ff8873f454d3dfad650c05b99afb0 SHA512 b1ff034fc9a69edae266741e3b868555040bc1c4cdba9bae901729cd23b3f310895d0a9a5fe2119373880f1b65c25cd14e6753d93ad4ff15adf377f51cc25719
-EBUILD sympa-6.2.48.ebuild 8150 BLAKE2B 6a4f107bf593f5f269bbc60609155715e5909f62df72b9ca5651b36592fddd50f8978470d01791d2c651e0647386766136ad341896a5379e166ce1f7ecd86765 SHA512 49c584efdfa7531872deff018565b75147e18bdb98eb454568f3b2ebfad2100595b8b7166488177e6d0624ce64a5e5dba0a7523721beeedf8899f6b7dcc69e70
+EBUILD sympa-6.2.48.ebuild 8133 BLAKE2B 43cd7aa66232550ba70452cc43876da9f6ab7459ab0162d356de0def262649b55a5491aaaf00a55e503b364ceb25362ce2f4bdfd012cbcee212010e8a49c2dea SHA512 192d61d2f187c678531042cb88d391f560973a01681c2dd37eaee4370ae3a8ccaf105b21fd88b1dec48713712942dfda95b28669a99c12aee3dff72f2a9b2500
diff --git a/net-mail/sympa/sympa-6.2.48.ebuild b/net-mail/sympa/sympa-6.2.48.ebuild
index 4f61e59..652623f 100644
--- a/net-mail/sympa/sympa-6.2.48.ebuild
+++ b/net-mail/sympa/sympa-6.2.48.ebuild
@@ -11,13 +11,13 @@ SYMPA_RELEASE="$(get_version_component_range 3-)"
 
 if [[ ${SYMPA_VERSION} == "9999" ]] ; then
 	# Development version
-    SRC_URI=""
-    EGIT_REPO_URI="https://github.com/sympa-community/sympa"
-    inherit git-r3
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/sympa-community/sympa"
+	inherit git-r3
 elif [[ ${SYMPA_RELEASE} == "9999" ]] ; then
 	# Latest stable
 	EGIT_BRANCH="sympa-${SYMPA_VERSION}"
-    EGIT_REPO_URI="https://github.com/sympa-community/sympa"
+	EGIT_REPO_URI="https://github.com/sympa-community/sympa"
 	inherit git-r3
 else
 	# Release
@@ -29,7 +29,7 @@ HOMEPAGE="http://www.sympa.org/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="clamav -compat dkim fastcgi ldap mysql nls postgres soap sqlite ssl"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
@@ -110,9 +110,9 @@ src_unpack() {
 		subversion_src_unpack
 	else
 		unpack ${A}
-		cd ${S}
+		cd "${S}"
 	fi
-	cd ${S}
+	cd "${S}"
 	# Override defaults for certain options, so
 	# Sympa won't complain about conflicting paths
 	sed -i -e "/'queuebounce'/,/}/ s|'/bounce'|'/qbounce'|" src/lib/Sympa/ConfDef.pm
@@ -170,7 +170,7 @@ src_install() {
 	fperms g+s /usr/libexec/sympa/{bouncequeue,familyqueue,queue}
 
 	# Docs
-	dodoc AUTHORS.md CONTRIBUTING.md INSTALL.md NEWS.md README.md COPYING etc_README
+	dodoc AUTHORS.md CONTRIBUTING.md INSTALL.md NEWS.md README.md etc_README
 
 	# Startup script
 	newinitd "${FILESDIR}/${PN}-${SYMPA_VERSION}.initd" "${PN}"
@@ -180,7 +180,7 @@ src_install() {
 		sed -i -r 's:^(\s*use_fast_cgi\s*).*:\11:' "${D}/etc/sympa/sympa.conf"
 	else
 		sed -i -r 's:^(\s*use_fast_cgi\s*).*:\10:' "${D}/etc/sympa/sympa.conf"
-	fi	
+	fi
 	# Update antivirus config
 	if use clamav; then
 		sed -i -r \
diff --git a/net-misc/kyototycoon/Manifest b/net-misc/kyototycoon/Manifest
index 38531a3..77b5408 100644
--- a/net-misc/kyototycoon/Manifest
+++ b/net-misc/kyototycoon/Manifest
@@ -1,6 +1,6 @@
-AUX fix_compile.patch 276 SHA256 40e872584300e01cbceea12d8753e7c8f7d58c2e263a5c59d00b1bb9bc50ab42 SHA512 23b5176a9ff4c7d829ce27e64da5add091cf5931d37b5459f85638202a6ad10009e419b6e2927df4e8b643707c6d2033df80b70f6ce5bf18842cc43d1b7c6bbe WHIRLPOOL 115fa56b1e4a157834b1655ff9d779e991b2f7288dd60688fe4717c3debb58de2257875f9a1a8cf0a5b56186a7c6e39ffc8e3422d06d7fb0db4a38efa0bfca1b
-AUX kyototycoon.confd 678 SHA256 64f037c0dba8b3eb8ff38507c67bcc2d0712211e065f89a6f43381a68b4b1d75 SHA512 6348278bd4f726af23cdfb5c22b80ad81bcbe5bc55745f2786970c25e0b58cd0a5a8be96219b2037d4f06e333676380b4222f573f7ca8dc313e35c7eb73622b3 WHIRLPOOL b78b74b8f087089b29bd0cf36b119b5ba19a544e3540c6d155b60ed43cc4144bea96fb5f4ac6c7bce709a741de19c32de6898c3a8ea35536a5870c1179dfd8d4
-AUX kyototycoon.initd 816 SHA256 4a3ef5e01c8e84a6f95b127a425cd8cf049bfdf73e5a27f6b75f83b50d768ad1 SHA512 548ad3a6098ed4d01197be8579633863bfa86e39511bd15ef262e9feeae02cd69bfbc6438b0a554946fd99ad345da11033b7f86a7391c715630d0aa7087ab907 WHIRLPOOL da00551cb48c499e164fbc9ac409b61bcb6a1c62497bbf7251da098a3edec5d21db2504afbde1429b593a00f7c9cb1077fe94e4162c66ce72a574a7dab86f312
-AUX remove_docinst.patch 419 SHA256 d0346e69dac5762f1067768da96f5173b5008030ef46b67610ec165dbdb585b4 SHA512 eca5e76c950b527fb9e9d2ac7775ff6cb2288f17123206fa061a1ff7a2e95da6dd79fb602a71799ac84732df67e561220c6058ad034e98be98e1e20054b220b4 WHIRLPOOL 3a177c09662c8041d1236d8adb55f0396a8606a0c9ff5c2d5232de72326e825197aed324e18b838ef0e71ffd25dfda5647db8966c670f80f9844f698343ba947
-DIST kyototycoon-0.9.56.tar.gz 503581 SHA256 553e4ea83237d9153cc5e17881092cefe0b224687f7ebcc406b061b2f31c75c6 SHA512 7722297287194d67dfaae9e7595439274d7639d139a954eb8dee4a5e6d019e8a1da3773b538e80244eb97b867f0b6d0db592fa66fdbb2bd8d9358a6acd82cd4c WHIRLPOOL 9971e528b6db2caff5b1d0dfd91ae14b25dd8b4a2258c39032f28905edd76d32d2b2b3adba565d68f254cfc0b3c69a85e258963cf08865cb7f8f991ae9cf7d67
-EBUILD kyototycoon-0.9.56-r1.ebuild 1189 SHA256 0335b4af603ec0d6b9245515acda3012160c711889399e0145977ec73c41237c SHA512 4e58b7eb0a6714623e7b90ce1816e6913cb5d8dce8076424da1650cbd59b837d3a0357de7c523414d48f2274a2bed0fd3fdffaeaa8e064804c1a6d5c282d464b WHIRLPOOL d957491bd0c717f3561ce77ff8b87e4540bf35c30ba6e23e856b1151a1d4e226be7ca592a987537967a6765f0ff24b46b95df97f15352755f49a61b021b03ae1
+AUX fix_compile.patch 276 BLAKE2B 5221ac7161a1809a50ed7f50a9c5bd8fd43600b4da5cbeeb8305b4d5b1418efd6783ca48eeddcbe265bc005f7b2b9e8f4b57a8db06b32799c11e5c7d5b88bd0e SHA512 23b5176a9ff4c7d829ce27e64da5add091cf5931d37b5459f85638202a6ad10009e419b6e2927df4e8b643707c6d2033df80b70f6ce5bf18842cc43d1b7c6bbe
+AUX kyototycoon.confd 678 BLAKE2B 2c76d34ee18892290c0e2a6980747eb8be9eff2170c0dd451f4cee0aae7a7a5c34c9d2905664afd17458271fd27bdbb0a72cba5571882061b76a621cb114b084 SHA512 6348278bd4f726af23cdfb5c22b80ad81bcbe5bc55745f2786970c25e0b58cd0a5a8be96219b2037d4f06e333676380b4222f573f7ca8dc313e35c7eb73622b3
+AUX kyototycoon.initd 816 BLAKE2B 3a06d37b46d66aa8d6bb989255b367a097ffe8f4d3a3c5eafd22ac83196a64ce4af7ac3489ec2b7a5acbad75edd1e40c0d61124a8386e0efa4249e5436943c38 SHA512 548ad3a6098ed4d01197be8579633863bfa86e39511bd15ef262e9feeae02cd69bfbc6438b0a554946fd99ad345da11033b7f86a7391c715630d0aa7087ab907
+AUX remove_docinst.patch 419 BLAKE2B 0e65eb9b32e464e61d81dbb6ff85c72346a010bcb54a0e17f91ce20934655d712b78c61456657c3e1302f751e3e61736a15300ff9c9649b6ff74bf5a09fd7e65 SHA512 eca5e76c950b527fb9e9d2ac7775ff6cb2288f17123206fa061a1ff7a2e95da6dd79fb602a71799ac84732df67e561220c6058ad034e98be98e1e20054b220b4
+DIST kyototycoon-0.9.56.tar.gz 503581 BLAKE2B 7009e66471f4d7dc9d473e09dd57e29e0d9051cd437a6d38cfbaeaf0e2c2d51cbc3c673eabb1d41c4451023cb41255e08faa3c7acbab07693dcd5a312711dec2 SHA512 7722297287194d67dfaae9e7595439274d7639d139a954eb8dee4a5e6d019e8a1da3773b538e80244eb97b867f0b6d0db592fa66fdbb2bd8d9358a6acd82cd4c
+EBUILD kyototycoon-0.9.56-r1.ebuild 1144 BLAKE2B 4ee041691dfef0c8f7aa44a0c241ab3a4fcd68f92d70e88a83d9e11c7119aad08fe7499e67f1d8630fa71e6b4601dbdc0e99bb895c6a47f6b97257ec564b3ef3 SHA512 86a2899d0d54c3085d5b01dca7ee3fa0b596c6bc4e1bd379ba4a00635f4660f98f279e72f0e87a637d90c8b6917238b3edc05d28db6c335c68c2d9b66f2cc69c
diff --git a/net-misc/kyototycoon/kyototycoon-0.9.56-r1.ebuild b/net-misc/kyototycoon/kyototycoon-0.9.56-r1.ebuild
index 8dbb384..b3bcb0c 100644
--- a/net-misc/kyototycoon/kyototycoon-0.9.56-r1.ebuild
+++ b/net-misc/kyototycoon/kyototycoon-0.9.56-r1.ebuild
@@ -20,6 +20,10 @@ DEPEND=">=dev-db/kyotocabinet-1.2.65
 	app-arch/bzip2
 	lua? ( dev-lang/lua )"
 RDEPEND="${DEPEND}"
+PATCHES=(
+	"${FILESDIR}/remove_docinst.patch"
+	"${FILESDIR}/fix_compile.patch"
+)
 
 pkg_setup() {
 	if use !prefix ; then
@@ -28,12 +32,6 @@ pkg_setup() {
 	fi
 }
 
-src_prepare() {
-	epatch "${FILESDIR}/remove_docinst.patch"
-    epatch "${FILESDIR}/fix_compile.patch"
-	epatch_user
-}
-
 src_configure() {
 	econf \
 		$(use_enable debug) \
@@ -61,7 +59,7 @@ src_install() {
 		dohtml -r doc/*
 	fi
 
-	dodoc ChangeLog COPYING README
+	dodoc ChangeLog README
 
 	newinitd "${FILESDIR}/${PN}.initd" ${PN}
 	newconfd "${FILESDIR}/${PN}.confd" ${PN}
diff --git a/www-apps/gallery/Manifest b/www-apps/gallery/Manifest
index 7a5e9d7..dc1316a 100644
--- a/www-apps/gallery/Manifest
+++ b/www-apps/gallery/Manifest
@@ -1,4 +1,4 @@
-AUX postinstall-en2.txt 912 SHA256 ae1b0727e11518abf12616cd11cb82e6648a026769d9e4854ba6afb6d972c30b SHA512 fc66ccea1ef358b75ef0710a9a6b32e3b363d6588d70b69987041f46f5d04013d36113b3fca426f6a38d4d94e0ccfba637e56f91e41f62c492a8ad1fda64e408 WHIRLPOOL 8dfb2193c1ff6c500581950eb77afc1a41a1a5f1476fb0bb9a9180ea994119e20a5de1a1f7c9e1f5b89618ee130e4429ed1d02cb28acf7525dcd9155f5bec4fa
-DIST gallery-2.3.2-full.tar.gz 14569436 SHA256 810ed73c456a3299ba50d9fcca6725d0654641c078c9d7c278d4875bad2af3fc SHA512 e4ee2007018ecdc6df2cb715798f57a94d2fcf5618a06812d704b45ba398cc9f52465d4ea1d830f2b99611c85d8853d7639059b3761f3b5d77ccc16d1e4ae0ad WHIRLPOOL 4591f8d69d173f01108fec5c21c7bde3f519c44177ef268866031e0c1cc021c452415b73950011e2f1cd46ee314d2741260bcd4ba80bdee56ca5b119a2452975
-EBUILD gallery-2.3.2.9999.ebuild 2000 SHA256 50460f55a787b63dac92ff8e22a4c36643d2407f892185459cdb4fa08b04b6cf SHA512 2f57bfd05d513005ac4978e23cc188dd38586180533c59038e6ff43c4d63f850154b14ab96bb68e1f64a446cc8c89979e605de8f673deecbca08d52aceb64bac WHIRLPOOL c1db0e2e8876f08f53c75a153f8bc7ea94354ebccee7341c66561c958003bfd9b2b9170ebac61f796591615cea1e7ed99f7c7a6447ad848a4162ba6ba347560e
-EBUILD gallery-2.3.2.ebuild 1987 SHA256 d677a5504b6a52f9693a12a4f47bec73eedc555e50381052cc295867fe5d2cba SHA512 8d74bc62d7e7c08c2946fa785521e96300b796f203d6f5ea68048e6a635cd333022e52a466cac7a88e1a49e2026fc0793de862860c56fd79e634bdcf494d96de WHIRLPOOL dc156c0efac7db16eda3b106e8a5bb706adb7c080656ad77eab6aef4fbd0d7bc76437560ec2b1b3508a7fe4ef069b502e741f7e7de0ca0b3f1ca89f933fc19fe
+AUX postinstall-en2.txt 912 BLAKE2B fab025e4bc66a7e80b6f37f812c85bf235be55d364ece3b21a3318bd07cde75621613856b44e919768a32c05b1f5ff8139be55fdd475a5eda69399e14c8eb022 SHA512 fc66ccea1ef358b75ef0710a9a6b32e3b363d6588d70b69987041f46f5d04013d36113b3fca426f6a38d4d94e0ccfba637e56f91e41f62c492a8ad1fda64e408
+DIST gallery-2.3.2-full.tar.gz 14569436 BLAKE2B f611c925b30da2a2507674d6ed606c2856c72c62ec41b1528cab4eff5527a18e4c61268dac95907c90c7391f99ac08f51a755781848bb7a1ff668ed17fd30f65 SHA512 e4ee2007018ecdc6df2cb715798f57a94d2fcf5618a06812d704b45ba398cc9f52465d4ea1d830f2b99611c85d8853d7639059b3761f3b5d77ccc16d1e4ae0ad
+EBUILD gallery-2.3.2.9999.ebuild 1970 BLAKE2B 478f4932298a01a1b4809c921cd7dc64fc7ef706bc42772ae0da87b543812e647f75de108aa8239dc047c2c3af9211dcd9aa320c24453145f42a1ccaf7b561dd SHA512 1032e0cc8290da1120b4809abb74c375d3492fcfc2ee42ca6b7a173293712c18bfa0433e80902935c94b7cb0cea9be4a18c1d339465d0c7051e6394329820e35
+EBUILD gallery-2.3.2.ebuild 1981 BLAKE2B 19e4f25ed67f79b35e57f66712cedaadd637ef0b6d245827f7890fba5a3a4462b68620f6ad68dfd27d71e8ccc8b27822f2a4f9e1282427906fb09805b31df011 SHA512 97d1f705c9e7f9cc34080c17bf9ef62968d71d1f86ee20bfc59f8c1548338afdbdcb6f4ee3416e4305b6ee249d5220c2dd7301004472bbf4a6782fdb04150bb8
diff --git a/www-apps/gallery/gallery-2.3.2.9999.ebuild b/www-apps/gallery/gallery-2.3.2.9999.ebuild
index 06cb7ab..f51cc39 100644
--- a/www-apps/gallery/gallery-2.3.2.9999.ebuild
+++ b/www-apps/gallery/gallery-2.3.2.9999.ebuild
@@ -14,15 +14,15 @@ IUSE="ffmpeg +gd imagemagick +mysql netpbm postgres raw sqlite unzip zip"
 
 case ${PV} in
 *.9999)
-    SRC_URI=""
-    EGIT_REPO_URI="https://github.com/gregstoll/gallery2"
-    inherit git-r3
-    ;;
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/gregstoll/gallery2"
+	inherit git-r3
+	;;
 *)
-    KEYWORDS="amd64 hppa ppc ppc64 x86"
-    SRC_URI="mirror://sourceforge/${PN}/${P}-full.tar.gz"
-    S=${WORKDIR}/${PN}2
-    ;;
+	KEYWORDS="amd64 hppa ppc ppc64 x86"
+	SRC_URI="mirror://sourceforge/${PN}/${P}-full.tar.gz"
+	S=${WORKDIR}/${PN}2
+	;;
 esac
 
 RDEPEND="raw? ( media-gfx/dcraw )
@@ -37,8 +37,8 @@ RDEPEND="raw? ( media-gfx/dcraw )
 	virtual/httpd-php"
 
 REQUIRED_USE="
-    || ( gd imagemagick netpbm )
-    || ( mysql postgres sqlite )
+	|| ( gd imagemagick netpbm )
+	|| ( mysql postgres sqlite )
 "
 
 need_httpd_cgi
diff --git a/www-apps/gallery/gallery-2.3.2.ebuild b/www-apps/gallery/gallery-2.3.2.ebuild
index b8a5cea..fc602e0 100644
--- a/www-apps/gallery/gallery-2.3.2.ebuild
+++ b/www-apps/gallery/gallery-2.3.2.ebuild
@@ -26,8 +26,8 @@ RDEPEND="raw? ( media-gfx/dcraw )
 	virtual/httpd-php"
 
 REQUIRED_USE="
-    || ( gd imagemagick netpbm )
-    || ( mysql postgres sqlite )
+	|| ( gd imagemagick netpbm )
+	|| ( mysql postgres sqlite )
 "
 S=${WORKDIR}/${PN}2
 
diff --git a/x11-apps/blueproximity/Manifest b/x11-apps/blueproximity/Manifest
index c7dd2b2..22b652a 100644
--- a/x11-apps/blueproximity/Manifest
+++ b/x11-apps/blueproximity/Manifest
@@ -1,2 +1,2 @@
-DIST blueproximity-1.2.5.tar.gz 301090 SHA256 d1211d7898792a6db8448768884970c0d5efe683c6aa2ffc13e765f7d5fb62d9 SHA512 d72f3d1b15538a31d0eced6627fc0dc16c7404be0ddfb3bf6d13c9a0a1b089e9f001d50a26e1a1d4015e07b0013e78001b2b204f94ef21cd0de49b42550b5436 WHIRLPOOL 130f0d3240383d07611a17a483b489d33f833a40d755c4caacd5fd9e0bc362610e739d5c5be51b58dbe83c5b8d2d18454a236be35eecc862c962390399b7820b
-EBUILD blueproximity-1.2.5.ebuild 1340 SHA256 7fb364c12980c9a363230e6eb42c0c61a1e8f3bd2c5a5fd5aae0b961dbf06370 SHA512 e98d81030f926fd29eb6e64956e9670d8390c9ee267fa0629885975c88d30b604538c372311e166824425f4b9160ba463baea9bce10912614684604be4d5c27b WHIRLPOOL c80ecbbd2c9b8795b1facec19461d77fa8573cd206ccd0ed2ccd570bea13d63a8229b1af982633d0d68f37d87766a082c6fc7ca74a7fbf03ffd2fa231dc90b6a
+DIST blueproximity-1.2.5.tar.gz 301090 BLAKE2B 0642f381ff14e2461ec6430867ccaa8df3e397b83c2dfc559bc31477bc14edad63baa312326bb352cced8bd45be3b805d3f1a61e4af12fa2e4daeb53b200af01 SHA512 d72f3d1b15538a31d0eced6627fc0dc16c7404be0ddfb3bf6d13c9a0a1b089e9f001d50a26e1a1d4015e07b0013e78001b2b204f94ef21cd0de49b42550b5436
+EBUILD blueproximity-1.2.5.ebuild 1395 BLAKE2B 7f09485c5cb0c62692574849398c3a083d6a617e5ed4b7eac48e35bbba6c45801a268fc8269862a73ffe31ad9d00f6fd412c238651fc24cab6c56be360a76135 SHA512 1930c5c67c283a2065cc74074475c2996b13435a6ea5b5479cfee55e4b2a9655c52bfba74558328ee90db0b4c2a9a06bf862c6e15fbefda0bc0d7c808ed1f16f
diff --git a/x11-apps/blueproximity/blueproximity-1.2.5.ebuild b/x11-apps/blueproximity/blueproximity-1.2.5.ebuild
index 125e932..7d2f8ab 100644
--- a/x11-apps/blueproximity/blueproximity-1.2.5.ebuild
+++ b/x11-apps/blueproximity/blueproximity-1.2.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_COMPAT=( python2_7 )
 
 inherit eutils python-single-r1
 
@@ -20,13 +20,18 @@ SLOT="0"
 
 LICENSE="GPL-2"
 
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 
 DEPEND=""
-RDEPEND="dev-python/pygobject[${PYTHON_USEDEP}]
-	dev-python/configobj[${PYTHON_USEDEP}]
-	dev-python/pybluez[${PYTHON_USEDEP}]
-	>=dev-python/pygtk-2.0[${PYTHON_USEDEP}]"
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/pygobject[${PYTHON_MULTI_USEDEP}]
+		dev-python/configobj[${PYTHON_MULTI_USEDEP}]
+		dev-python/pybluez[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pygtk-2.0[${PYTHON_MULTI_USEDEP}]
+	')
+"
 
 S="${WORKDIR}/${P}.orig"
 
@@ -37,7 +42,6 @@ src_install() {
 	insinto "/usr/lib/${PN}"
 	doins blueproximity*
 	doins proximity*
-	dodoc COPYING
 	dodoc README
 	dodoc ChangeLog
 	doman doc/blueproximity.1
diff --git a/x11-wm/compiz/Manifest b/x11-wm/compiz/Manifest
index b4c8399..98b8c45 100644
--- a/x11-wm/compiz/Manifest
+++ b/x11-wm/compiz/Manifest
@@ -1,2 +1,2 @@
 AUX access_violation.patch 974 BLAKE2B 9b226e3d7255073bff22448f096fc19f743b97582b2e4de2725c7df84f0895bb63b7eee25d3b82f08090b19b5ea9c1179d57d1eaf994bfabc42e4e04e8f1ec33 SHA512 0d91b71ad9c2646745d91a8a6b3d9228a23dccb3971abf69094ca4f6b3055f92570f01eb6dda62acab8630c05cc9480e846b59bd3b6044a73b31510d72a8f800
-EBUILD compiz-9999.ebuild 3678 BLAKE2B 85c332bc19dc4f86667b57d3055c914d1349807c4b6a622a781c8fc8fb5d276e5d905fbaadbc107ba002bd0f28157652f7c056ab9b0238b2b81403e21ff1708e SHA512 180c9cc8793effbcc5316b2ffe36971bd9202546369432a24d53da6ff4e1ffdde58d46fdb533fee86694fa8b4de601274c3c605861da30e10a159a3004af880b
+EBUILD compiz-9999.ebuild 3605 BLAKE2B 4862e2c53d14a5e5e852a67b4167a585770d5e7cd8c04b2b816e20759a0beec9a63b39033bd7deacf10c7f99da54d696d03745309a06507a41446aabf7b6b51d SHA512 5bc4b0c07332dbef3e16989c35ee05a52bf0f7e3d8e6622e47b5915aa41fc4568fe5738bfbe27b6e3651a9460a6bd56829c437b110d402da8e3bceef78653390
diff --git a/x11-wm/compiz/compiz-9999.ebuild b/x11-wm/compiz/compiz-9999.ebuild
index 47a56ef..dfd28b6 100644
--- a/x11-wm/compiz/compiz-9999.ebuild
+++ b/x11-wm/compiz/compiz-9999.ebuild
@@ -6,9 +6,9 @@ PYTHON_COMPAT=( python3_{4,5,6} )
 inherit cmake-utils eutils gnome2-utils xdg-utils python-single-r1 toolchain-funcs
 
 if [[ ${PV} == 9999* ]]; then
-    inherit git-r3
-    EGIT_REPO_URI="https://git.launchpad.net/${PN}"
-    S="${WORKDIR}/${P}"
+	inherit git-r3
+	EGIT_REPO_URI="https://git.launchpad.net/${PN}"
+	S="${WORKDIR}/${P}"
 else
 	SRC_URI="http://launchpad.net/${PN}/${BRANCH}/${PV}/+download/${P}.tar.xz"
 fi
@@ -72,7 +72,7 @@ COMMONDEPEND="
 			x11-wm/metacity
 		)
 	)
-	kde? ( kde-base/kwin:4 )
+	kde? ( kde-plasma/kwin )
 	svg? (
 		gnome-base/librsvg:2
 		x11-libs/cairo
@@ -82,11 +82,8 @@ COMMONDEPEND="
 DEPEND="${COMMONDEPEND}
 	app-admin/chrpath
 	virtual/pkgconfig
-	x11-proto/damageproto
-	x11-proto/xineramaproto
 	test? (
 		dev-cpp/gtest
-		dev-cpp/gmock
 	)"
 
 RDEPEND="${COMMONDEPEND}