11 files changed, 38 insertions, 25 deletions
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 3f8e277a2020..23472c5fe25f 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/efitools/Manifest b/app-crypt/efitools/Manifest
index c72c714f8e9a..cd154ca9f10d 100644
--- a/app-crypt/efitools/Manifest
+++ b/app-crypt/efitools/Manifest
@@ -1,3 +1,4 @@
+AUX 1.7.0-Make.rules.patch 296 BLAKE2B ca12dbe2f0bb60cffcbe2646a99f421e1f7f9d3b9eab0c96481cbbcfe064efc81afb25e8819746051e3f47b325eb97d213b7ebf95df60a195a5d16d68332f42d SHA512 a8d6245b09e80e2c9082589e62c2687234ee7838d19255e07aadfd05ddffdb1817e38eac434e71d5f0e19b7f9a88a51126349ae4aa324a634769050dbf433f0d
 DIST efitools-1.7.0.tar.bz2 96042 BLAKE2B b0042df906282d878b1400c359c1eece24588f5df7ab753b62f5f0b95e97467cfaa17e04a2ef40a7ec85155c4d13bd438dd94471e0ec98ab23030dd54e7d4214 SHA512 1e839c5565b0a113569cf47bf98d656875f9a127b481287a553e8b1276969021e1a39a730b9ede3852e15d1ac045db7ec64767f5ac71a24567236c0938697ccb
-EBUILD efitools-1.7.0.ebuild 693 BLAKE2B 849fd73392188d0cfd3112fab3fbb57edb109a327c46a1675ec5fd69f39a29647579b221a6c7c28ec9c321f3bea3c108777f26ed6a717c32b796c2c26083536a SHA512 6bd2ca3c90dda101443dc94a7403e2dfe736f993104d2eb0e0746af21826716e3e137946d8309e2482244f27aaca693585f46e4f4f76f5eaf37d54bbdfe05f8d
+EBUILD efitools-1.7.0.ebuild 786 BLAKE2B 8a842f23c5e7ec1afa535dfd7448503a1313cd026eaab72961a517ca223d04ac521cd6ce7c98c920de079c33549b164aa544b44fdfe73c76bd46e7444da2fb28 SHA512 40132fc48114b2baebb590e1b6ac4a32961c1ab6d7393ecf80223fab6bffb6cccc8da1123c67f967602982a23ecc82a1f106856d39ba73862ce5ddf2162d3e18
 MISC metadata.xml 139 BLAKE2B b4a59c22790dfec3fbcfaea41ef363401766736b68a85bedae00e1944d0a848aa97104c2f34244c0fe7b6363029281f965fc1b3545301d341cda371eaa976274 SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be
diff --git a/app-crypt/efitools/efitools-1.7.0.ebuild b/app-crypt/efitools/efitools-1.7.0.ebuild
index 0baf83e20fc6..63c9fbec0513 100644
--- a/app-crypt/efitools/efitools-1.7.0.ebuild
+++ b/app-crypt/efitools/efitools-1.7.0.ebuild
@@ -3,6 +3,8 @@
 
 EAPI="5"
 
+inherit eutils
+
 DESCRIPTION="Tools for manipulating UEFI secure boot platforms"
 HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/jejb/efitools.git"
 SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/jejb/efitools.git/snapshot/v${PV}.tar.bz2 -> ${P}.tar.bz2"
@@ -24,3 +26,8 @@ DEPEND="${RDEPEND}
 	dev-perl/File-Slurp"
 
 S=${WORKDIR}/v${PV}
+
+src_prepare() {
+	epatch "${FILESDIR}/1.7.0-Make.rules.patch"
+	epatch_user
+}
diff --git a/app-crypt/efitools/files/1.7.0-Make.rules.patch b/app-crypt/efitools/files/1.7.0-Make.rules.patch
new file mode 100644
index 000000000000..89665ab3b690
--- /dev/null
+++ b/app-crypt/efitools/files/1.7.0-Make.rules.patch
@@ -0,0 +1,11 @@
+--- a/Make.rules
++++ b/Make.rules
+@@ -71,7 +71,7 @@
+ %.hash: %.efi hash-to-efi-sig-list
+ 	./hash-to-efi-sig-list $< $@
+ 
+-%-blacklist.esl: %.crt cert-to-efi-hash-list
++%-blacklist.esl: %.crt cert-to-efi-sig-list
+ 	./cert-to-efi-sig-list $< $@
+ 
+ %-hash-blacklist.esl: %.crt cert-to-efi-hash-list
diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest
index 7dea2edc714b..7a0ea851a0f2 100644
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@@ -4,7 +4,7 @@ AUX gpgme-1.8.0-cmake.patch 1216 BLAKE2B 40510d7d2b700a58f12436ae81c2b978dcff450
 AUX gpgme-1.8.0-gcc-7.patch 554 BLAKE2B b31ffa5f08203dd0b896c04b47b0cb0d4916c7170c87e5ab8bf45896058817668660a0ee1648f2111a3d8c73bf896df015b4b371c95a1caccc7450dfe0792017 SHA512 3256a04a7dfeb7b3b5a20765b6350454069f2a96d79c786326868513a8b87f5337084a0e2a5afeab0485257b4b360ba2fc9f56f08bbc0c102d75773ba83c44f7
 DIST gpgme-1.10.0.tar.bz2 1370162 BLAKE2B b421d91a4fcd2e8887dc1a5c276fe1cce66f379741d86dfca751f4863039c39ccaf492c7683d6f6a0de407d2a6056e3496e45e3d472eef36a879e8b903e58c57 SHA512 8ffa348ef4775ed3209486444d54411e28c9a0ff1d7a4315feb0b2856ccd5d110b219100ea41262ca0016af69a1936d79fee0eadf2599c7c5bbeed05d11f7ab5
 DIST gpgme-1.8.0.tar.bz2 1298407 BLAKE2B b510651d0df12091489bccf6a432420db63337cfe5149d0449cef9071cbb671a52f7837d900b4d2e40deaa47688b1ea19a025ce8c930027a14620410228bff52 SHA512 9f214a44ddc4d602c2a0befc66aa6be9f2c90a24e153b873475867e30eec30e074826b98c11d20b0a2e4cd04e2625ce2545220481225fceb6ca9c51d3208e3de
-EBUILD gpgme-1.10.0.ebuild 2911 BLAKE2B e3623c27f03057f96a9e304e09e4df4aa46e36eff1875cf359aeef5ba8fe938fdd478a227b786afeed5538343f2971adeb40b30fcd126bcbadaa8c82f36037e1 SHA512 039a593771cbcae2767d4018b6bd317926e82cd2ffcc5470f0f413c1a9d79e46412cdd6247e8da43db3c3672ec58ecc17c90648dca8fc9c41741f3ec9be8fb52
+EBUILD gpgme-1.10.0.ebuild 2609 BLAKE2B 80f21fb323ec7c00f0a241870b0be3b8391b51fcdb41d1dfe51f798d7a8687d65eed0edc08f1c7af696c5344f5f4d65aa99c2d8c820505a39f1548c7072f5e06 SHA512 63db50b7d3aaa52ad35235f98b7d708c4eae617e6dcbcbad274e2422d439595b6e6f211758a7dc543639d99f0fc22cb238bf187f910bfadf334b396058d6dc7c
 EBUILD gpgme-1.8.0-r2.ebuild 2530 BLAKE2B f51880eb8800e66df6954ccb73e2e330f69ea553c52d187bacb00921306c8250204d14dbe748612cdd4958ca5728e1f80914eedd42367bf70225ec173ec32c18 SHA512 d1f5f1aad5bb8de38ff049084d81443c82fe88ddd720a5770e89fadb00d06094493d1911d033ebcd6ae8cbf1117e9b921465d0730b2a17730420895dd60c9244
 EBUILD gpgme-1.8.0-r3.ebuild 2682 BLAKE2B f04e23cf0773a36e380ad71e4603ec2b26583eddf25670946d4d05f134c18da8ae830cf0228417853ea97e4472e7284a87c3ac50099156de3b569961baa6827f SHA512 b6beaec93a62270d5e87b5f3798655ce3c48b3da65947904ec7667963ba39d28d9e032eb72477ff88ec68922c677b1b921daf2bed1de09c9f48e0c788fd394cb
 EBUILD gpgme-9999.ebuild 2787 BLAKE2B 264fdf2cc60ed4a87bf1ed7897a24b56e16a16729d96c00922fb48a2413e899209154d4587698436c3000ce1b575b590d5d5ad2215fe3d2808367e1629424c7a SHA512 a70e660dfc2740c339a6d28875bb85c58438d384adb439c779884ae3e1446042e8e59918f44fdc0a55be57b66848ca64532298d9d560069c7319506664191477
diff --git a/app-crypt/gpgme/gpgme-1.10.0.ebuild b/app-crypt/gpgme/gpgme-1.10.0.ebuild
index 513d108c1747..d10d5c4e145d 100644
--- a/app-crypt/gpgme/gpgme-1.10.0.ebuild
+++ b/app-crypt/gpgme/gpgme-1.10.0.ebuild
@@ -48,6 +48,15 @@ pkg_setup() {
 	addpredict /run/user/$(id -u)/gnupg
 }
 
+src_prepare() {
+	default
+
+	# Fix too long socket path for gpg-agent, this is mainly a problem
+	# for Prefix, where the builddir is deeper in the FS tree.
+	sed -i -e '/GNUPGHOME/s:$(abs_builddir):'"${T}"':' \
+		tests/gpg/Makefile.{am,in} || die
+}
+
 src_configure() {
 	local languages=()
 	use common-lisp && languages+=( "cl" )
@@ -59,21 +68,6 @@ src_configure() {
 		export MOC="$(qt5_get_bindir)/moc"
 	fi
 
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# FIXME: I don't know how to select on C++11 (libc++) here, but
-		# I do know all Darwin users are using C++11.  This should also
-		# apply to GCC 4.7+ with libc++, and basically anyone targetting
-		# it.
-
-		# The C-standard doesn't define strdup, and C++11 drops it
-		# resulting in an implicit declaration of strdup error.  Since
-		# it is in POSIX raise the feature set to that.
-		append-cxxflags -D_POSIX_C_SOURCE=200112L
-
-		# Work around bug 601834
-		use python && append-cflags -D_DARWIN_C_SOURCE
-	fi
-
 	econf \
 		--enable-languages="${languages[*]}" \
 		$(use_enable static-libs static)
diff --git a/app-crypt/libu2f-host/Manifest b/app-crypt/libu2f-host/Manifest
index d879ea63c009..f3724d79b5c5 100644
--- a/app-crypt/libu2f-host/Manifest
+++ b/app-crypt/libu2f-host/Manifest
@@ -1,5 +1,5 @@
 DIST libu2f-host-1.1.1.tar.xz 455652 BLAKE2B f5cc4dd7752d66790b4139e5b8e9262f6622b9608bc8b220640db773ce1e794b58eb3fdf855df4e73417aabf5f8e979218dfd1b068111c66c6d830ef4b7ebb97 SHA512 1f6d26d47cabd44391a780f03d88b6ab9ed996bab26e2605f1942bfff2203aa9a8e90fa80c010ccf2e575dbfca3bd03d3322381343cdf6def3829bbe45db8693
 DIST libu2f-host-1.1.3.tar.xz 469480 BLAKE2B b2a002fa694972e71aef73191608d079f1c13d98a2f40e06d25a6e50a3175100099adbc5b5067e5f1fe027042f99e198a07282df735ab4ff2eec63a4f5daf59a SHA512 6729dd35beaae1c96283f81794ac6c058ed6446f935a5cee7dc1a3db594201c9f049de6a58ac2e544e1c6ac0c1e9815cce5e2e46a6e45372e419078307a57f55
-EBUILD libu2f-host-1.1.1.ebuild 1296 BLAKE2B a225d12885cb3293a0fff2f082fecf528310eb2702ac1f5899ed745cb571c6eeff62f2e9f3227d7ead6b6ad59e1a2ddeb92f976e2e22f30a6dc3a226ae3d38ce SHA512 ef4064dcc84ae1e8a81a2a2166d473fb55c26bddb22277c34893a781a51d9795791695220bc2fab83821989961b4f85afaa59475449833268232f46dac21f3b6
-EBUILD libu2f-host-1.1.3.ebuild 1184 BLAKE2B e31bad776bc4421711d105548ce46944f207ba093131ed20a63f1de513189e6c6ba8b4532e556887a6f8457d9ad63cb029982dd90071cfe699c42a051c671aab SHA512 e06431734bd83ba4bc67209650dd344e2c3b944b6823363fcdd9c644274490f7888b0fdd15c8d1dfc5b59a83591981c8810c9e7f715cc79c2d136761dce91dd8
+EBUILD libu2f-host-1.1.1.ebuild 1298 BLAKE2B 3eb0abee39181c3aea3cf63bbc59655732a0b8ec28bbc7260694e25f545749fcf0d7bd20aff6f7a3575d56d52c7ae8094dc7954ac76c5f9921ebd21a5a376248 SHA512 c5422305f55e948d20c2b954710b97a61a6b3e8ce48dca1950967c2a6c02e6d63b0530ab427fa5c48a90802544b4b13dcee8ccb88c9e1df814549219db1bed1f
+EBUILD libu2f-host-1.1.3.ebuild 1186 BLAKE2B 20a64efdf2fdb0e43778a726abaa6c57cb5dbe48063457f7a94592e75f033e60ff0f3b157b5f1057fbc372329b43939ee663d95509ccedf22ffa04ab2d06cc54 SHA512 5a32629523690898a179f86b92c472e8b84d45db95cc2541e988cfc7901c3d85ec82261c0eaf3f4756a47b0c3a1830c39af445a8a1beb616c183dd900e712bed
 MISC metadata.xml 550 BLAKE2B 992fdc0643bed1c1122b544947535745a7209552387c3e6917942eee04cd33bd613f78f5e447099493b56e133d88095d958a8816f1b1ba65d34944ddb3210eea SHA512 9970724fffe49705d8dedc85522cbe3040c4e542fa5a56c2cbc428df2540975e76a84fe8c4819bfaacc085cccdf6e5a996a058c14f561b9ef10c7d705f98bfa0
diff --git a/app-crypt/libu2f-host/libu2f-host-1.1.1.ebuild b/app-crypt/libu2f-host/libu2f-host-1.1.1.ebuild
index 418200fcb7b5..6d1773945177 100644
--- a/app-crypt/libu2f-host/libu2f-host-1.1.1.ebuild
+++ b/app-crypt/libu2f-host/libu2f-host-1.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,7 +16,7 @@ IUSE="kernel_linux static-libs systemd"
 
 RDEPEND="
 	dev-libs/hidapi
-	dev-libs/json-c"
+	dev-libs/json-c:="
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 RDEPEND="${RDEPEND}
diff --git a/app-crypt/libu2f-host/libu2f-host-1.1.3.ebuild b/app-crypt/libu2f-host/libu2f-host-1.1.3.ebuild
index 6d9c891c4722..129a3f8c98c1 100644
--- a/app-crypt/libu2f-host/libu2f-host-1.1.3.ebuild
+++ b/app-crypt/libu2f-host/libu2f-host-1.1.3.ebuild
@@ -16,7 +16,7 @@ IUSE="kernel_linux static-libs systemd"
 
 RDEPEND="
 	dev-libs/hidapi
-	dev-libs/json-c"
+	dev-libs/json-c:="
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 RDEPEND="${RDEPEND}
diff --git a/app-crypt/libu2f-server/Manifest b/app-crypt/libu2f-server/Manifest
index 111795c35f7c..329546471a2f 100644
--- a/app-crypt/libu2f-server/Manifest
+++ b/app-crypt/libu2f-server/Manifest
@@ -1,4 +1,4 @@
 AUX libu2f-server-1.0.1-tests-fix.patch 1486 BLAKE2B 19b37973a2efcbdbca285e59baf7f1d4c03abd4592f9ed988cd02c6bfea892c2ee3db1cf36621f685da1ab5075219e05ff2dc6752dcec30576aac271ec57b0b6 SHA512 3283f95308f72a13ce8575969992c633705eacacf3c01546d1fd8c35c3a5499a1229d8dd34f493075b4f145f2e722fed6568d75c8f37729f6b18d5b9bb553e45
 DIST libu2f-server-1.0.1.tar.xz 268648 BLAKE2B 9c6c2e5bafb2a95fcc5c2773de49b4db197ee6283e90cf0e4e62ff3982bdde8a51635cd9771e4dd35d27c71634367197d3b01b9c26d8a3847fccf1daf676f04b SHA512 51020722f49f787c793808b667e91923bde46e9137bfe5065106f83bcdb678e8d11cca12cb605d9622cafc15a9794c9080cf08e2a704293a791ab6f27ac47f47
-EBUILD libu2f-server-1.0.1.ebuild 1139 BLAKE2B b62702ed8454fcf2efed9846ec7a05c0ca69993f26d14c6aca2c7916cdb4cbb0c2d23b0b8ad1096a5fdb8b998a8c8098ed0d4adf7c6db7ff09190da6e724e549 SHA512 8498e04c2d4c9e59a94833d58d7a3d450fd205950022a141569c8c26314932b7f167ca43143ce8738d6fa6c0e5df092631471dcd54a225f4fa62a38f986afdbb
+EBUILD libu2f-server-1.0.1.ebuild 1141 BLAKE2B 940d5c772e94a0e77a72b56330a1c013da2588d573edb999a2d0af4cda5c8b62f07ea92eba0b45fb763200f6c7edf7f47bd115cf8bd4972e1681a6b0d9145bcc SHA512 6050266c78936ca416549483ded7beeb8866a23ca7cdebf0b5a973191bf27af0ece5cecf27c784c4abe8d1edbcd073baa7150236531d45dba18036dd20315459
 MISC metadata.xml 377 BLAKE2B 622be42ce59a73110486a236479bd63f03c384697f3f98908a83cfdb54e6020a27b31b16c9e32fc96327a3a4e198601fd7a58ba7403a3f7d498cd3d90412a4ce SHA512 361c84dbc545a3abc64b10dabe57f6286055a5ed7f41f87189240a24406e735f2d79fbbe166c1240536057abe376ea0d4f5ec2d91b6b9fc90c8210c5d2b8ecaa
diff --git a/app-crypt/libu2f-server/libu2f-server-1.0.1.ebuild b/app-crypt/libu2f-server/libu2f-server-1.0.1.ebuild
index 803c78639a95..823be1308e3d 100644
--- a/app-crypt/libu2f-server/libu2f-server-1.0.1.ebuild
+++ b/app-crypt/libu2f-server/libu2f-server-1.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ RDEPEND="
 	!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
 	libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
 	dev-libs/hidapi[${MULTILIB_USEDEP}]
-	dev-libs/json-c[${MULTILIB_USEDEP}]
+	dev-libs/json-c:=[${MULTILIB_USEDEP}]
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig