gentoo resync : 15.10.2017

14 files changed, 270 insertions, 198 deletions

diff --git a/app-admin/augeas/Manifest b/app-admin/augeas/Manifest
index 8d962a4e5999..705a9d1b1fe5 100644
--- a/app-admin/augeas/Manifest
+++ b/app-admin/augeas/Manifest
@@ -4,15 +4,9 @@ AUX augeas-0.10.0-test.patch 1991 SHA256 42fcbbc1c8dbbe5c5ac3d1e04bbcb3eccce460d
 AUX augeas-0.10.0-test2.patch 1713 SHA256 d8efe22028a65fc5346742fde4bf27550db06c43a030da83f7c2eada54cc0b0e SHA512 8c8b5d0e1d182a30db1cbb1c61a7594109e569dcb280433314eac4879ee6fc10bb415ecec1d10f7b0e85e5b0c1703774a16b9d4662e2b6c18767d94f37d60eb2 WHIRLPOOL 889923e71151c24b2742307bdead8bfa2c49f70689567028bb9b204c98883510ce046d432f9e7893f58db968d6c239f408b1c0fbca18eb7fdced898393a592dc
 AUX cve-2017-7555.patch 5771 SHA256 c82638220c1136000539db1e084abf10efd0d41e0d02a226e6b6bb8f5bbcce6e SHA512 209364d6d8af5b755f8675b2eff8fa8e240ec364fc97e7a4644f320aad94f64600120d3da7d67a7a4f243acace4a41d13b1dbccfbe0c2021853adb7f3949c8b4 WHIRLPOOL 7714fa4be323f5ff7c8b50fedb48c95bd9f10f2ad26d0480ff2a73eaa3785e206963cc3e44c2ba1207a6e05ddc18a85bd65ca68bc40ec5108510c5ed7f64a74d
 AUX cve-bunch-of-them-symlink.patch 2415 SHA256 4db27194c976fedec981d8db6129422ad03456d80026d4a707b7ebcf74af072e SHA512 a702cce3f448cef9ce42e56d3ce7e6ceb8c5054031e6b1a9465639b4462ab4c7427f826a2783e12e4dc90f2bc6896f473ffc0e4d8d37e6d55cdb0192315eddb1 WHIRLPOOL 2791834ba2eed688451983c4a2544198e81d1fdf16cd6a9fde811cbb075643e0b534006e06561c6125543db1dc00731bc297330c91e1e4dc0367318e96c2a188
-DIST augeas-1.7.0.tar.gz 2156168 SHA256 b9315575d07f7ba28ca2f9f60b4987dfe77b5970c98b59dc6ca7873fc4979763 SHA512 d2a5580ffa69c0229cfae85261cf7740b268ceac35f076aef6a7e8631497e5726530adfdb85f715ebb102f28af98861b4fa29d7e3eaa37a5dafff8eaf817befb WHIRLPOOL 29a8aca382592a4492e0d5153525fe26998729f1a7a482dede5275af712dce49ee08f700549dc8f96790ec6031a0a32e5017e059cf4feea0067f1424b80021d5
-DIST augeas-1.8.0.tar.gz 2164146 SHA256 515ce904138d99ff51d45ba7ed0d809bdee6c42d3bc538c8c820e010392d4cc5 SHA512 bc7b450b7ef20b7c5bac1b500c89569673a164d32e0f29b5ca100657d0100fcdbb14027d559e206b5ada2c389ac3641181a97cc0c5dcceb1ae1e9932b2decf2c WHIRLPOOL 5f5dffac092bc241bc81b853ce05dd57530aab54e83668007e67dd29ca95583d7dfaebae75f96a822d5231d6bfd16aca30dc17b5b4d7ee6c2096fb9b917a4536
 DIST augeas-1.8.1.tar.gz 2165325 SHA256 65cf75b5a573fee2a5c6c6e3c95cad05f0101e70d3f9db10d53f6cc5b11bc9f9 SHA512 80be6dc75e86e2a00c56cb668824ffbe54105b64fad64a2737d980c8ee5ba347a97ddd190a1c712bd07a768ed23a8d07b0eb676033b367632036a8e7f98c976b WHIRLPOOL 71955a1a42294021f69bb9715439b248f341d06b7c2d72a72537abe3f77c8e990453a12ee99ab3ba0c979ad6fd21ef5056c6e85dc8bc01a2e9c5405389030df0
 DIST augeas-1.9.0.tar.gz 2199534 SHA256 2b463d398cabc9b42747aa61d3e83ed6a93ce03d9074cf8e7a7bd3107a668343 SHA512 340aed78ac2df455770735b41f3c10a1cbe40f160e236a735d4580edf5b635afeaf7ddadc10e759e9197c4b233e98b3b6b94a3c2f072aa765c104d64371ce171 WHIRLPOOL 226262afff83c9e3421928b24d0ca067b9971f353d152a5de6fd74d8bdf30259acf63881fe761d4c538f36865c8dcd6679583c12649e2c4545374e30a226b568
-EBUILD augeas-1.7.0-r1.ebuild 1170 SHA256 0432c3bdfd73a440ce3873616a9d6a9d48a0687cfb1c75f1a0d866abc29f4faa SHA512 9062ded3c443b8dac190875bb5da2f4cc34f7ff0d1104a98c9099874a891e954eae42e09747cdde53ae7bd3af8a82090d4b3739405945e387d8ddd6621fb09df WHIRLPOOL 0493638832f0513c44c26727c0134285cbbbe106a9e57db4b8e4372159ad887dc4830b1eebc447715aa24257382bd642552c28deb589cd40bcae5965af6df1ce
-EBUILD augeas-1.7.0.ebuild 1115 SHA256 2761bed4c806366633eb5edee079a21b9418967b78701b5c11c2a3d6d0c8dcd9 SHA512 0e4dc7451ce05186ff17d922680663cde318714d0e5b41bd3e32d01c75cc58f8cb212a942fd5a415b447f4f9248e850f51a18a5033f05e44e1e85ac9c82ffd13 WHIRLPOOL c94314c26316db85e98e5698efcb16000052e1d243d7036e541de54875b92167a8ebeb2666cf5ad3580da56f1372ea809ded873519a72e9834d4ac3a86421b74
-EBUILD augeas-1.8.0-r1.ebuild 1037 SHA256 79964179da157f1a2e18f8b6c87b3a14644c750115a8dcd0abf684e7ed4b45a2 SHA512 74c1fa2664b4181b3dfbc09303e2d67a6a02e05583dd908b440671f16cd419641f1a4d7c0c21f076a1838c6ff1e5018af4a3eb80847bf889aff68b56aec86d17 WHIRLPOOL 15f4e28d89e832831af92f5b9e364af2dc224bd7d75b5f5239a8864fcff460a74c7fe289c9eda8aadd63d6a2e56335b373f4afd24058e2b439bb2c336349e053
-EBUILD augeas-1.8.0.ebuild 962 SHA256 50da0692da3b7e89743e6c2a174d9575368f3889d711c0f6bbea74f7fff56238 SHA512 af15f06ecdb8f98214e2d99923cfaa57e7154c9b1995a59e9c1fd52940a65cd817ed2e277d302d3ad8680a5755393fe9e0dc8a3defa03626f351fec0dd6908d6 WHIRLPOOL c999185e2a597931fc805417089e51c6225ca0016262184b602441be35be4ca8bfa7e9c8a9b1ddac182f44954768d4aebe6e4ad92a5625f29896259ccdac7973
-EBUILD augeas-1.8.1.ebuild 1001 SHA256 710e3968949e419325da3f8c1fac68f911c3e7ec3b7e0f1e42bf87e2e0f29da0 SHA512 be32c8020994a750511da6da39518b9ec493bbc1802ca8767a1b4b191c29cb628831c7a551425270cff84f5d952b8cc963d47d4393dd150028a028387939fbd1 WHIRLPOOL a9904b3643f766bedd565d34fe7ff10324cf6aa77b57944682428471a37353dc201fe39ce84c02d55283dcb1038371389f129fbfed46f3bb690aa1591280fdb3
+EBUILD augeas-1.8.1.ebuild 1000 SHA256 6a112f872b20c583f7cf1d7acd019f9918a057af2c4f937b69ce5d40506e399e SHA512 47871941fbcb08efce33560c5e8d857fef6e2dff1cdde7c31af6b205517af837840b83664fde9b6943b5ee3c3a367a7709c603b9409397cb79d7f879fedde1a0 WHIRLPOOL 95be95ed87eebccabb97abef577d88ab1fc0db4cb3e807b8bf8a7e8dc0fff80cc59a68c8150a4601060d36f6ced58adbd70cfb18ea552975e59ca30d05556993
 EBUILD augeas-1.9.0.ebuild 1007 SHA256 2c7fa7d3ef04a292e16b1338da985f3bbcb2bc77f1203a362994033769c6959b SHA512 2cbfcc1006e5330d61667fcc4c01f12b7220ff9602f0b3933fd291cc1f054950554631d1e86cbfd577101ad07672bd81aff9e074cab41e96379d9e60df53e2db WHIRLPOOL df9a3056ae5580b9a5100c8930966c53340f9b0f39c6f0ab6c3ec2e3f63b665529ae5458e73c0ad36d8882315624e41939f407b183a233577ff034cd854c6a60
 MISC ChangeLog 5096 SHA256 a43458b42603d43012d5331d5e373c03b92a75c3b88b9177d1238bf283bf17e1 SHA512 bf7e92ebbb1d714c13995ff12020d08d990a359c2772269d39869dba387e98b37caa4802ea14a09540ac0166b0a5d43dcef83961bfd74f2e2dcbdc1332995340 WHIRLPOOL a724244353b9c7cbb239cdb9e18c04fcbfa27e0c40990c3ee58c21389b8ecb7c3ac960ab2ed8861da2902be95d6cb1b062f0a2ee02ebdbba58dc87b9bbd9af75
 MISC ChangeLog-2015 7867 SHA256 2179c62fc1afc98a4902b960d3b945c6107fb5c7c12588bf81063d81f9d386cd SHA512 1467fb11d900332b57f356b58c470f7fcba3ff8b17a16b744cdef519922c561099a2c5c4e7c0dd0763c2333e548c8fb8428eec644944c241a639055788d35daa WHIRLPOOL bf03260b28195b879bafe06f584f824c24b9c353f9544baeb559f9f30dd20212ded555245b03e4ef16088bb7f249ee23485f4829920a37ace2d54d0e3ca04c6c
diff --git a/app-admin/augeas/augeas-1.7.0-r1.ebuild b/app-admin/augeas/augeas-1.7.0-r1.ebuild
deleted file mode 100644
index f3291efef372..000000000000
--- a/app-admin/augeas/augeas-1.7.0-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils
-
-DESCRIPTION="A library for changing configuration files"
-HOMEPAGE="http://augeas.net/"
-SRC_URI="http://download.augeas.net/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="static-libs test"
-
-RDEPEND="
-	dev-libs/libxml2
-	sys-libs/readline:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=app-doc/NaturalDocs-1.40
-	test? ( dev-lang/ruby )"
-
-PATCHES=(
-	"${FILESDIR}/cve-2017-7555.patch"
-)
-
-#PATCHES=(
-#	"${FILESDIR}"/${P}-gets.patch
-#	"${FILESDIR}"/${P}-test.patch
-#	"${FILESDIR}"/${P}-test2.patch
-#	"${FILESDIR}"/${P}-libxml2-pkgconfig.patch
-#	)
-
-src_prepare() {
-	if [ -f /usr/share/NaturalDocs/Config/Languages.txt ] ; then
-		addwrite /usr/share/NaturalDocs/Config/Languages.txt
-	fi
-	if [ -f /usr/share/NaturalDocs/Config/Topics.txt ] ; then
-		addwrite /usr/share/NaturalDocs/Config/Topics.txt
-	fi
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	# Needs to implemented
-	local myeconfargs=( --without-selinux )
-	autotools-utils_src_configure
-}
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
diff --git a/app-admin/augeas/augeas-1.7.0.ebuild b/app-admin/augeas/augeas-1.7.0.ebuild
deleted file mode 100644
index 2cdf509377f1..000000000000
--- a/app-admin/augeas/augeas-1.7.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils
-
-DESCRIPTION="A library for changing configuration files"
-HOMEPAGE="http://augeas.net/"
-SRC_URI="http://download.augeas.net/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="alpha amd64 hppa ia64 ppc ~ppc64 sparc x86"
-IUSE="static-libs test"
-
-RDEPEND="
-	dev-libs/libxml2
-	sys-libs/readline:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=app-doc/NaturalDocs-1.40
-	test? ( dev-lang/ruby )"
-
-#PATCHES=(
-#	"${FILESDIR}"/${P}-gets.patch
-#	"${FILESDIR}"/${P}-test.patch
-#	"${FILESDIR}"/${P}-test2.patch
-#	"${FILESDIR}"/${P}-libxml2-pkgconfig.patch
-#	)
-
-src_prepare() {
-	if [ -f /usr/share/NaturalDocs/Config/Languages.txt ] ; then
-		addwrite /usr/share/NaturalDocs/Config/Languages.txt
-	fi
-	if [ -f /usr/share/NaturalDocs/Config/Topics.txt ] ; then
-		addwrite /usr/share/NaturalDocs/Config/Topics.txt
-	fi
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	# Needs to implemented
-	local myeconfargs=( --without-selinux )
-	autotools-utils_src_configure
-}
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
diff --git a/app-admin/augeas/augeas-1.8.0-r1.ebuild b/app-admin/augeas/augeas-1.8.0-r1.ebuild
deleted file mode 100644
index 3d268f6e33cf..000000000000
--- a/app-admin/augeas/augeas-1.8.0-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="A library for changing configuration files"
-HOMEPAGE="http://augeas.net/"
-SRC_URI="http://download.augeas.net/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="static-libs test"
-
-RDEPEND="
-	dev-libs/libxml2
-	sys-libs/readline:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=app-doc/NaturalDocs-1.40
-	test? ( dev-lang/ruby )"
-
-PATCHES=(
-	"${FILESDIR}/cve-2017-7555.patch"
-)
-
-src_prepare() {
-	if [ -f /usr/share/NaturalDocs/Config/Languages.txt ] ; then
-		addwrite /usr/share/NaturalDocs/Config/Languages.txt
-	fi
-	if [ -f /usr/share/NaturalDocs/Config/Topics.txt ] ; then
-		addwrite /usr/share/NaturalDocs/Config/Topics.txt
-	fi
-	default
-}
-
-src_configure() {
-	# Needs to implemented
-	local myeconfargs="--without-selinux
-	$(use_enable !static-libs shared)
-	$(use_enable static-libs static)"
-	eautoreconf
-	econf ${myeconfargs}
-	default
-}
diff --git a/app-admin/augeas/augeas-1.8.0.ebuild b/app-admin/augeas/augeas-1.8.0.ebuild
deleted file mode 100644
index a2f7b89a9d9b..000000000000
--- a/app-admin/augeas/augeas-1.8.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils
-
-DESCRIPTION="A library for changing configuration files"
-HOMEPAGE="http://augeas.net/"
-SRC_URI="http://download.augeas.net/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="static-libs test"
-
-RDEPEND="
-	dev-libs/libxml2
-	sys-libs/readline:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=app-doc/NaturalDocs-1.40
-	test? ( dev-lang/ruby )"
-
-src_prepare() {
-	if [ -f /usr/share/NaturalDocs/Config/Languages.txt ] ; then
-		addwrite /usr/share/NaturalDocs/Config/Languages.txt
-	fi
-	if [ -f /usr/share/NaturalDocs/Config/Topics.txt ] ; then
-		addwrite /usr/share/NaturalDocs/Config/Topics.txt
-	fi
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	# Needs to implemented
-	local myeconfargs=( --without-selinux )
-	autotools-utils_src_configure
-}
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
diff --git a/app-admin/augeas/augeas-1.8.1.ebuild b/app-admin/augeas/augeas-1.8.1.ebuild
index 846c917c6019..bd87d5c497e5 100644
--- a/app-admin/augeas/augeas-1.8.1.ebuild
+++ b/app-admin/augeas/augeas-1.8.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.augeas.net/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="LGPL-2.1"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ~ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ~ppc64 sparc x86"
 IUSE="static-libs test"
 
 RDEPEND="
diff --git a/app-admin/keepass/Manifest b/app-admin/keepass/Manifest
index ca9462a09fa1..119d9f414499 100644
--- a/app-admin/keepass/Manifest
+++ b/app-admin/keepass/Manifest
@@ -1,7 +1,9 @@
 AUX keepass-2.36-xsl-path-detection.patch 1446 SHA256 63d191355c78e1d15ae8d4ca995b492f610a75537b1e245a1a640a39974da0c4 SHA512 6e1279363bf355be8846c012840271525dcbeccfaa9dc9d1bc4b39068ed58dae4fc421fed4f0fd5d0d2311436d35648f04539fa122066222cb15a66c3383ceae WHIRLPOOL c5d43eb0a45f80aac0607473029f67f30c0d46cc2c5434d953097f66170c611b06b548db4f4b6a3bc1689714ec02e579505ee9c0ef6dba86fd5c8bf51153c64a
 AUX keepass.xml 275 SHA256 14e15149e0b9177008cc1fb67e57ef83e2c8663846403dfdf2411c77ebb3ee3f SHA512 a6055604ff4ff9e905012b5f8448540ea3b3fa8527ce1fd247fe4e5329e6861e5e7a01ea5ed907c41c073d81ee02452392ea0b0d61bf1119dadd300911a450fb WHIRLPOOL d0ee272ae608241ca67a0a2d1365d37e19b86ce4a7baede55f7094f8b1b58671935a753fa3f9859777c0bef2ee47a36b418165e5e6c894bfa6e634f965abd57e
 DIST KeePass-2.36-Source.zip 5063221 SHA256 de7e3e9d9bedab13e4d66b0ee941b2ebedaa08d8090f7cd78bd0fc019187d8c8 SHA512 16d51ed6bc437172765f69d1d67862afe7219a0898d13b4609198bbd7b5107620f1be418f5ea6ba23a5e3c7ca12d45ba3f0f3778c516eea6b2b953bc291cfe41 WHIRLPOOL 1d9fbf662757e09c4854010da9f6960fe4bf794eb694b37a9f63d813c1e1d1471257a66f01eac761fed5b06831f659cb81f11eba8858ee4e128cd578a19fcae8
+DIST KeePass-2.37-Source.zip 5080663 SHA256 1d8ffdd8ce1050939755311994ea3a491052bcb54d772bd7fc748567a5bbcbf1 SHA512 d094793a3216181ae375fb1343a809a20c358786bdf369c0171e5b7ca17a74bada314875cf410d84efaa4fa2b13e199de9be3c60f5f4e2c189241e4fffec8ad8 WHIRLPOOL 341140bf316d5750e0ad02e3edea9254471dbfe9c78e5441687847ed02fc0b4f44ae6ea310f523b7ad1ee6eb1af36f27568e17de9df5fbc38c16070ed20af8bf
 EBUILD keepass-2.36.ebuild 3036 SHA256 839222f8fea99ed61a96a96bfccc46d0918c1876895383071e01c3ab2f7c9ab2 SHA512 d4320aae524fe146ece9b319d5e94382197012e3f38f18a7213c5b6b82ff4d68f0bb36a1eb57cb978c7d6ce04339cefdb4e751127c53d470ed27c086e8389174 WHIRLPOOL ca26d85275da05db045048789519fb602d908b28cda5c5758d2c9d63ab0d5266537e611691faa170f56553931572c4ebbc1bdf458581764394c2944e521f93f7
+EBUILD keepass-2.37.ebuild 3038 SHA256 afcc189cd7c1cd30bfd656b1b443f977ffa1ef308266690fbe1d8b3c540c0129 SHA512 65b39e26f54deb365bb6783615e7560ac858bf4b0b66f680699844ed4ff46b4ff26007cb19dbabcf2bf761865b9e950e2de38d09e531962e0b6f5ebfa54b7a13 WHIRLPOOL 688dd822f62af7271b61506c7d76bb85cb814a319dcb3840d9ab2e7d6e4d9e9118e0da325035d11b0841add6268119d7b73f4a305458a5804e5806797fcc0c1b
 MISC ChangeLog 6059 SHA256 e0725a5fa8ea7ca71a5b92e12ed0287b4e8ca1bd6a6b9bb5ec5aa05316a2a548 SHA512 acca1aeda8273a603089ef8f6395ed061ee0a7da45f92aae6b8b260da0601c53d05d0fdff1a391627b64a3b4fdb33ac41d915cfd581f44cc439b8800d6808a07 WHIRLPOOL e5a81e4561e5af4bcbc63c9ab39809383f45ee89c381178ba872fb381aeb53740922575454b2eb0273658faec88c2000ebd05dd1dedc411e0d07828a156c3374
 MISC ChangeLog-2015 3407 SHA256 634db193f86f7ccd6253c9a1e835cfac555c1849e8fee09a61f37e9ec1c3ea61 SHA512 614843ebf42b19a145f6962b9bc54c55700471165acbd2a2e009e6af833f29cf82865743c9905a6967eb1068ff01e93dc1b4542be91ca0c06ff08b5f721f88e3 WHIRLPOOL 70e5a29adee5527c7b00bdd8a433ba979aa4ffd45e428e406f4522caba9fabfc866bf564ce1641ca518cdcb57e59210031e21bddd618e55f1858f73bb8b56a5c
 MISC metadata.xml 791 SHA256 18c672f1ad673aa1fe0b4a7575f39dd70abd7d3807e6b8bfe4fd138497f6cf44 SHA512 fb4fe73e3a2f4d36f36ecae7b9c13dc48db967cced94f0741bd6a2ae91d2a1d502ef9d2c9ace534c866268829d430f91a79f1e7ead89d03cbdfd4a94b89df861 WHIRLPOOL d99d26c16df2713cdcc93e4b5f32abb793f5ddcdd57f1e4b2d11eee1feb0bd12c00905a7ed991fa90b1b6687b67745ea6fecefb95a7edbd0b86c11445da9749b
diff --git a/app-admin/keepass/keepass-2.37.ebuild b/app-admin/keepass/keepass-2.37.ebuild
new file mode 100644
index 000000000000..4cdca74eeb1a
--- /dev/null
+++ b/app-admin/keepass/keepass-2.37.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils gnome2-utils xdg-utils
+
+MY_PN="KeePass"
+DESCRIPTION="A free, open source, light-weight and easy-to-use password manager"
+HOMEPAGE="http://keepass.info/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${PV}-Source.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="aot"
+
+COMMON_DEPEND="dev-lang/mono"
+DEPEND="${COMMON_DEPEND}
+	app-arch/unzip
+"
+RDEPEND="${COMMON_DEPEND}
+	dev-dotnet/libgdiplus[cairo]
+"
+
+S="${WORKDIR}"
+PATCHES=( "${FILESDIR}/${PN}-2.36-xsl-path-detection.patch" )
+
+src_prepare() {
+	# KeePass looks for some XSL files in the same folder as the executable,
+	# we prefer to have it in /usr/share/KeePass. Apply patch using base function.
+	# This XSL file will not be upstreamed since the KeePass creator said that
+	# including this patch would break the Portable USB version of KeePass
+	# (which keeps/looks for xsl files in its own folder)
+	default
+
+	# Switch into build dir so the mono prepration script works correctly
+	cd Build || die
+	source PrepMonoDev.sh || die
+	cd ../ || die
+}
+
+src_compile() {
+	# Build with Release target
+	xbuild /target:KeePass /property:Configuration=Release || die
+
+	# Run Ahead Of Time compiler on the binary
+	if use aot; then
+		cp Ext/KeePass.exe.config Build/KeePass/Release/ || die
+		mono --aot -O=all Build/KeePass/Release/KeePass.exe || die
+	fi
+}
+
+src_install() {
+	# Wrapper script to launch mono
+	make_wrapper "${PN}" "mono /usr/$(get_libdir)/${PN}/KeePass.exe"
+
+	# Some XSL files
+	insinto "/usr/share/${PN}/XSL"
+	doins Ext/XSL/*
+
+	insinto "/usr/$(get_libdir)/${PN}/"
+	exeinto "/usr/$(get_libdir)/${PN}/"
+
+	doins Ext/KeePass.exe.config
+
+	# Default configuration, simply says to use user-specific configuration
+	doins Ext/KeePass.config.xml
+
+	# The actual executable
+	doexe Build/KeePass/Release/KeePass.exe
+
+	# Copy the AOT compilation result
+	if use aot; then
+		doexe Build/KeePass/Release/KeePass.exe.so
+	fi
+
+	# Prepare the icons
+	newicon -s 256 Ext/Icons_04_CB/Finals/plockb.png "${PN}.png"
+	newicon -s 256 -t gnome -c mimetypes Ext/Icons_04_CB/Finals/plockb.png "application-x-${PN}2.png"
+
+	# Create a desktop entry and associate it with the KeePass mime type
+	make_desktop_entry "${PN}" "${MY_PN}" "${PN}" "System;Security" "MimeType=application/x-keepass2;"
+
+	# MIME descriptor for .kdbx files
+	insinto /usr/share/mime/packages/
+	doins "${FILESDIR}/${PN}.xml"
+
+	# sed, because patching this really sucks
+	sed -i 's/mono/mono --verify-all/g' "${D}/usr/bin/keepass"
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+
+	if ! has_version x11-misc/xdotool ; then
+		elog "Optional dependencies:"
+		elog "	x11-misc/xdotool (enables autotype/autofill)"
+	fi
+
+	elog "Some systems may experience issues with copy and paste operations."
+	elog "If you encounter this, please install x11-misc/xsel."
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-admin/logrotate/Manifest b/app-admin/logrotate/Manifest
index 8cbeb931bd04..7d8cf83e1934 100644
--- a/app-admin/logrotate/Manifest
+++ b/app-admin/logrotate/Manifest
@@ -7,6 +7,8 @@ AUX logrotate-3.12.2-fbsd.patch 855 SHA256 127c90627ba4dc79d0120d3a86b8e7696b895
 AUX logrotate-3.12.2-ignore-hidden.patch 542 SHA256 35488583344d963ea1c19a798bc9f8d9c174395f299d1a81a65680e47c36362b SHA512 86d7335dda9b913928eb14dc39a120e14f3796fc30516fbfb5424c575520802edb84224bf5673084be7e983f9e2d856d80d58fa4200a0a43a9624d41dc20a206 WHIRLPOOL a711fbb2fe8ee74123ecbca4202ff8cac60bdb8c0fc197aa8dc96e101cad32d8e1b85bc378bfd8d0fd831753e39f7c9a177db194d9d2450bee2e29f09af37f86
 AUX logrotate-3.12.3-fbsd.patch 855 SHA256 127c90627ba4dc79d0120d3a86b8e7696b89546cb164230f12466113d874141b SHA512 3e54314ce32735bd70fe46792c073fd5eb345a77e40eae4b9c899671cc8b7dd8d6f1042a28f05364431fc730a3dbe924d19d6eacbb387c6384268a397dd9ac85 WHIRLPOOL b734147fad23c8a0d16aaee33910995ce11310497616a390c74415d66e74ab6508b65e144e5c692fba635f5c0882106d8dd72b99ec941439e589e2712efdf155
 AUX logrotate-3.12.3-ignore-hidden.patch 542 SHA256 35488583344d963ea1c19a798bc9f8d9c174395f299d1a81a65680e47c36362b SHA512 86d7335dda9b913928eb14dc39a120e14f3796fc30516fbfb5424c575520802edb84224bf5673084be7e983f9e2d856d80d58fa4200a0a43a9624d41dc20a206 WHIRLPOOL a711fbb2fe8ee74123ecbca4202ff8cac60bdb8c0fc197aa8dc96e101cad32d8e1b85bc378bfd8d0fd831753e39f7c9a177db194d9d2450bee2e29f09af37f86
+AUX logrotate-3.13.0-fbsd.patch 855 SHA256 22618ce2fcf3555f4922ea98e90bac7846a840fe4da76d1c14d66614b13b21b0 SHA512 5343814545554392f1ee1be5b35866ebce0d8f2f580cb7807940e3a5b2092025f1b9619fa0ff3bdf4b99aada4c46a602d6c34c6e3c1e42b15ce51cf9d879a3ed WHIRLPOOL e78ea306458781dd88f3efbea57bc1d42f761aa5b98a286608be661a2904d91fbf53475740304e5a5f9f47bb361d87588c829900f90c2b7764fad2b066dac0ad
+AUX logrotate-3.13.0-ignore-hidden.patch 542 SHA256 5e5a1fb4b560d9a8d88f5deefacf09fcfb071144f9195fd5953146b26439adcf SHA512 88bd9dd906171d45877e4c21e40cfc9a729742825b4c5d583fd9364d3943aa604e037e4b58e053a1fc7c0b77bd5ed6171f741778716ef753ecbb02ebaf012589 WHIRLPOOL f9642e6482982ae51f44807bef77a21269fe9f1449d8c8bd16ca845b0e3c9e2b7ef0428daeead65940c7fe4b49c39982c7874e585a6b781076e78000ee4de282
 AUX logrotate-3.9.1-Werror.patch 344 SHA256 63ce419252a8e2ed52c78b018bb1b2247e02f5c2c322168a5772d3faa957bd88 SHA512 6ae8b49d1f29ce1c32603716555085b7fa2d865177558abe92c84867c69ca84b8174563db07537801ad01572717670478b273acb34b5885b9170354d1cc02493 WHIRLPOOL 808769d911f49ed40c572e6f21d42e578aba056b3815017f25bb66d5d14a9fd78c16a92f30874346324ab1e0e7af57f6fa678707d88e8b3f69055c25b4b9a81a
 AUX logrotate-3.9.1-atomic-create.patch 1253 SHA256 f5a93032a0d7f48b4eb295fd40400d527a66804e3f959d391f895cebd86ef7ad SHA512 92fa8e04522f9bf06840befcb019a498d465f2d8afa3475f97e953b4e8abf2cf63f2fa27d8c89c5620da59468f753d94720f5f3a604376d7e51b86c9eb156c99 WHIRLPOOL 29b74ceae23035e4423753042375f1fc713fc780b3ea31d166034746c0d4c89ec1be7979c570f13437902ba7c155299eb870510742fa73656517f5accd43d100
 AUX logrotate-3.9.1-fbsd.patch 1393 SHA256 543a7e7118f66cda16446d5bfd7abdae1c72e786f49f701c515ea595e72fe7ef SHA512 dd8bc024eb280e5bcb2869682bedaf5c8db6d18976e412de3283f32bc5d9ad370fdda27194eae11fa3da53339d83ff20fe541e99eb8ed183997ecb85a606f822 WHIRLPOOL dd34fb0f8070e297a6f760d9d77ed3191ff3e91b152710ac6acaaada70236b12e6cc192259c06e15ef0d54f75a28de23dd3052a3c37d20b888c8069b77794a07
@@ -17,12 +19,14 @@ AUX logrotate.tmpfiles 16 SHA256 5624b71671928b2d5a076c32172b65b679b8502aae66b28
 DIST logrotate-3.11.0.tar.gz 176488 SHA256 7dcb440ed2f1937459e1e06f841c6af1e564b77b2df8009147b56c8649197910 SHA512 67ceb2e18c175a5935c81e7699af7a5e6625cef50a3f52e993d49d6c10d9c433f6c7354a8dd05cb35ab28e4393d1db198f2e46e5f6eafd3e6f040b6518438cc1 WHIRLPOOL 0a581aa5922386b84a7c40a9490364287f4e162f7180fd0e15bf191694294168b663947c7081e92755406fe4f0b3b8792b6f0c5f0e646afa5505a17995a86858
 DIST logrotate-3.12.2.tar.gz 202700 SHA256 754777ada2ef2f34378e8f6025cdb0c0725e212f12195d59971c42df0ae0597f SHA512 ba8c3d7c7134b9ab5968c0dc8a1c5d24d7287a3204e1c6eed080b537d6a0ed7765a47c69b3067493304994e3f4238dc0173b593e4628316bfadf3decd002da16 WHIRLPOOL a299bc2bd50ab36acdd4ab747a479c5b94e84ac92bf55b71a8a8a7d4e1b55eb909dce94c22a5fdadda946dc783376923de5f46729084e21b54811489ce97c482
 DIST logrotate-3.12.3.tar.gz 202991 SHA256 435a3f9a534a37e11657532a090f6bf521d8696bdf9cb799a360c1750ba3aea9 SHA512 ab700a50736c7ce8a6e5b9dc2504919c6d3e6ae48a7f112f6980253df5c6bab7fc507c82a0cd961d73ed1312c930da46d96d9f27046996644e0759c84c6a1ae9 WHIRLPOOL ceadd2a748850f0035702156b9a566bf3a38749edf823062f1c867e60cac1c7b40d770d6c923eed79972ce58394b3220e16e40e97e192a6a7046cf09c5fcbf77
+DIST logrotate-3.13.0.tar.gz 213726 SHA256 2ea33f69176dd2668fb85307210d7ed0411ff2a0429e4a0a2d881e740160e4b0 SHA512 3dec2fcdd674d3337b71fd70339cb5e3dd06b4bc24bee191356a30c2a211a290ae7747e63b90581e32a6d6d1f73cf62d5b0ee5a91aa05bad4d6ee403a35d9e76 WHIRLPOOL 952c5eda18870876ea5109d4c5ae7ac1048d3ea07c89b4a0320a48baa8170fbc200f5b4a1cc193da0f6b0e1ef8dbdcdb82f74f23d4f12e5a19bb98650c1e7d5a
 DIST logrotate-3.9.1.tar.gz 79061 SHA256 022769e3288c80981559a8421703c88e8438b447235e36dd3c8e97cd94c52545 SHA512 e6da7c7f067befaf2441e9c6ce77e53cf5ddb4f56cc3304c3e50873b6f20c68520f4a0e50ec466cbebcbed20bfd77bf6dfc489975a8131e9573fb19856c0fe28 WHIRLPOOL 9b3558bb03c6c95f8f386ea75ca09bfda802ae4c45b9ef8408692e3aa7a2ee57447cf15ce04d0289946b9cae2266acb5509d8151d15ac6ea0ad9113aeb32dc17
 EBUILD logrotate-3.11.0.ebuild 2005 SHA256 101653a12e2243dd4253abbc24becfeef0d2bae5037ae848a1f4848bec4a163e SHA512 eb0392730a076565c459a2645b6497b86d3a86d0096661eb468b00cbb909ffbed7db762adb866a9cbfca40ff339d90ce0c970404b718b8f8a4d084dbf51a1ddf WHIRLPOOL 0317478d7fc84c7d1716d2b449298b382a2349a5ed746c458a9e47a129fdbe9d4e7ec330bc36c07e9be0ae2ca041518424f1ce7ef3333e547667947eec5f6c12
 EBUILD logrotate-3.12.2.ebuild 1903 SHA256 d909fdef412279a0147a2f9d02986cafea2c4bd63936ab0fa0538ecad797483e SHA512 78ae7250c4c26ff7f702746535bace0f34b68d2ceb9d6cc3744975d1842781bb2037fa520b873806659db2e5acb8b58ec14996865be82e62d1d892acdae3b134 WHIRLPOOL 728c71c61e3ac0830ea100d891bcaf7fa8c9cf75e7c8f455862442d31a0f83b459d50ef54101a31745c84d6f491473404ded5c9372cf551a8499eff60893a49a
 EBUILD logrotate-3.12.3-r1.ebuild 2487 SHA256 e1871fe019ac5de8ef40c4e4b33e6e2a2b14ff52f39fd7969b3e547551dba63c SHA512 b085e9bbc3a21814f7d12bdbd37b38094527e04253bd64e5a90ecf366b58b1a9aae98752508f0f59a2fcf09f548bfa5c7e65436c4ce80918eee78df978ad34cc WHIRLPOOL 90c109fdf4396b723ecee00ebb676b0d8718d7fe9f72bdb5a87782355c411cfe72af86994c7564cd16c6f26397f2724eb63bcd04e3f767c5e318e59340681416
 EBUILD logrotate-3.12.3-r2.ebuild 2552 SHA256 55c7d7cd58624e29f040d575fe0d695bf66af60dfa735efd24416e2306e07140 SHA512 b3f3b5d0264bb75c717608be706eccf33d97996f38c5ca152e1797f9dfbdfc40add7065fa614a715d0a30d431dd484e34a8b48138b80d99bcdd546b597264436 WHIRLPOOL db532413f8a7aa375b952c7451a482f362ff2aa93316f62dacbc75274e692e6be19088b28305973b610eaed3bae4578998720213c8e33bd252f529cdbc02c754
 EBUILD logrotate-3.12.3.ebuild 2479 SHA256 f5bc883c099160493f924e3b72aa304eac5d23248f21137876b1f774a24539e8 SHA512 4e0b4b99277ee692318a6d6f4358a5463f11c339cc1e610040a9a436b412d5f8ba22ededee3453a4dc6dccd66067ee04931a39d3b27f08189592c2366f0c0365 WHIRLPOOL 9d71a14ec8ba93fa742d20d1275e757236b37413947248614fdbcf723a49dbaf700e20145e6523ac759d637a795355af1f636227db0803b04f994bbbedaafaf3
+EBUILD logrotate-3.13.0.ebuild 2552 SHA256 55c7d7cd58624e29f040d575fe0d695bf66af60dfa735efd24416e2306e07140 SHA512 b3f3b5d0264bb75c717608be706eccf33d97996f38c5ca152e1797f9dfbdfc40add7065fa614a715d0a30d431dd484e34a8b48138b80d99bcdd546b597264436 WHIRLPOOL db532413f8a7aa375b952c7451a482f362ff2aa93316f62dacbc75274e692e6be19088b28305973b610eaed3bae4578998720213c8e33bd252f529cdbc02c754
 EBUILD logrotate-3.9.1.ebuild 1767 SHA256 72213fbfa0a0f182e8ac774e29a8763a17b394c1b4e33e7cac664c7bccbcc96a SHA512 ed808392727749efb6d20a410810f6eb9cb364db2e11460f4c2940abd0fb1d7430b75102f2fcabcaf64e8818da39323010d2a5d223df49c705a6171acf541a03 WHIRLPOOL 245d8f38775b0a9296cc41c0af04e6aca66a7722c2eafbe6814b2a865cc4bd1237f5ef1aa146089882112144db8292d1e706323ec63d2b018ba9bac06147cb37
 MISC ChangeLog 11318 SHA256 38d98af46e97c9519c8e99cf7bf71b7c27b1814b35870579057d068c54fc14c7 SHA512 d2992032a405e2c185966f44f50a1a92c0138f8e847b55402a620f144ecedf58a23381c0ae42b12d344cf18eeab833a786ed35401a29c0c45aa2b67664ba8c51 WHIRLPOOL 66cb04fb922ba81fc9bcf4cd200c6d236d5a758f872da2e55bb09981571b914adca5c40e2597b4dea1ef994ce36782aac590adc5d6aa149b1adc08f36b1ea5dc
 MISC ChangeLog-2015 31549 SHA256 9a573fb1c828c7902f5b51a4f331a7df387a331c49509396799505c3e7c5c323 SHA512 13817496f0b30b421db6c36d2f044b7165a8282420d5124c52a6e5220cddc30ac774b63a43b395f0c0392339e67bcf6a855e16c666de34ad13004ec1d0f056fa WHIRLPOOL 4a957803bf090890dcb9ad77152e87bba98952493f97e75a00718ff024e5b774baca23c554e7ae2995d499d3791a38eb4b83f8126ab295fd2ed7c97652ed8687
diff --git a/app-admin/logrotate/files/logrotate-3.13.0-fbsd.patch b/app-admin/logrotate/files/logrotate-3.13.0-fbsd.patch
new file mode 100644
index 000000000000..028dc0551f17
--- /dev/null
+++ b/app-admin/logrotate/files/logrotate-3.13.0-fbsd.patch
@@ -0,0 +1,36 @@
+diff -Nuar a/config.c b/config.c
+--- a/config.c	2017-10-14 18:52:56.829467653 +0200
++++ b/config.c	2017-10-14 18:54:57.049467139 +0200
+@@ -25,6 +25,10 @@
+ #include <sys/mman.h>
+ #include <libgen.h>
+ 
++#if !defined(PATH_MAX) && defined(__FreeBSD__)
++#include <sys/param.h>
++#endif
++
+ #include "log.h"
+ #include "logrotate.h"
+ 
+diff -Nuar a/logrotate.c b/logrotate.c
+--- a/logrotate.c	2017-10-12 17:19:41.000000000 +0200
++++ b/logrotate.c	2017-10-14 18:56:23.419466769 +0200
+@@ -1,6 +1,6 @@
+ #include "queue.h"
+ /* alloca() is defined in stdlib.h in NetBSD */
+-#ifndef __NetBSD__
++#if !defined(__NetBSD__) && !defined(__FreeBSD__)
+ #include <alloca.h>
+ #endif
+ #include <limits.h>
+@@ -27,6 +27,10 @@
+ #include <limits.h>
+ #endif
+ 
++#if !defined(PATH_MAX) && defined(__FreeBSD__)
++#include <sys/param.h>
++#endif
++
+ #include "log.h"
+ #include "logrotate.h"
+ 
diff --git a/app-admin/logrotate/files/logrotate-3.13.0-ignore-hidden.patch b/app-admin/logrotate/files/logrotate-3.13.0-ignore-hidden.patch
new file mode 100644
index 000000000000..f3ade248d38c
--- /dev/null
+++ b/app-admin/logrotate/files/logrotate-3.13.0-ignore-hidden.patch
@@ -0,0 +1,14 @@
+diff -Nuar a/config.c b/config.c
+--- a/config.c	2017-10-12 16:05:41.000000000 +0200
++++ b/config.c	2017-10-14 18:52:56.829467653 +0200
+@@ -432,7 +432,9 @@
+ 	int i;
+ 
+ 	/* Check if fname is '.' or '..'; if so, return false */
+-	if (fname[0] == '.' && (!fname[1] || (fname[1] == '.' && !fname[2])))
++  /* Don't include 'hidden' files either; this breaks Gentoo
++     portage config file management http://bugs.gentoo.org/87683 */
++  if (fname[0] == '.')
+ 		return 0;
+ 
+ 	/* Check if fname is ending in a taboo-extension; if so, return false */
diff --git a/app-admin/logrotate/logrotate-3.13.0.ebuild b/app-admin/logrotate/logrotate-3.13.0.ebuild
new file mode 100644
index 000000000000..f0661a39594e
--- /dev/null
+++ b/app-admin/logrotate/logrotate-3.13.0.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd
+
+DESCRIPTION="Rotates, compresses, and mails system logs"
+HOMEPAGE="https://github.com/logrotate/logrotate"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="acl +cron selinux"
+
+CDEPEND="
+	>=dev-libs/popt-1.5
+	selinux? ( sys-libs/libselinux )
+	acl? ( virtual/acl )"
+
+DEPEND="${CDEPEND}
+	>=sys-apps/sed-4"
+
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-logrotate )
+	cron? ( virtual/cron )"
+
+STATEFILE="/var/lib/misc/logrotate.status"
+OLDSTATEFILE="/var/lib/logrotate.status"
+
+move_old_state_file() {
+	elog "logrotate state file is now located at ${STATEFILE}"
+	elog "See bug #357275"
+	if [[ -e "${OLDSTATEFILE}" ]] ; then
+		elog "Moving your current state file to new location: ${STATEFILE}"
+		mv -n "${OLDSTATEFILE}" "${STATEFILE}"
+	fi
+}
+
+install_cron_file() {
+	exeinto /etc/cron.daily
+	newexe "${S}"/examples/logrotate.cron "${PN}"
+}
+
+PATCHES=(
+	"${FILESDIR}/${P}-ignore-hidden.patch"
+	"${FILESDIR}/${P}-fbsd.patch"
+)
+
+src_prepare() {
+	default
+	sed -i -e 's#/usr/sbin/logrotate#/usr/bin/logrotate#' "${S}"/examples/logrotate.{cron,service} || die
+}
+
+src_configure() {
+	econf $(use_with acl) $(use_with selinux) --with-state-file-path="${STATEFILE}"
+}
+
+src_test() {
+	emake test
+}
+
+src_install() {
+	insinto /usr
+	dobin logrotate
+	doman logrotate.8
+	dodoc ChangeLog.md examples/logrotate-default
+
+	insinto /etc
+	doins "${FILESDIR}"/logrotate.conf
+
+	use cron && install_cron_file
+
+	systemd_dounit examples/logrotate.{service,timer}
+	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles" "${PN}".conf
+
+	keepdir /etc/logrotate.d
+}
+
+pkg_postinst() {
+	elog
+	elog "The ${PN} binary is now installed under /usr/bin. Please"
+	elog "update your links"
+	elog
+	move_old_state_file
+	elog "If you are running systemd you might need to run:"
+	elog "systemd-tmpfiles --create /usr/lib/tmpfiles.d/logrotate.conf"
+	elog "in order to create the new location of the logrotate state file"
+	elog
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "If you wish to have logrotate e-mail you updates, please"
+		elog "emerge virtual/mailx and configure logrotate in"
+		elog "/etc/logrotate.conf appropriately"
+		elog
+		elog "Additionally, /etc/logrotate.conf may need to be modified"
+		elog "for your particular needs. See man logrotate for details."
+	fi
+}
diff --git a/app-admin/lsat/Manifest b/app-admin/lsat/Manifest
index 3e8e96dfa03e..7bb7566831b6 100644
--- a/app-admin/lsat/Manifest
+++ b/app-admin/lsat/Manifest
@@ -2,7 +2,7 @@ AUX lsat-0.9.7.1-gentoo.patch 1484 SHA256 f76f127f56139d8d8cf20ead7dd3e72b0a91b9
 AUX lsat-0.9.7.1-segfault-fix.patch 1695 SHA256 ffdd87e42c0e7cb83f38e5c2876fe539b3af303bf7df041a7d86e49cecd0cac9 SHA512 8be007761729ed7b0162cdba3d90a86ccb4caa10064f64a0fe3c10434227b3a5e185c9ca4509ea877a605161bd0482d8ce8758c1cb853756fe81ac37d41832b2 WHIRLPOOL 28db1025c2db54cbe34e6bab69e40f14d57f14dcd03e1765d41da6c5b27a1c31aa57cf839bf4fa82b02cefc1a8e161d8b800df3a28ed310c2b705ee1f5ea7a20
 DIST lsat-0.9.7.1.tgz 86077 SHA256 825b4578e7e90f937c492722801fd6b35785264747cd6e7e45bded2545d2d956 SHA512 fa67b5ebb03d11e3ee023c921977ddb64ea1fafca1d4cdb4b0fc5dbfa6edf46d57e488e9702175afbbde360a63d02ee5839fdf6576d974354a3b1d57f8860ffb WHIRLPOOL 81db8c06bf9bd8ae82a29ca751e378ffbc051e8184e7dac208e43064960949fe9483522600f023d064411338ea76d83e0cbc8b5d1f7f8d7861a2d73581fbc71b
 EBUILD lsat-0.9.7.1-r1.ebuild 1034 SHA256 b460bddd630e07af65daf7b4ac904c580fd00f6ac3c82b52f079738f61a3c3d8 SHA512 4912b221df15b5bda32fbf5269bdea29259b25785e07b3c30dc1043934d9441e6c81edfcea4d0cb5f0191f22976a1335e167de6c5ae87cf805089094f17b292c WHIRLPOOL febf456566200f07fa308c298db03eed9f87cab06bc8967f8faee7d8bf997b1f7687064c365c7495f10bf11d1829a80c7a505e9d4f080695ee96a94fa5f419f4
-EBUILD lsat-0.9.7.1-r2.ebuild 1005 SHA256 964647ca94f428e7ffdbdc6d5d69f14a0f9289ae99415a775c913243840c07cb SHA512 5b912cca76ecd34375b71c7dffd1341be6936e5998d1f5cc3a3933889308c1982e5e6044edf1a769835a102e88c11e39e6904d744c9fda1bfb39a48a103f450c WHIRLPOOL dee88e861267deadab348a8d2cfd01ac0ae91e7808a4f60e9c13dd83fbf901dce4aa09ac00b8dfa6bc0cc7d628a3417543285b9b286e36d21ca1f6b82023579e
+EBUILD lsat-0.9.7.1-r2.ebuild 1004 SHA256 0089c5cec57de57f6a2740b22406066b4ce68c647ffaca3225b5d1ae58df13be SHA512 c34b4e6717f5ddfd686b3a9de4dff5713fd27deefe5362b6eae0578eb1af1f97a68eee61720368464179e226067c1ed6e91df98fc2a0d8796fcf84d831270666 WHIRLPOOL 019d7ba6e40f026107763db8e43a2a3b8ca7bf1051b1e6f893c9a4bfd30ed28bfa11a9c50c5803f18316536a85f312c805448267633cc7dc25352c99078580b6
 MISC ChangeLog 3146 SHA256 010b9fb14d1940293eb57e49873b4935a9e4849b36196837bbc9980cacd98acc SHA512 bd6ffe74138743c0214b25bfe30677656ec77063fcbec94ecf8067920be2d210e6a1855ec1edb9f4c1880280f9a1ae2f13537b8b1749c1ea26d2ce578d66f266 WHIRLPOOL 32726ba6d2f1390ea964d0ccc08df181b757560b9fae1fcb49e42920ba6ad9bf1f959368f67782820d5e29cfe22a390bff5ba6a3215742fc64dc4d1bf4143b79
 MISC ChangeLog-2015 3982 SHA256 25b25af260af6e45ba1fb74dd1587cfda19e1fee97d551cf4bf23189d21d3b8a SHA512 259aa7f99549c2f2c272c355f323790362c1dc2e249319a3f6d7b54e23ef1e8efcd07bb6f122e1463ed9ee7bf2b9479d3a659b7eedb73ff853fe5ec4185ad6dc WHIRLPOOL f6ce1cc2c0afb7a4448a9b1972b3406a262a7edaccb7392b654dcf3d9685fb7e3575e1cc9df0230bb5249ab43ce357e5e7cd67eb773d4b522d929a6fef914b40
 MISC metadata.xml 608 SHA256 d2f0c6de69d5254deb78229fcbf6f865e5f135be3b8945948a580b32f3a57d39 SHA512 05e9c4d8f92ce5ffabefe6ecab78023c2b0df2c6cc83e7e9c6db837b94b5c3c0f8248d5a3179641eec3513cd646557d2a1028283a03059c722be42c2f230481a WHIRLPOOL 2845a1c38f3b52a0f1201001b4ef6319dd93913379e1cbfb720cbf8a1b012f9273da065416c7f4ddff7d62dd67fd157a3b0ad612d9b27c90e1cb7c5aabe67325
diff --git a/app-admin/lsat/lsat-0.9.7.1-r2.ebuild b/app-admin/lsat/lsat-0.9.7.1-r2.ebuild
index ca91252d82d5..40fbb009cab6 100644
--- a/app-admin/lsat/lsat-0.9.7.1-r2.ebuild
+++ b/app-admin/lsat/lsat-0.9.7.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://usat.sourceforge.net/code/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ppc ~x86"
 IUSE="minimal"
 
 DEPEND="dev-lang/perl" # pod2man