7 files changed, 143 insertions, 1 deletions
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 68b79a585dfc..24092fba8d3f 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/libu2f-server/Manifest b/app-crypt/libu2f-server/Manifest
index 329546471a2f..aaacef6d225e 100644
--- a/app-crypt/libu2f-server/Manifest
+++ b/app-crypt/libu2f-server/Manifest
@@ -1,4 +1,7 @@
 AUX libu2f-server-1.0.1-tests-fix.patch 1486 BLAKE2B 19b37973a2efcbdbca285e59baf7f1d4c03abd4592f9ed988cd02c6bfea892c2ee3db1cf36621f685da1ab5075219e05ff2dc6752dcec30576aac271ec57b0b6 SHA512 3283f95308f72a13ce8575969992c633705eacacf3c01546d1fd8c35c3a5499a1229d8dd34f493075b4f145f2e722fed6568d75c8f37729f6b18d5b9bb553e45
+AUX libu2f-server-1.1.0-disable-help2man-gengetopt-checks.patch 1137 BLAKE2B fc1d8287d590acf1385747091195e4401f9c3cba2ad6c0911f2ca549504569250567ef5e1b64124b5545460ba53e7e61354c4393051c275212b40c5a70764dd9 SHA512 cae13f6c9738be740055d0d26a7913f84bee0edf3df06d8a4e3da39dbcd7dd24ca19af638c1f00c3e45d68389e9ae842ab2a92ccd690a04af610646705edd498
 DIST libu2f-server-1.0.1.tar.xz 268648 BLAKE2B 9c6c2e5bafb2a95fcc5c2773de49b4db197ee6283e90cf0e4e62ff3982bdde8a51635cd9771e4dd35d27c71634367197d3b01b9c26d8a3847fccf1daf676f04b SHA512 51020722f49f787c793808b667e91923bde46e9137bfe5065106f83bcdb678e8d11cca12cb605d9622cafc15a9794c9080cf08e2a704293a791ab6f27ac47f47
+DIST libu2f-server-1.1.0.tar.xz 269128 BLAKE2B 084b177a878e8216f2ee5af9eeee11e691edcd12b7ed1b1c57f74bcc45f0418a0d44a9e72423c41b4104aa9f69807a0289172d08d21d168c6be5b36ee8c70bc3 SHA512 ebdb7c8c20727f37f4e31d8f16df7966603374f78478ada723a7b9bec1b0b0622caf6d12a65067ac8651f6088aaad61b2ad6ed51b9d6ef0dc45f031c974d8ff9
 EBUILD libu2f-server-1.0.1.ebuild 1141 BLAKE2B 940d5c772e94a0e77a72b56330a1c013da2588d573edb999a2d0af4cda5c8b62f07ea92eba0b45fb763200f6c7edf7f47bd115cf8bd4972e1681a6b0d9145bcc SHA512 6050266c78936ca416549483ded7beeb8866a23ca7cdebf0b5a973191bf27af0ece5cecf27c784c4abe8d1edbcd073baa7150236531d45dba18036dd20315459
-MISC metadata.xml 377 BLAKE2B 622be42ce59a73110486a236479bd63f03c384697f3f98908a83cfdb54e6020a27b31b16c9e32fc96327a3a4e198601fd7a58ba7403a3f7d498cd3d90412a4ce SHA512 361c84dbc545a3abc64b10dabe57f6286055a5ed7f41f87189240a24406e735f2d79fbbe166c1240536057abe376ea0d4f5ec2d91b6b9fc90c8210c5d2b8ecaa
+EBUILD libu2f-server-1.1.0.ebuild 1189 BLAKE2B 60714dc0ad14aebecc66c7053c87da0cca583e381af7435ada3a3cf8de4883042cd7c0ef55e0130e55ba97cd04da6df94ee4200a98e7e6fa9e69fff079dc7f84 SHA512 bb2effcb226d6e00c234678613d1b17b9cd498eb51b27bbf907f941b7bc2555ca9824a2c4b0a9cbba3defbdbf781523c658bdfcb0e9e0c456ccbe0a42f2a65eb
+MISC metadata.xml 471 BLAKE2B 7fcdf8c4250dc67abb3e25e21dc602281b4030f38d3c2ed005685d0f9e1446bde39b451bf1240b3f1ee21b1622a01bd46ee838a03159eab24d3ac49a9c828688 SHA512 fd084dc4df2cdfbe25c7818605264e89e430a84f4c74ab1db5d798f510848a1d0208f178b5536be2f86ce3dbd8ba028f34e342363dffdc09f01544f748799db0
diff --git a/app-crypt/libu2f-server/files/libu2f-server-1.1.0-disable-help2man-gengetopt-checks.patch b/app-crypt/libu2f-server/files/libu2f-server-1.1.0-disable-help2man-gengetopt-checks.patch
new file mode 100644
index 000000000000..2dbe28b5aa68
--- /dev/null
+++ b/app-crypt/libu2f-server/files/libu2f-server-1.1.0-disable-help2man-gengetopt-checks.patch
@@ -0,0 +1,37 @@
+Reverted, removed the second hunk about dev-libs/check, and further
+adjusted. The tarball already contains the man page and gengetopt
+generated command line parsing, so these checks are useless to us.
+
+From fbd340d1c777e23b66ef27ce1c03c4eb3bafc511 Mon Sep 17 00:00:00 2001
+From: Thordur Bjornsson <thorduri@yubico.com>
+Date: Thu, 12 Jan 2017 14:28:31 +0100
+Subject: [PATCH] auto: Check for help2man/gengetopt, and bail out if not
+ found.
+
+Both are required to build.
+
+While here, if `--enable-tests` passed, check for `check` and
+if not found, bail out as well.
+---
+ configure.ac | 11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index ad409a2..6decb78 100644
+--- b/configure.ac
++++ a/configure.ac
+@@ -43,14 +43,7 @@
+ LT_INIT([win32-dll])
+ 
+ AM_MISSING_PROG(HELP2ADOC, help2adoc, $missing_dir)
+ AM_MISSING_PROG(HELP2MAN, help2man, $missing_dir)
+-if ! which help2man >/dev/null ; then
+-   AC_MSG_ERROR([help2man missing])
+-fi
+-if ! which gengetopt >/dev/null ; then
+-   AC_MSG_ERROR([gengetopt missing])
+-fi
+-
+ gl_LD_VERSION_SCRIPT
+ 
+ PKG_CHECK_MODULES([LIBJSON], [json-c], [], [
diff --git a/app-crypt/libu2f-server/libu2f-server-1.1.0.ebuild b/app-crypt/libu2f-server/libu2f-server-1.1.0.ebuild
new file mode 100644
index 000000000000..b2ada443d400
--- /dev/null
+++ b/app-crypt/libu2f-server/libu2f-server-1.1.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="Yubico Universal 2nd Factor (U2F) server C Library"
+HOMEPAGE="https://developers.yubico.com/libu2f-server/"
+SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.xz"
+
+LICENSE="BSD-2"
+SLOT="0/0.1"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl static-libs test"
+
+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}]
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? ( dev-libs/check[${MULTILIB_USEDEP}] )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.1.0-disable-help2man-gengetopt-checks.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+	touch man/u2f-server.1 || die # do not rebuild the man page
+}
+
+multilib_src_configure() {
+	myeconfargs=(
+		--disable-h2a # tarball already contains the manpage
+		$(use_enable static-libs static)
+		$(use_enable test tests)
+	)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-crypt/libu2f-server/metadata.xml b/app-crypt/libu2f-server/metadata.xml
index 2d0a0e34de1c..2c6ea3e58924 100644
--- a/app-crypt/libu2f-server/metadata.xml
+++ b/app-crypt/libu2f-server/metadata.xml
@@ -9,4 +9,7 @@
     <email>gokturk@gentoo.org</email>
     <name>Göktürk Yüksek</name>
   </maintainer>
+  <slots>
+    <subslots>Reflects ABI compatibility for libu2f-server.so</subslots>
+  </slots>
 </pkgmetadata>
diff --git a/app-crypt/xca/Manifest b/app-crypt/xca/Manifest
index 6d06adcc7c32..1fb8b353e670 100644
--- a/app-crypt/xca/Manifest
+++ b/app-crypt/xca/Manifest
@@ -1,5 +1,7 @@
 AUX xca-1.0.0-desktop.patch 391 BLAKE2B 1cbec5681df8da9230b783c8ea048a199bd31a38fce6781dcd86b926e03b245de05b148d8df9034f5c7470dcf5823bd4a080cbb011a1a32fc0b96d8a8a5d950d SHA512 5dd62d8d2f4485b6155e466bb9a012f44104ff36c97bae61e8155880b937fc1271e94fb5b83627bd828e3cde0ab421a150458d050cb512d633d1c5c97f80f163
 AUX xca-1.3.2-build.patch 5871 BLAKE2B 5870a5b5a6331f33f43b303703ab4346bfc150af0bf3a5cd11a357ca48311abb35ba6d426a12f393a61b29e0edd53702856e7b986ac83b25741cd3ffdc08737b SHA512 1007fa6aa54273e1d279965ea41945063288eff72622325bb61086b288234fcba45f962ced77ddc037f1a64838204614b1a15b1b47d8d7a7b7699374bd54938e
 DIST xca-1.3.2.tar.gz 897947 BLAKE2B b12cc95c908187d78304ce93111c89bb8e0dc01ecab37e0ad1bd78f84a90ed9f44afa4ac35d22185b7018e238b476e496fca3c2b3a240bf654d2e5160e784b11 SHA512 f0a9c4d47f0c20632f44364cc55293a7d2152772a746a72bc4a46622da4e48ae612bafe918c098a71c29cdfca8e6c03c27cf85a862ca0f356eddf061414c89b2
+DIST xca-1.4.0.tar.gz 940245 BLAKE2B 1f0c9d72b647fa803c2b6b6019b0b9828f37b1d38d89838ac6102d560b1c930c0f962e9064d984540b0c8e14d7546529af978673955555283afa1f089af7ce7c SHA512 b220adc7551cf853037c4f5ef0cdd8eef1dda44d0fde634cfde35605396b988452bdbc97a60459911f663d6d6977d426f27f47a46a482d1a30331ac06862c1c9
 EBUILD xca-1.3.2-r2.ebuild 1107 BLAKE2B 40eaa44f511936f3be91eda8632bafba91511e9596e0fffdca6f53acf75e2fe11d6725e136cdc8c5d1fcd1bc4ec467dbb26f5c29ed9763185447c5ebbf59a6d5 SHA512 9379423c902b218ba5b7d60de2d8074c05e7a65a2223e723429ae47f4ef491b215ab3c68d2204f80b9d88a16207b4b30c993735e73d0ff2f5ed38b4588190de4
+EBUILD xca-1.4.0.ebuild 948 BLAKE2B d1cb112f8b1214c346f612d4c63bbc1a456a29f2a5bb57d8f86148fcad51ee4e74ad8871263f45618ee4bc1b894926d4a0576abe4d3c7b20269fc3d1e761e6b1 SHA512 31929fba97fa0a3c4c74849ecd23cfa56786cbd64af748cf4e521f534fb4a613013016dd271e81d6f2632464987359ed6f026be2d1f01f53ddc531cf225968e1
 MISC metadata.xml 313 BLAKE2B 6e1376d870ee5ab083ed80dcc19c1acd60d487e285e9bdba7b92c13e97cb05a3a6fa8bc4c6107d5d54470e6ca93889fca15c1a2f7e690a169ca7aff64bd2499e SHA512 ebc38746afd94878384ef0e4d7933e2a7433216716b1854cfc0227c3f0abf0847d784d36de4b04a778743e442298abd3769329deecdc771003681ecd3dbf3fa1
diff --git a/app-crypt/xca/xca-1.4.0.ebuild b/app-crypt/xca/xca-1.4.0.ebuild
new file mode 100644
index 000000000000..dfa838fead8d
--- /dev/null
+++ b/app-crypt/xca/xca-1.4.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="A GUI to OpenSSL, RSA public keys, certificates, signing requests etc"
+HOMEPAGE="http://xca.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="bindist doc libressl"
+
+RDEPEND="
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	!libressl? ( dev-libs/openssl:0=[bindist=] )
+	libressl? ( dev-libs/libressl:0= )
+	doc? ( app-text/linuxdoc-tools )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.0-desktop.patch"
+)
+
+src_configure() {
+	econf \
+		--with-qt-version=5 \
+		$(use_enable doc) \
+		STRIP=true
+}
+
+src_compile() {
+	# enforce all to avoid the automatic silent rules
+	emake all
+}
+
+src_install() {
+	# non standard destdir
+	emake install destdir="${ED}"
+	einstalldocs
+
+	insinto /etc/xca
+	doins misc/*.txt
+}