gentoo resync : 15.11.2017

8 files changed, 66 insertions, 36 deletions

diff --git a/app-crypt/libscrypt/Manifest b/app-crypt/libscrypt/Manifest
index eb40c382fd1c..716e67119c0a 100644
--- a/app-crypt/libscrypt/Manifest
+++ b/app-crypt/libscrypt/Manifest
@@ -1,7 +1,5 @@
 AUX libscrypt-1.21-build.patch 2460 SHA256 00b2c3a5f2f4692d25e3e6c411e146aca50b74cca797334f4f9351745f09195b SHA512 74891b020e6115aa938368f43d727b3653160406f887f9958e66c688eb1191f7ba2ce6d753541af9369cf7724ecffff9b6633bef26062ebc0f74a092ed8cdd0d WHIRLPOOL facf16c15bed5bd38d8e3d9513d7dec10caebee1533996a8a83183655d59207a733e84846cddf595fc296a00dc9dc284305bcb45c2642fc6aed15a26eb07bc58
-DIST libscrypt-1.20.tar.gz 18451 SHA256 6074add2170b7d00e080fe3a58d3dec76850a4f272d488f5e8cc3c4acb6d8e21 SHA512 c7db096c740681c328d4c156372147331c0441906c1f17656a8ddd8345348091295749c4e3105bf26106f826327acac9bda97efec4ce50ac56d64f903c59e9af WHIRLPOOL 5d854936f955fbc08ec7d31e89396d3198ea58cac326ea8ceaedcc360e412cefc9e75b49a959870924cabe79ccf14453209cf450ff0256873c1de744f65706ac
 DIST libscrypt-1.21.tar.gz 19425 SHA256 68e377e79745c10d489b759b970e52d819dbb80dd8ca61f8c975185df3f457d3 SHA512 0f894bc2f47016cdd043ea692a4e4b08891b1a961443265230d5ccb76820d40e50b0d4d63588c44c985cd24e214f07b126d30989d3ce4cd79366f3b8f16c4d34 WHIRLPOOL 7fda5f5118c981d595f9f624ae40674c29fba6ee529ec8f4861b88d9bf11321b7a1285fabd1218356b59e889ddb96c4018513441fb4cebd302639085fcc097d0
-EBUILD libscrypt-1.20.ebuild 722 SHA256 1ab36b25bee260ef3ae5026e0a303fb92d82f7d072e4cbe98b402d78e3b52870 SHA512 482d125da9d0f3a062c84ef70452f6da4c24d3b6fac1eed53b2ffae2faf6b15e14216b8d95522d3fa45306a64a97ddf0e0b5e91f15d0d9319caf174182ca07ec WHIRLPOOL 88ef5dc28d4cc45db4fd515b6e83c090adcd5eb006d995a2db89bebcb823af6cbff87ad429872d70de9c12e2cb5bd209e2764dc50146745f049cddc2618f4bca
 EBUILD libscrypt-1.21.ebuild 709 SHA256 27f7703de4fbdab81b0041cbe2e844e41f48c77028f09ed5674c0aa0d8818b66 SHA512 6999f0a1a937c7b7fae9e3af4c60a4385e7c3662e9625760d2c3392eaad2cd11e5a0e1b2f863f35368fc66c16f765539275eeafdc20afaa5d44826e59018f30e WHIRLPOOL 1e29e74776aadc1c425eb43d0b00e6ab82920afb0ad72aa648a7e3ceefa3ef1f7f1ec3eb39e371f8b9cf9a888447289761ae63f09f8fc6a4b96ddb3ce75162a6
 MISC ChangeLog 2235 SHA256 21a74e80d7dadde6500f36f2081d49630f95ae0b1c3567ae0b4171af45128369 SHA512 5b1798c1479023fe7c895ec5be6db22e40937415b296066de34d0ee02df7750c2d2bfbdf4f4bb3ff738fedccf64b5603d4d1796ffd63525491628727981bcae6 WHIRLPOOL 64021d97cd706b62d3056db19c4336573d55e55043bc581daeb96114be0bcc981d82619283fe02e93f8df51ab65dc18a974e43aa96400572fb446c2e840b8245
 MISC ChangeLog-2015 1140 SHA256 a4212ea3aa533d9b211b3e83f179f0e4d09b0bebd48ef69a1df2e3f736ee4afc SHA512 606ad54de1d822941fa5dac04d6c962ae5eb3059a0819bf26d19ba985b3ebdf0768ae66d7ff02c722711bb216bec08a6c6c5cc55c035622b995b19db1905b14a WHIRLPOOL 028fa99a6acbe34a196e6d3ddf14ec422ee0394dee5f1a0a39e5cbf8282ecc9c388cc249629522bfd32606b4c91ad91218e573c1847d7a0beb5bb7ec596cf399
diff --git a/app-crypt/libscrypt/libscrypt-1.20.ebuild b/app-crypt/libscrypt/libscrypt-1.20.ebuild
deleted file mode 100644
index d0238e0ba978..000000000000
--- a/app-crypt/libscrypt/libscrypt-1.20.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="Shared library to impliment the scrypt algorithm"
-HOMEPAGE="https://github.com/technion/libscrypt"
-SRC_URI="https://github.com/technion/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	export PREFIX=/usr
-	export LIBDIR=${PREFIX}/$(get_libdir)
-	export CC=$(tc-getCC)
-	export CFLAGS="$CFLAGS -fPIC"
-	export LDFLAGS="$LDFLAGS -Wl,-soname,libscrypt.so.0 -Wl,--version-script=libscrypt.version"
-	export CFLAGS_EXTRA=
-	emake
-}
diff --git a/app-crypt/mit-krb5/Manifest b/app-crypt/mit-krb5/Manifest
index 75e515566e0e..b60cbd1f7a3f 100644
--- a/app-crypt/mit-krb5/Manifest
+++ b/app-crypt/mit-krb5/Manifest
@@ -21,7 +21,7 @@ EBUILD mit-krb5-1.14.3.ebuild 3641 SHA256 ee5e3ac9e0ad5d22f5ac0c243a692d73a50fdf
 EBUILD mit-krb5-1.14.4.ebuild 3853 SHA256 32f1855442a041fea26339374946c627d2f41a9d16e85a3e6f6ff5faab9c3e8b SHA512 90ca4cda193fcd9b8bf448ec97fbfcd6ceb41cea7c1253739405e428ff4f382c4996638bca465c899eec63ac5f5e391826a066ebd29f582c309c5759a7d5e2b3 WHIRLPOOL c300ea6ee6b3e6948a253a33cc55574fc132ae5520adf67941b30b67bd06b3260ceef03e39b7afc8c00860bf056e5f4229826bbe917c324ee0700da3ef31f47c
 EBUILD mit-krb5-1.14.5.ebuild 3853 SHA256 b7636470f22928156f9f298662f33c78941e47310fe47bda8bb49adc9589f2d0 SHA512 c9dbaa7d7a9432b263afbe37ba27f86ec5b656be84e16a0d3772fbce5e04a2cbba26008135d7d1b9509db10770f8ff879c2748cca5421571d560b3e5917c475c WHIRLPOOL 513819e5acad6c0f0488b8833b67bfe57813199a9de86db8ad954e144f9c6248743c70fa1294277c117dcaaeb6684d2f01814b716acae1e4ff3da38c5b63f10c
 EBUILD mit-krb5-1.15.1.ebuild 3864 SHA256 38920b114635a7d0823871b5b5a57b7f228b1ae9f3bb9e48b3c0622291accb76 SHA512 2b46e5d462d0b2fa3ef760415b6d5d7e8fa453c129102d0e92074b9a5ee86007d9376a27fd45c5dcdae93d59462edae7d5ca1a1ba89e75d64c95758b9d59e948 WHIRLPOOL 949b176ba9d8ed46764328d174f209296db0ef3c65d3057f767a42d5e2c5c6a1145cc3725e51486054bb24a1b2c0328bdd5a544de163bbb73462b2e17b309d9a
-EBUILD mit-krb5-1.15.2.ebuild 3858 SHA256 9e9f38e49f4d0a06ac8edda9a51780488523329f61a72051d83849901351d5f8 SHA512 d4558ff736db7345b5eb94392f70ac3fdd32135b0a43495b2e212f83dfd45aa86996a0485f837c6963c42e5869c6e2556d10cb1180a8de610e54080b5c8735a3 WHIRLPOOL 4b9df8f30e361cb55081469238b5b65a9d79ceaf0ef9c05aaaf5ba13788ce204d9f6c6a19bb01267ecb1c038a66fba326be6610d17a34d16ad4ff86722e3f548
+EBUILD mit-krb5-1.15.2.ebuild 3857 SHA256 247bdf32d400c34633ce58e7626a95342477ba7bd1bee7e550b32cce3db17ae9 SHA512 1a95ba269adb27c8448290113f119d8e4ed6a18d24fc3f2d4c98f66208ec58810cb39019297ad4362d877054994fa4f0990366cbc7a241f0c9042735a14e8528 WHIRLPOOL 085fba2e961d0a371187c39f4186158949347c86fc04b3a42f7d9d5936958090afa10ce7e6ec754aa665dc153e68577047fa6d74838103fb0f48b50c9c87665c
 EBUILD mit-krb5-1.15.ebuild 3864 SHA256 ec62511317c0754144467a732223b1dd1dfb76e5aadd9620d6611c4378a5fc6a SHA512 43878eda33aa3842e46753fe08e3a25e2102ece093b5a86b5a26ef20178917dea34f45c17f97e35d63bb9505dcef07ea26b2403daff3bf4b7df9c8e5423719fd WHIRLPOOL 75e27ef87ac4876d67bf01d4b250d46522e8d45138eaa0adac3c9332dbf93fc644edd09fbcb7ddb055e4f93444422d0faca1df7e19aaa956623f6b5983636546
 MISC ChangeLog 11631 SHA256 47629e47270ddce6f7ff35cf51ae9ba2ab357c284adca567278a4c5b98c06fe4 SHA512 07615910b39d1840caac4849aa054428e8fd5e1725d41920b46755501bcf54d9da0e05cbb0c1c631b4b51ffd99ee1b77d97eab43cc35e1304942b13b46d917f4 WHIRLPOOL 2e096d4afb254dec1a9f10a007f1293c58fd2838d13dc5428796ac19efef27620dec7188980b4dbf98ccbe87209d572e784574bbae764c01adb78f5fe2dbffb7
 MISC ChangeLog-2015 69731 SHA256 b36a2d9ca5172503de725c371c312d47f4eea26af2d43011d1c2c23f6f637a6f SHA512 9d54838fda9eade825266ff2480848c0d1cdd89dba306fd2598f75399eca04440517ed78844d742c17da48cbb6f3c80c6212eed2fba715a0f8dd58f8635badfa WHIRLPOOL 47435d373fa97d0eaa99f92870f7e759b8a1defc0f41b668ea05b3c72b93d0b4d0516639f326417744cc30008a871b20365301c5bf0b6676b22e61d092c7cd4b
diff --git a/app-crypt/mit-krb5/mit-krb5-1.15.2.ebuild b/app-crypt/mit-krb5/mit-krb5-1.15.2.ebuild
index 3c783987b113..627a093935b6 100644
--- a/app-crypt/mit-krb5/mit-krb5-1.15.2.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.15.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}.tar.gz"
 
 LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
 IUSE="doc +keyutils libressl nls openldap +pkinit selinux +threads test xinetd"
 
 CDEPEND="
diff --git a/app-crypt/p11-kit/Manifest b/app-crypt/p11-kit/Manifest
index 2de1bfdbd117..25a848afb9cd 100644
--- a/app-crypt/p11-kit/Manifest
+++ b/app-crypt/p11-kit/Manifest
@@ -1,10 +1,12 @@
 DIST p11-kit-0.23.2.tar.gz 1022733 SHA256 ba726ea8303c97467a33fca50ee79b7b35212964be808ecf9b145e9042fdfaf0 SHA512 b665d89f0d752a41b01ec53e29c801c4fdcaf3f21fce524984b10acef0477ad5dbac085edd35ffb747423d0e1e09660b8d29501c979cf54937d3b9d2561cf18f WHIRLPOOL 03ffdce4b96682a7283e9d473f90f2c50be7de5930e1b3cda420bfd09002f3b0bd23351d5edf97f63f6df02545994628d97cf424fc92f66f3ccb04342ddab21c
 DIST p11-kit-0.23.5.tar.gz 1074479 SHA256 0d8fed192563c324bb5ace3c068f06558a5569a6e8eb47eee1cd79ada3b1124f SHA512 5276db3c9bb14d5e0441e7b781033b1684edfc1d4da88a9c9ce501ed1f6121918d3afe6725ceb0e2d65fc253c2f9eebf37c3380741de6c1b09cec06ae86417a7 WHIRLPOOL 6d641b7884915e3ebd93ffc6a4364fe43269af0e1bd55419d87cddc9a2074d9217f666a968d6b5bad92b4c20f52d062b0164524585460d41c78c3c590aa3b0ea
 DIST p11-kit-0.23.7.tar.gz 1087009 SHA256 988e7c86f2641b36702503481292ef0686e6b1c39d80b215699b6dbf1024be41 SHA512 c9f492220a963726cd1883c276a4a3e607c07f77a34253797beb9f11e671cadcc1b1fa85baa746a0c5bc3f439a8c362e0b2f86796500215fa05efb5446f2baf8 WHIRLPOOL bca4968ade1621339fa98c896b8e4a72a6dea47f56ca2d99d343dd569427e05da6f04428601966c4a4c64e3d56c58f2a505b291ba6f6765385b7ba1629605066
+DIST p11-kit-0.23.9.tar.gz 1091561 SHA256 e1c1649c335107a8d33cf3762eb7f57b2d0681f0c7d8353627293a58d6b4db63 SHA512 6a8a569483763d3ffacadf669b8ba9b9be38a77dd8dc366ca0cb91c44753517fa1879d4422e4e8dfbcac594565727839a619566a170c0f94f8e112f18b0086ed WHIRLPOOL a85f0b4a16e601859c91c872fe35ea51b53ac09e96d2c768fa6122c000eb1cf3c9494a5ccb7e398aa37998cf397e9a9c459c4354666022a98d43c67fef7de12b
 EBUILD p11-kit-0.23.2-r1.ebuild 1334 SHA256 bc8ea0e50f2d6af97c77614867bc2357585933b032a0bf0f3986c028edf1701f SHA512 31ec99aae8be6ed3f4d3c5d2ef260b8b42ea02d053a3e4915c7d0336d4c06fc627b755ce5249bcd6b878a5bcc1e5d944cb2c8a6d53ef545a7ecf0806b54c80ef WHIRLPOOL c38b354b5ee83df1d5cd0a3f637bb1e7f46229ae63c96b6b5e3f537bcf22c6272ee61c124a4eb63b0c25163b15f1c0433e275b5fdd5eaab808902dba36168071
 EBUILD p11-kit-0.23.2.ebuild 1311 SHA256 e918bb48ac4cde60304d5be009fd3dc4771bb16cd85537e485ffa7d8f54cd3c0 SHA512 f953eb10926bdee9eb715cfa4333eea30e238f46795caec23cf495f573fd33fd464705de86c9ab9af55eb98d4652c6204dfce578abc854af44343ece85f3c70c WHIRLPOOL ed12bd50e1b24cfcb6a8c1623704c2411b42c0f33e2568beed6e6ea1d6891014a36964976c1920eb019b11ca2b858aeca6da33fe7805386e838c51da66a6434d
 EBUILD p11-kit-0.23.5.ebuild 1386 SHA256 cb61793e3c36e78222f9cfb0d3ed424c5f5a19961506a898a7da7f490777525b SHA512 57047574af1b8c61b7c2ab0e6c5dd223290c2882cc75e1edd593f0d167dbfc6eea4c30f236dbe361ce5477603a228b7506c8ffcc8ee5f7b7c47d3781af734115 WHIRLPOOL 0dcf06079163144fc4378e109377d5598b9b11f56d2caf6bc42f8a2100eec0bec4d4b7e239409db7f6ef0b762a6eef22b9e83278114810ab08dbd4b84c404754
 EBUILD p11-kit-0.23.7.ebuild 1386 SHA256 cb61793e3c36e78222f9cfb0d3ed424c5f5a19961506a898a7da7f490777525b SHA512 57047574af1b8c61b7c2ab0e6c5dd223290c2882cc75e1edd593f0d167dbfc6eea4c30f236dbe361ce5477603a228b7506c8ffcc8ee5f7b7c47d3781af734115 WHIRLPOOL 0dcf06079163144fc4378e109377d5598b9b11f56d2caf6bc42f8a2100eec0bec4d4b7e239409db7f6ef0b762a6eef22b9e83278114810ab08dbd4b84c404754
+EBUILD p11-kit-0.23.9.ebuild 1990 SHA256 517537f93c466d244c572be9b1519f31e6dab7bf4d3184076253d7118d4608ea SHA512 9c30239189e62486ba7ddecbc114165ae9050f0c1e00d6acca342bc52e5e8f809ae8bd3566dcbf0973aab16d4cdd12dd1c019decd8862289841fae1d0d1e2245 WHIRLPOOL 0aabbabdf2a7b778bfb8dc04ff0460d445a1af5e7d261f76fdbf1543af20e2e39cade00ec3976c3fac78c857b03999708d778e9bf42e931f66d41d2d62c408e2
 MISC ChangeLog 4556 SHA256 cde307bc48b70eb00b3f509219511362f24f0d9663287267fc0b902412028613 SHA512 b1edfc6aaea71a3e32cbf0a49737fb8ee2d167acb2468a9e2d8633c5335a3f428c1afe58c64537e84f1e61f148ac92044db2c71b601ab68fa0fb109e39ad94da WHIRLPOOL 6be14155e597edb221898f270965b194e694e0a7097576e75dc9ff7415cb0e124d4f21e22a0f7db79875d08a4fa2ee3e4fff02f9dcde2f5606751bf90bb347b3
 MISC ChangeLog-2015 10716 SHA256 45958a4c48b0f05be46e6c77968f1b7b77c967556dacc6d9d92304747a6beb46 SHA512 d4dd46224a28f9c076c7d29d961f650e7279798ba6d93bac920f9bb03f4da439395deb8cd92414f0aae66676826f9e9505344502e268c15e9c57d1df80682a0a WHIRLPOOL 960b1bacd3c2354ae85a90beaf83a70945362c81b62f75eb5530274ab4a77baf6e3945621642cdd7b14d3f5a3e8314da6ddd98bb169d91b4adf37803f5d38f09
 MISC metadata.xml 454 SHA256 2a82541283af282acf608730840309189787c777c3c4b1b7c5397c474d16af12 SHA512 24042c945cc3ab622b74c30eaa08819ebce4af9320b083ceb1f3f4db110fba6539121b4dbf0d245afdc395a9854bec022575861f7ae4e9418018d6bddbd4a888 WHIRLPOOL 52bdc923af88314c083c2c62309909292ba6474a2195bd4e9864562a2df7b47a423741befc88b740822f9d380635c9241adfaf0547623213c7284a1d4b99a295
diff --git a/app-crypt/p11-kit/p11-kit-0.23.9.ebuild b/app-crypt/p11-kit/p11-kit-0.23.9.ebuild
new file mode 100644
index 000000000000..4bcaa5230ad2
--- /dev/null
+++ b/app-crypt/p11-kit/p11-kit-0.23.9.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit ltprune multilib-minimal
+
+DESCRIPTION="Provides a standard configuration setup for installing PKCS#11"
+HOMEPAGE="https://p11-glue.freedesktop.org/p11-kit.html https://github.com/p11-glue/p11-kit"
+SRC_URI="https://github.com/p11-glue/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+asn1 debug +libffi +trust"
+REQUIRED_USE="trust? ( asn1 )"
+
+RDEPEND="asn1? ( >=dev-libs/libtasn1-3.4[${MULTILIB_USEDEP}] )
+	libffi? ( >=dev-libs/libffi-3.0.0[${MULTILIB_USEDEP}] )
+	trust? ( app-misc/ca-certificates )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+pkg_setup() {
+	# disable unsafe tests, bug#502088
+	export FAKED_MODE=1
+}
+
+src_prepare() {
+	if [[ ${CHOST} == *-solaris2.* && ${CHOST##*-solaris2.} -lt 11 ]] ; then
+		# Solaris 10 and before doesn't know about XPG7 (XOPEN_SOURCE=700)
+		# drop to XPG6 to make feature_tests.h happy
+		sed -i -e '/define _XOPEN_SOURCE/s/700/600/' common/compat.c || die
+		# paths.h isn't available, oddly enough also not used albeit included
+		sed -i -e '/#include <paths.h>/d' trust/test-trust.c || die
+		# we don't have SUN_LEN here
+		sed -i -e 's/SUN_LEN \(([^)]\+)\)/strlen (\1->sun_path)/' \
+			p11-kit/server.c || die
+	fi
+	default
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable trust trust-module) \
+		$(use_with trust trust-paths ${EPREFIX}/etc/ssl/certs/ca-certificates.crt) \
+		$(use_enable debug) \
+		$(use_with libffi) \
+		$(use_with asn1 libtasn1)
+
+	if multilib_is_native_abi; then
+		# re-use provided documentation
+		ln -s "${S}"/doc/manual/html doc/manual/html || die
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files --modules
+}
diff --git a/app-crypt/pinentry/Manifest b/app-crypt/pinentry/Manifest
index 94c3c438035d..0a951c5f311a 100644
--- a/app-crypt/pinentry/Manifest
+++ b/app-crypt/pinentry/Manifest
@@ -6,7 +6,7 @@ AUX pinentry-1.0.0-gtk2-Fix-a-problem-with-fvwm.patch 1900 SHA256 4121a847697fd6
 DIST pinentry-0.9.7.tar.bz2 432978 SHA256 6398208394972bbf897c3325780195584682a0d0c164ca5a0da35b93b1e4e7b2 SHA512 9c5bc8f7246e8b0affd83fea6e64c47cecf6a12515a82dd2a6712b230306a9c3c97da4dbf6519ea98c85c88bf180a5a2b8c46cedcd594f224e5a08f2f0e35bf0 WHIRLPOOL eb3f72acf6990d61b4279de89a334e68c6052a3edef789aab2a421c2e489c1286b756bf3c9b8e6dd4cee3716e32b53d0e9d41db15a5069e010fe713dfba0596a
 DIST pinentry-1.0.0.tar.bz2 436930 SHA256 1672c2edc1feb036075b187c0773787b2afd0544f55025c645a71b4c2f79275a SHA512 f109236707c51871b5020ef807a551366461fafcfbe09bf8cda19d4b163a42cf622562b905ceb41429f1d648b3f3d27807538709da6a135b67f9888709eccd62 WHIRLPOOL 182d75e37afc40c02705ed6611354eb3429924df9062e64d42e511a5bdac5f7094b351aae406ef243e4a9d6f7db0eb897820bd23ed925b8787941342bc67d187
 EBUILD pinentry-0.9.7-r1.ebuild 3246 SHA256 7f098011d46661c2b5fea2b03ec0402d232b7845564d57e1d56d954f70367325 SHA512 78e797ea8a8f806fbac7a161b82ada7941e80b69dc1a3051d20655abca27dcab40888d6a08d913203c8e2d14308d8e6164249f6ec915ed2c991a763d66d0e8af WHIRLPOOL ede02f69437072f1b2251613078a62f592f682793c8c4fa422be6982f071b563b0a85c4207996f8c5752fa0d176b194ef805d960536f9c3a1434023e9f4c3c3d
-EBUILD pinentry-1.0.0-r2.ebuild 2937 SHA256 06ad681b992208d78fd27bedcc18945706fc6872b712431535d2e70024e74276 SHA512 d47d70f237229c8bf8b4e32e6b04e18033b1ed9918c49d505eb52974e2c7ae107811e0b9d28fc1a0c2df440f8496bf5620f68b26a68ff43c00eaf9c85df457d6 WHIRLPOOL 8503e31336bb9b76e0b4fd857b41a4ebad4d07819689f69ca3edd1f614b8742c4a9112ec107ad7ffa4e8d95c399ac8515ca8ec83479b12f693d1145d2fe338fb
+EBUILD pinentry-1.0.0-r2.ebuild 2891 SHA256 cf272d2edca7c1820120aa9e977a76d5cfa1e0b10a21c5116aec0d5340bd6842 SHA512 809ea7c0e0e61d05046b024267d3ea8779d895c3ced7b8162cde596086544e9ca533461e5ff883a6afe887405edc465ff9f2dd21d716a494991f6445584ddb9f WHIRLPOOL 690c4e40d791a5749e126e53232ba7fe3086272f1e715757d8614702fb852b04a1d316a7dce81a0ef728db05c2123b3539ab2daa322e24d4daa4fc752bc46de0
 MISC ChangeLog 9508 SHA256 c9cc05ed15e6ab1341299c3fb985fdd2d8a9539e62d73a16b4dd8f5815bbeefb SHA512 7ff10fc6c2e2621c475ebb0805b63092d8d9fd56b40d69fa4669a4456c5900644aa51b758b92086621035b83e4f728fcfc20d2d8a13e53194d7ef88b3aeb3fa4 WHIRLPOOL 4dac379391947f44aec42b9c3d71b01f46700ede56347dea6b73d9771c7e55cdcbdbdec20cf7781119e1aaf4d3dd822eb423a4810ff3657a8d76dd1768f2a6dc
 MISC ChangeLog-2015 25487 SHA256 599f868331443fbdf95c4b9ef073517aeb355df82a2878199d311310891ebaa1 SHA512 b6cbb7b6abb7ba7e70094d334d18da227aec8b0e7654af58736fd6a5626dd178c23ac7524abddaf2dbf67037f117e98d6bf4a3757f0c2bb9428e55f0154c8f96 WHIRLPOOL 7683a728f4a93c78d60061a1a85785a3a7271e5854a81e7485fae2760190d49edd1d43e68db525ffc785a1ae45cb52b7df7af9a47d77b84c8a5c397ee4a29d56
 MISC metadata.xml 352 SHA256 7fd48348fd50b298029c84f873443f5b826fb46f05437440cef6dc2e1ce3773e SHA512 3817eb6ad931ab0ee363ed7f8612b08a44c0d02e7abb9d0734452c289350c9909ca4208acad01c54a3f1b260417c400f4692e37b34113c6d618680d41796e2d0 WHIRLPOOL 46aba74d2e5243e320da11ac8193123ec2576b4fa7d6c904a494b8e234716afe4a90fe1c2c6ea211b40b53edef261eb1735200950563ecc1592d213c66d40ad8
diff --git a/app-crypt/pinentry/pinentry-1.0.0-r2.ebuild b/app-crypt/pinentry/pinentry-1.0.0-r2.ebuild
index 029bf96660fc..a5e41681c2cf 100644
--- a/app-crypt/pinentry/pinentry-1.0.0-r2.ebuild
+++ b/app-crypt/pinentry/pinentry-1.0.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="caps emacs gnome-keyring gtk ncurses qt5 static"
 
 CDEPEND="
@@ -39,10 +39,8 @@ RDEPEND="${CDEPEND}
 "
 
 REQUIRED_USE="
-	|| ( ncurses gtk qt5 )
 	gtk? ( !static )
 	qt5? ( !static )
-	static? ( ncurses )
 "
 
 DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )