gentoo resync : 21.09.2018

23 files changed, 178 insertions, 386 deletions

diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index e5c20df5bb5a..dfdacb9a10c8 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/argon2/Manifest b/app-crypt/argon2/Manifest
index 04e03a7060cb..d9e0ae3010a8 100644
--- a/app-crypt/argon2/Manifest
+++ b/app-crypt/argon2/Manifest
@@ -2,5 +2,5 @@ AUX argon2-20161029-makefile-soname-symlinks.patch 807 BLAKE2B 128d7f8db6bc85839
 DIST argon2-20161029.tar.gz 1506864 BLAKE2B fbb0588439e811666af027710d1e5ef182b4d1c9012ca2c60d22ce103ceca14bb392dd8916b37c1c07799dc97f9401aa66d3bd08b250dd48314aa57a8599dff5 SHA512 e1f947a97e8b5f292dd32a6f1ea0ef3f2e411629218653821886ec4e1d5f8289d5b8f4b8bf0a37e69c344a83b975c695947d6b49fd2001a0e4273bebd4792892
 DIST argon2-20171227.tar.gz 1503745 BLAKE2B 70171ce1b446974e18e6f7077f436c6b78f29fd3eb075314014219280fd984e51b00137d901175da5fcb8a8472df0cbb16ff0333a2f2f098e52d3e0ea496e2cc SHA512 9c9e1a3905e61ac6913d1e073c104477e419ddd0506adc4487e88e98d19165ed8901fe8bb11246ed0cc71b3523c190da9692d5926642f86be09c3e67510afe4d
 EBUILD argon2-20161029-r1.ebuild 1059 BLAKE2B 5af6cfcc657b155477979103e641b1449c3c95430aed7594d5a7678b6c1622672e4b8581b6465721a8645065dd3bbf8c9be9bcd6d58f8f44c8844c9a4de09992 SHA512 bf74945ccbea5cd3017a91502a4ce67c5b39b02df1882b175c9d3c857b70914f3f91d41b10c7c46fc82ee4ab8e03b4b0b291e9f16a3a41f8f54f28216533ffec
-EBUILD argon2-20171227.ebuild 868 BLAKE2B ff655ad549041be83b9c78b9043941acea6999af45fc3016deaa3abd2511cada2cbbbc245209c06d12cc56faa350cae623db748fb7cbc6564fa4fb9d9b20e1ff SHA512 3f452417a3875a4483e0444515fca39d0698e07bf0158454280e4d26b3cd34b2c175b4cabc5f3648c61a89490113d17e539bd93a2da3294bb7dce1ec2cff56ee
+EBUILD argon2-20171227.ebuild 887 BLAKE2B 5b958383709e24b7847849c097072da8e06dddbe29800077ef803e8804d560b5d4b123abe7ba104b6ad4805e63cf0d1f76d2391a538875a28e0bb72be60381f5 SHA512 9b4473eed1827efc5edc135c8efbb65cc950f082244a7cf78bdf4a279cd6c84d77e1fe607b7f4b65c44c815f979a54c6aacab704612106d8947ff81d0c811dd1
 MISC metadata.xml 660 BLAKE2B 1843f019c2cf7e8438209df6d90a20a9bcc88f5346aa02c953a28d84d712983fe3880b39b4b1766819bb88c670245447c37dc0c1da3b02b3f800a3d9706c4287 SHA512 76c1048a35a75b60d9e5fd56da50ba4bfe9537457e2021c226671d72e0456d2533f05361cad607cc86b8e01fd00a137a4cbc26a6d70c122918fe4e0f2ae3bee5
diff --git a/app-crypt/argon2/argon2-20171227.ebuild b/app-crypt/argon2/argon2-20171227.ebuild
index e5b800c4fafe..63d32604a4f9 100644
--- a/app-crypt/argon2/argon2-20171227.ebuild
+++ b/app-crypt/argon2/argon2-20171227.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/P-H-C/phc-winner-argon2/archive/${PV}.tar.gz -> ${P}
 
 LICENSE="|| ( Apache-2.0 CC0-1.0 )"
 SLOT="0/1"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 ~sparc x86 ~amd64-fbsd"
 IUSE="static-libs"
 
 S="${WORKDIR}/phc-winner-${P}"
diff --git a/app-crypt/hashcat-utils/Manifest b/app-crypt/hashcat-utils/Manifest
new file mode 100644
index 000000000000..0a8afec4b692
--- /dev/null
+++ b/app-crypt/hashcat-utils/Manifest
@@ -0,0 +1,3 @@
+DIST hashcat-utils-1.9.tar.gz 41612 BLAKE2B 2999a3c2a01c195ddca334325167f2a468a3466b48886f3a54804224fd8369a9c953279170d5291c534a157acdc4fefc2947765187c8fb0e6f4cd5e5fd2597c9 SHA512 5f8cef312496e13d1152742950397933e9d5866740afe377321fb48386174b64d96f90d3072febfb97bf0f7eb438f41d6b5e14bfc3e157c9c3e664ffbc5b614b
+EBUILD hashcat-utils-1.9.ebuild 532 BLAKE2B a81ce774d600f77830e2b679174bd4c298e84f0cdd3d1fd83ac8bb0fd03a612f51605603f9972891ae4fb090c9c2476b349c18800704d0d74e82bb214ef82904 SHA512 a71595a8421dec72b170eb7e724c538adeb8402add257aad22082f55503d6cd89a4f9121d7354685696777e3be443540985962df274fb1d08dbb9940aed528cc
+MISC metadata.xml 247 BLAKE2B 0f6116ad1a6532d4d062e4e8dadf00f3053ccd4408f030535d3adc5f0399e43ac1682b3786a1a321ba7dd8c1b448cebc5938207a5af59fc033e0e6cf4c654c40 SHA512 8111616dc98858617382132291d5d7a4900eb04643a2c67d4c2eae21dbd08e2fd5f73d533befaa5a0c6a074b04046f1e5bf7a139386ca10ffffef329825d0514
diff --git a/app-crypt/hashcat-utils/hashcat-utils-1.9.ebuild b/app-crypt/hashcat-utils/hashcat-utils-1.9.ebuild
new file mode 100644
index 000000000000..f6396ab52c84
--- /dev/null
+++ b/app-crypt/hashcat-utils/hashcat-utils-1.9.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="a set of small utilities that are useful in advanced password cracking"
+HOMEPAGE="https://github.com/hashcat/hashcat-utils"
+SRC_URI="https://github.com/hashcat/hashcat-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S="${WORKDIR}/${P}/src"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+src_install() {
+	for i in *.bin; do
+		newbin ${i} ${i/.bin}
+	done
+}
diff --git a/app-crypt/hashcat-utils/metadata.xml b/app-crypt/hashcat-utils/metadata.xml
new file mode 100644
index 000000000000..f4c696b2c619
--- /dev/null
+++ b/app-crypt/hashcat-utils/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<name>Rick Farina</name>
+		<email>zerochaos@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-crypt/tpm-emulator/Manifest b/app-crypt/tpm-emulator/Manifest
index 723e3eedd01d..483d76cf0745 100644
--- a/app-crypt/tpm-emulator/Manifest
+++ b/app-crypt/tpm-emulator/Manifest
@@ -1,10 +1,6 @@
-AUX tpm-emulator-0.7.4-build.patch 3995 BLAKE2B 23a0c34f3d34c3cf154b22a2cf6c79216e580d298a31657f2d247b58ebdeadd00923340656885931c86777385916cc5df3e55c05704d9c213a46673ca5999483 SHA512 852d7fc90c558c37dec6409e09cbe6e94494cba023d7de38702e475e698f9210ff2cb937f51751b25ea48015421c556d1fe71dafdcb6764d2e6fe938d61f4a4b
-AUX tpm-emulator-0.7.4-cmake.patch 3358 BLAKE2B 27c1fbe5cd55f5838f9010c2d38f2037492f562553c5ed99eb3bcbea41dc2d899d42fef73b7f86b7c1cac12a9a5a43273e97834d5c3b4b9436157e7292d876ef SHA512 3d46f18957ab569e927ade7c3b08aa94f01beeafbe80a2cf3601f07492355bb354f060b8e3f9aeb52de8aa2f2db7f26faec635191b00b9d5adc33c5d7caeada1
-AUX tpm-emulator.confd-0.7.4 34 BLAKE2B 39d858219bf12309c361bd65070df3a941de10d073e3014e0196bc3f100c605a7be1700c1e25d46fa94a27778c453732e9102be3fe11260f6b3bf617c47bb5ec SHA512 61b5145d3fa5b778ba09e66a25ea183165fafbdafe54aa77d171aed2a87f6b5febc918d33603a9bf58320e9ff3f79e3ec58d03d4674562d31c1c90b942faf504
-AUX tpm-emulator.confd-r2 20 BLAKE2B 13dd9f09a0a4efb9a039bfeababb5f00b8b2c3c1777e60c531e874ef6f3b4d00319d7962bd321f8530289c797ea110f6cde91bc6af338e38be7d96f71f6474cb SHA512 824d35e037f1036d53353bd0e2bf9136cd94d07a71df9ebdf32a513ff53a47b25e38e3b760e58c18909559f1adbea2faae615c25f2cf9f1df03eef8582648bcc
-AUX tpm-emulator.initd-0.7.4 1100 BLAKE2B 19736ff8ad067390adb951f4b3f30656bf7345f36cba51b5a96114f3acc069391f3c4e7ecbb563f2ad6fbb25263b950b907c130b5dd0a6523a607a264de61469 SHA512 5fab6f4c9b7057fa1bf23b179747d125ec77729a1a69b762735c429824ce6dfee3033012b027a44e5c731ec86a4e78b8b64c44d27b207867a26a9663382a84f9
-AUX tpm-emulator.initd-r2 776 BLAKE2B 0daa0247396d1b5f1c9542b28f825899a5cc45bd748b6b7e2328440fd466fd6b461e32487a955816a79827bf350cfb33bd71a6b197a8e67dbf5509750098cb59 SHA512 22d7b163dc6f567c1900a275ae545c4421b2d459ba535a24f48d7ad2609f5df36533849aa781d4dd704961db102eea08c99b79c01d0e3981fb46d2eb4e39d6fe
-DIST tpm_emulator-0.7.4.tar.gz 214145 BLAKE2B b8bbd53ecfb90e87f1306c03d2c65a472819d23d10bd63fa966bfadef4776c3876c2f6fc03cc878ece670bdfcd22c9f403ef4bc7f4593a0a6c7f8d17051ac3ba SHA512 4928b5b82f57645be9408362706ff2c4d9baa635b21b0d41b1c82930e8c60a759b1ea4fa74d7e6c7cae1b7692d006aa5cb72df0c3b88bf049779aa2b566f9d35
-EBUILD tpm-emulator-0.7.4-r1.ebuild 1782 BLAKE2B 766796e9f5db7c701066ff52467e2b8449734ce31315425347771f9184bf28d2670b76f792467cfac0f4f222c50cdc708a11b9116ac0869696614e3d4a1798aa SHA512 ba22734b8c2f1fbe625b286c7fb2e08ebf2df3e201d5b9a2d30ea55a29284ecdf57f016e0b16b61f9d470021536cd5938da134f68380da458bbfc3bb7987f145
-EBUILD tpm-emulator-0.7.4-r2.ebuild 1920 BLAKE2B 415390b4a1f31e8b12fd9504afab57fd53890228862a5d0285a6519612b07e86001a0ad3f2c33d0754414bc2430fb8eafe04a5d6d3c2d4668a116c409ff2d748 SHA512 f1d93be8e078e8232f58e82ccc1da9ad3262982c930299484fd09d9fe059e616448ff459b10ea9aa76de1a41eb2d6ac466323548e3f7830b2458486a769cb889
+AUX tpm-emulator-0.7.5-build.patch 1150 BLAKE2B ef771dc31982c3b288a61bd0537df2545276297d1f249ee9e046243bf5ee54d475de7f8f58a79de1bd6f72f87937ae6f116bd4b8ef70a64b781d02c318de32ee SHA512 c311a0f448579e21e1fda09157b88517365fd142bf604f3e2ae6cb68ef866a89845b7ba7126021c19369493a9c6b863267855fae29124470185a339183ea062b
+AUX tpm-emulator.confd 20 BLAKE2B 13dd9f09a0a4efb9a039bfeababb5f00b8b2c3c1777e60c531e874ef6f3b4d00319d7962bd321f8530289c797ea110f6cde91bc6af338e38be7d96f71f6474cb SHA512 824d35e037f1036d53353bd0e2bf9136cd94d07a71df9ebdf32a513ff53a47b25e38e3b760e58c18909559f1adbea2faae615c25f2cf9f1df03eef8582648bcc
+AUX tpm-emulator.initd 776 BLAKE2B 0daa0247396d1b5f1c9542b28f825899a5cc45bd748b6b7e2328440fd466fd6b461e32487a955816a79827bf350cfb33bd71a6b197a8e67dbf5509750098cb59 SHA512 22d7b163dc6f567c1900a275ae545c4421b2d459ba535a24f48d7ad2609f5df36533849aa781d4dd704961db102eea08c99b79c01d0e3981fb46d2eb4e39d6fe
+DIST tpm-emulator-0.7.5.tar.gz 222341 BLAKE2B c6dc7494800f4c6d1f5e622c6a47fdd5487e0f2cbc34173d9039d6eb5fd7541dd2c1f514efbf220c605424059844e18650b31ee9934eda6626427b915fd6bc53 SHA512 24c16ec36ca92c484d6e8dfa53c8ca00dbc5b58d78d7166041db1e9ae277d763f0fc0a6b0cbd7e62fcf4671f6ad2d8df1213256be0a4200b79b6ee61ab73b2ef
+EBUILD tpm-emulator-0.7.5.ebuild 1858 BLAKE2B 9f11f93bc01efaaeeca6f200b0705b9093c3b109e4af46502f187f079993ce735a1653d101561ca66b12444a63f67363198a9f890e7af954d2d6fdc47725f64e SHA512 2150882b2cfcd440ba40688683c045c25337c570059d11cc37be4fc88723ae5f617cf2de452355f79fb964e1cc66445271e8cc0bd9e10df8c25a212a5352854a
 MISC metadata.xml 395 BLAKE2B 053fec93e12819e95abadca4f2e9f871589c21ce8a7369092cfb04cb593a4fa687956458dfc2c7249b6951bb3b7c45f6c38fac1448d9e5d250ed8256f92df327 SHA512 dd69f6a31ebaa3971c316d967bd643654d11465bb0de20059ea82a4851691b605c42deb4846614627ae9c8b2b30075e6c44e53f9810999839ceaf2e9ee9aada8
diff --git a/app-crypt/tpm-emulator/files/tpm-emulator-0.7.4-build.patch b/app-crypt/tpm-emulator/files/tpm-emulator-0.7.4-build.patch
deleted file mode 100644
index ada748f7129a..000000000000
--- a/app-crypt/tpm-emulator/files/tpm-emulator-0.7.4-build.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From ca99fe81c8aee204c1a8b7f3ca264130e54d9418 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Sat, 1 Sep 2018 21:32:07 +0300
-Subject: [PATCH] tpm: tpm_deprecated.c fix compare
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-tpm/tpm_deprecated.c:437:7: error: ‘__builtin_memcmp_eq’ reading 20 bytes from a region of size 8 [-Werror=stringop-overflow=]
-   if (memcmp(&b1, &newAuthLink, sizeof(TPM_HMAC))) {
-       ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-cc1: all warnings being treated as errors
-
-Bug: https://bugs.gentoo.org/show_bug.cgi?id=664198
----
- tpm/tpm_deprecated.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tpm/tpm_deprecated.c b/tpm/tpm_deprecated.c
-index c362b56..4c49f54 100644
---- a/tpm/tpm_deprecated.c
-+++ b/tpm/tpm_deprecated.c
-@@ -434,7 +434,7 @@ TPM_RESULT TPM_ChangeAuthAsymFinish(TPM_KEY_HANDLE parentHandle,
-   tpm_hmac_final(&hmac_ctx, b1.digest);
-   /* 6. The TPM SHALL compare b1 with newAuthLink. The TPM SHALL
-         indicate a failure if the values do not match. */
--  if (memcmp(&b1, &newAuthLink, sizeof(TPM_HMAC))) {
-+  if (memcmp(&b1, newAuthLink, sizeof(TPM_HMAC))) {
-     debug("TPM_ChangeAuthAsymFinish(): newAuthLink value does not match.");
-     return TPM_FAIL;
-   }
-From 035af1df2b18afd695150c6f9e426133b775c0a1 Mon Sep 17 00:00:00 2001
-From: Florian Larysch <fl@n621.de>
-Date: Tue, 24 Oct 2017 19:33:00 +0200
-Subject: [PATCH] tpm_command_handler: fix switch fallthrough
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Compiling with a recent GCC fails as follows:
-
-  tpm-emulator/tpm/tpm_cmd_handler.c: In function ‘tpm_setup_rsp_auth’:
-  tpm-emulator/tpm/tpm_cmd_handler.c:3332:7: error: this statement may fall through [-Werror=implicit-fallthrough=]
-         tpm_hmac_final(&hmac, rsp->auth2->auth);
-         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  tpm-emulator/tpm/tpm_cmd_handler.c:3333:5: note: here
-       case TPM_TAG_RSP_AUTH1_COMMAND:
-
-Looking at the code, this does indeed seem unintentional. Add a break
-state in the appropriate place.
----
- tpm/tpm_cmd_handler.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/tpm/tpm_cmd_handler.c b/tpm/tpm_cmd_handler.c
-index 288d1ce..5aea4e7 100644
---- a/tpm/tpm_cmd_handler.c
-+++ b/tpm/tpm_cmd_handler.c
-@@ -3330,6 +3330,7 @@ static void tpm_setup_rsp_auth(TPM_COMMAND_CODE ordinal, TPM_RESPONSE *rsp)
-                   sizeof(rsp->auth2->nonceOdd.nonce));
-       tpm_hmac_update(&hmac, (BYTE*)&rsp->auth2->continueAuthSession, 1);
-       tpm_hmac_final(&hmac, rsp->auth2->auth);
-+      break;
-     case TPM_TAG_RSP_AUTH1_COMMAND:
-       tpm_hmac_init(&hmac, rsp->auth1->secret, sizeof(rsp->auth1->secret));
-       tpm_hmac_update(&hmac, rsp->auth1->digest, sizeof(rsp->auth1->digest));
--- 
-2.16.4
-
-From 0f4579e913aeb3a893631a3caee420a0e9803683 Mon Sep 17 00:00:00 2001
-From: Peter Huewe <peterhuewe@gmx.de>
-Date: Mon, 26 Jun 2017 00:25:43 +0200
-Subject: [PATCH] Workaround wrong fallthrough case by returning TPM_FAIL
-
-The spec says that the number of verified PCRs should be returned - which it currently does not and breaks compilation with gcc7
-See #26
-Since this code is probably unused anyway, we now simply return TPM_FAIL until someone comes up with a solution.
-
-Spec:
-https://www.trustedcomputinggroup.org/wp-content/uploads/Revision_7.02-_29April2010-tcg-mobile-trusted-module-1.0.pdf
----
- mtm/mtm_capability.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/mtm/mtm_capability.c b/mtm/mtm_capability.c
-index a09b116..4046de5 100644
---- a/mtm/mtm_capability.c
-+++ b/mtm/mtm_capability.c
-@@ -87,6 +87,8 @@ static TPM_RESULT cap_mtm_permanent_data(UINT32 subCapSize, BYTE *subCap,
-         tpm_free(*resp);
-         return TPM_FAIL;
-       }
-+      error("[TPM_CAP_MTM_PERMANENT_DATA] SubCap 2 not Implemented");
-+      return TPM_FAIL; // TODO not implemented.
- 
-     case 3:
-       return return_UINT32(respSize, resp,
--- 
-2.16.4
-
diff --git a/app-crypt/tpm-emulator/files/tpm-emulator-0.7.4-cmake.patch b/app-crypt/tpm-emulator/files/tpm-emulator-0.7.4-cmake.patch
deleted file mode 100644
index 7fd775139b2d..000000000000
--- a/app-crypt/tpm-emulator/files/tpm-emulator-0.7.4-cmake.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-
-Pull request:
-https://github.com/PeterHuewe/tpm-emulator/pull/37
-
-
-From 694b7c24ac09e0ec1e54ab71eb9c82a8d4f41d33 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Tue, 11 Sep 2018 14:08:49 +0300
-Subject: [PATCH 1/3] build: use GNUInstallDirs to allow override install
- directories
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- CMakeLists.txt           | 1 +
- tddl/CMakeLists.txt      | 6 +++---
- tpmd/unix/CMakeLists.txt | 2 +-
- 3 files changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f362298..d047ce3 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -6,6 +6,7 @@
- project(TPM_Emulator C)
- 
- cmake_minimum_required(VERSION 2.4)
-+include(GNUInstallDirs)
- set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
- if(COMMAND cmake_policy)
- cmake_policy(SET CMP0003 NEW)
-diff --git a/tddl/CMakeLists.txt b/tddl/CMakeLists.txt
-index 0be3281..6cc63b3 100644
---- a/tddl/CMakeLists.txt
-+++ b/tddl/CMakeLists.txt
-@@ -15,9 +15,9 @@ elseif(WIN32)
-   set_target_properties(tddl PROPERTIES PREFIX "")
- endif()
- 
--install(TARGETS tddl DESTINATION lib)
--install(TARGETS tddl_static DESTINATION lib)
--install(FILES "tddl.h" DESTINATION include)
-+install(TARGETS tddl DESTINATION ${CMAKE_INSTALL_LIBDIR})
-+install(TARGETS tddl_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
-+install(FILES "tddl.h" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
- 
- include_directories(${CMAKE_CURRENT_SOURCE_DIR})
- add_executable(test_tddl test_tddl.c)
-diff --git a/tpmd/unix/CMakeLists.txt b/tpmd/unix/CMakeLists.txt
-index 40c436b..c5c394a 100644
---- a/tpmd/unix/CMakeLists.txt
-+++ b/tpmd/unix/CMakeLists.txt
-@@ -13,5 +13,5 @@ target_link_libraries(tpmd mtm tpm tpm_crypto)
- else()
- target_link_libraries(tpmd tpm tpm_crypto)
- endif()
--install(TARGETS tpmd RUNTIME DESTINATION bin)
-+install(TARGETS tpmd RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
- 
--- 
-2.16.4
-
-From 89bf733368dda265040cf44ff8be69a15ab66712 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Tue, 11 Sep 2018 16:36:12 +0300
-Subject: [PATCH 2/3] build: do not build mtm unless enabled
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- CMakeLists.txt | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d047ce3..b8b68a3 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -67,7 +67,9 @@ include_directories(${CMAKE_BINARY_DIR})
- 
- # add internal libraries
- add_subdirectory(tpm)
--add_subdirectory(mtm)
-+if(MTM_EMULATOR)
-+    add_subdirectory(mtm)
-+endif()
- add_subdirectory(crypto)
- 
- # add TDDL
--- 
-2.16.4
-
-From 24bbf683de0b0b24f0ec81d093c03e1f6a9570f2 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Tue, 11 Sep 2018 14:20:19 +0300
-Subject: [PATCH 3/3] build: support BUILD_DEV to disable device build
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- CMakeLists.txt | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b8b68a3..9ae6562 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -76,7 +76,12 @@ add_subdirectory(crypto)
- add_subdirectory(tddl)
- 
- # add kernel modules
--add_subdirectory(tpmd_dev)
-+if(NOT DEFINED BUILD_DEV)
-+    set(BUILD_DEV ON)
-+endif()
-+if(BUILD_DEV)
-+    add_subdirectory(tpmd_dev)
-+endif()
- 
- # add executables
- add_subdirectory(tpmd)
--- 
-2.16.4
-
diff --git a/app-crypt/tpm-emulator/files/tpm-emulator-0.7.5-build.patch b/app-crypt/tpm-emulator/files/tpm-emulator-0.7.5-build.patch
new file mode 100644
index 000000000000..3f96bdd3e68f
--- /dev/null
+++ b/app-crypt/tpm-emulator/files/tpm-emulator-0.7.5-build.patch
@@ -0,0 +1,33 @@
+From 78f018a79243b8aa3c2a8e8aa87245c58c731278 Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Sun, 16 Sep 2018 13:29:59 +0300
+Subject: [PATCH] tpmd_dev: fix strncpy bound
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+tpmd_dev/linux/tpmd_dev.c:88:3: error: ‘strncpy’ specified bound 108 equals destination size [-Werror=stringop-truncation]
+
+Bug: https://github.com/PeterHuewe/tpm-emulator/pull/43
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+---
+ tpmd_dev/linux/tpmd_dev.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tpmd_dev/linux/tpmd_dev.c b/tpmd_dev/linux/tpmd_dev.c
+index 2b24bd7..72583f4 100644
+--- a/tpmd_dev/linux/tpmd_dev.c
++++ b/tpmd_dev/linux/tpmd_dev.c
+@@ -85,7 +85,7 @@ static int tpmd_connect(char *socket_name)
+     return res;
+   }
+   addr.sun_family = AF_UNIX;
+-  strncpy(addr.sun_path, socket_name, sizeof(addr.sun_path));
++  strncpy(addr.sun_path, socket_name, sizeof(addr.sun_path)-1);
+   res = tpmd_sock->ops->connect(tpmd_sock,
+     (struct sockaddr*)&addr, sizeof(struct sockaddr_un), 0);
+   if (res != 0) {
+-- 
+2.16.4
+
diff --git a/app-crypt/tpm-emulator/files/tpm-emulator.confd-r2 b/app-crypt/tpm-emulator/files/tpm-emulator.confd
index 985fa4e774ca..985fa4e774ca 100644
--- a/app-crypt/tpm-emulator/files/tpm-emulator.confd-r2
+++ b/app-crypt/tpm-emulator/files/tpm-emulator.confd
diff --git a/app-crypt/tpm-emulator/files/tpm-emulator.confd-0.7.4 b/app-crypt/tpm-emulator/files/tpm-emulator.confd-0.7.4
deleted file mode 100644
index da24e57840b9..000000000000
--- a/app-crypt/tpm-emulator/files/tpm-emulator.confd-0.7.4
+++ /dev/null
@@ -1,2 +0,0 @@
-STARTUP_MODE="save"
-#DEBUG="true"
diff --git a/app-crypt/tpm-emulator/files/tpm-emulator.initd-r2 b/app-crypt/tpm-emulator/files/tpm-emulator.initd
index abfbef900d00..abfbef900d00 100644
--- a/app-crypt/tpm-emulator/files/tpm-emulator.initd-r2
+++ b/app-crypt/tpm-emulator/files/tpm-emulator.initd
diff --git a/app-crypt/tpm-emulator/files/tpm-emulator.initd-0.7.4 b/app-crypt/tpm-emulator/files/tpm-emulator.initd-0.7.4
deleted file mode 100644
index 8d5b9be561b1..000000000000
--- a/app-crypt/tpm-emulator/files/tpm-emulator.initd-0.7.4
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-STARTUP_MODE='save';
-
-extra_started_commands="clear save deactivated"
-command="/usr/bin/tpmd"
-command_args="-o tss -g tss"
-
-depend() {
-	use logger
-	after coldplug
-}
-
-checkconfig() {
-	lsmod | grep -q "^tpmd_dev\b" \
-		|| modprobe tpmd_dev &>/dev/null \
-		|| eerror "Failed to load module tpmd_dev";
-
-	if [ ! -c /dev/tpm ] && [ ! -c /dev/tpm0 ] ; then
-		eerror "No TPM device found!"
-		return 1
-	fi
-	return 0
-}
-
-start() {
-	ebegin "Starting tpm-emulator daemon with mode '$STARTUP_MODE' (tpmd)"
-	checkconfig || eend $?
-	checkpath -d -m 0775 -o tss /var/run/tpm
-	start-stop-daemon --start --exec "${command}" -- ${command_args} $STARTUP_MODE > /dev/null
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping tpm-emulator daemon (tpmd)"
-	start-stop-daemon --stop --exec "${command}" -- ${command_args} > /dev/null
-	eend $?
-}
-
-clear() {
-	STARTUP_MODE='clear';
-	stop
-	start
-}
-
-save() {
-	STARTUP_MODE='save';
-	stop
-	start
-}
-
-deactivated() {
-	STARTUP_MODE='deactivated';
-	stop
-	start
-}
-
diff --git a/app-crypt/tpm-emulator/tpm-emulator-0.7.4-r1.ebuild b/app-crypt/tpm-emulator/tpm-emulator-0.7.4-r1.ebuild
deleted file mode 100644
index 6fc770390fcf..000000000000
--- a/app-crypt/tpm-emulator/tpm-emulator-0.7.4-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-MODULES_OPTIONAL_USE="modules"
-inherit flag-o-matic user linux-mod cmake-utils udev
-
-MY_P=${P/-/_}
-DESCRIPTION="Emulator driver for tpm"
-HOMEPAGE="https://sourceforge.net/projects/tpm-emulator.berlios/"
-SRC_URI="mirror://sourceforge/tpm-emulator/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="libressl ssl"
-RDEPEND="ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-DEPEND="${RDEPEND}
-	!ssl? ( dev-libs/gmp )"
-
-S=${WORKDIR}/${P/-/_}
-
-PATCHES=(
-	"${FILESDIR}/${P}-build.patch"
-)
-
-pkg_setup() {
-	enewgroup tss
-	enewuser tss -1 -1 /var/lib/tpm tss
-	if use modules; then
-		CONFIG_CHECK="MODULES"
-		linux-mod_pkg_setup
-		BUILD_TARGETS="all"
-		BUILD_PARAMS="KERNEL_BUILD=${KERNEL_DIR}"
-	fi
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# do not build and install the kernel module
-	sed -i 's/COMMAND ${tpmd_dev_BUILD_CMD}//' tpmd_dev/CMakeLists.txt || die
-	sed -i 's/install(CODE.*//' tpmd_dev/CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_OPENSSL=$(usex ssl)
-	)
-	append-cflags -Wno-implicit-fallthrough
-	cmake-utils_src_configure
-
-	# only here we have BUILD_DIR
-	MODULE_NAMES="tpmd_dev(misc:${BUILD_DIR}/tpmd_dev/linux)"
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	use modules && linux-mod_src_compile
-	emake -C "${BUILD_DIR}/tpmd_dev/linux" tpmd_dev.rules
-}
-
-src_install() {
-	cmake-utils_src_install
-	use modules && linux-mod_src_install
-
-	dodoc README
-
-	udev_newrules "${BUILD_DIR}/tpmd_dev/linux/tpmd_dev.rules" 60-tpmd_dev.rules
-
-	newinitd "${FILESDIR}"/${PN}.initd-0.7.4 ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd-0.7.4 ${PN}
-
-	keepdir /var/log/tpm
-	fowners tss:tss /var/log/tpm
-}
diff --git a/app-crypt/tpm-emulator/tpm-emulator-0.7.4-r2.ebuild b/app-crypt/tpm-emulator/tpm-emulator-0.7.5.ebuild
index 9c7003c115f7..97b70a4785f0 100644
--- a/app-crypt/tpm-emulator/tpm-emulator-0.7.4-r2.ebuild
+++ b/app-crypt/tpm-emulator/tpm-emulator-0.7.5.ebuild
@@ -3,12 +3,12 @@
 
 EAPI=6
 MODULES_OPTIONAL_USE="modules"
-inherit flag-o-matic user linux-mod cmake-utils udev
+inherit user linux-mod cmake-utils udev
 
 MY_P=${P/-/_}
 DESCRIPTION="Emulator driver for tpm"
-HOMEPAGE="https://sourceforge.net/projects/tpm-emulator.berlios/"
-SRC_URI="mirror://sourceforge/tpm-emulator/${MY_P}.tar.gz"
+HOMEPAGE="https://github.com/PeterHuewe/tpm-emulator"
+SRC_URI="https://github.com/PeterHuewe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2"
 
 SLOT="0"
@@ -22,11 +22,8 @@ RDEPEND="ssl? (
 DEPEND="${RDEPEND}
 	!ssl? ( dev-libs/gmp )"
 
-S=${WORKDIR}/${P/-/_}
-
 PATCHES=(
 	"${FILESDIR}/${P}-build.patch"
-	"${FILESDIR}/${P}-cmake.patch"
 )
 
 pkg_setup() {
@@ -64,8 +61,8 @@ src_install() {
 		udev_newrules "tpmd_dev/linux/tpmd_dev.rules" 60-tpmd_dev.rules
 	fi
 
-	newinitd "${FILESDIR}/${PN}.initd-r2" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd-r2" "${PN}"
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
 
 	keepdir /var/log/tpm
 	fowners tss:tss /var/log/tpm
diff --git a/app-crypt/ubuntu-keyring/Manifest b/app-crypt/ubuntu-keyring/Manifest
index 30d219899e0d..aae80c841019 100644
--- a/app-crypt/ubuntu-keyring/Manifest
+++ b/app-crypt/ubuntu-keyring/Manifest
@@ -1,3 +1,5 @@
 DIST ubuntu-keyring_2018.02.28.tar.gz 30181 BLAKE2B 1dc1232aa3ddbbb4a908e2b0deb035fd2ae61ddad4ebba99cce43c636af30760a09bf46f05c35c8205ccfaf526ed8b0a3b9daa308ae5d7272da078903ee15557 SHA512 60f3a792d095206466f4c39672affb261b4520fb7b5b9df47487741e0d6613cd1076fde0e30120bcbe161b170c41f7ec1bbb2c36cddf13ee69a457df00c36fa8
-EBUILD ubuntu-keyring-2018.02.28.ebuild 455 BLAKE2B 34a105976cad44dd824661c9417d34c933688b808542031c2e1b8b5c40caa071d21187b8b8584bccf0eed79a43624fe585f214987d3d9b6979486ede836bf1ad SHA512 1e3a21cfecc65ea64aa5eea251ec7ee69677e4fde2c66f9499df4cf000621de8cacf44688db2f1baf466d5f7f5e07c736c4eef4c5fa7c28a602eb193903f4536
+DIST ubuntu-keyring_2018.09.18.1.tar.gz 34263 BLAKE2B fa08e98d27875f1120b3a99127f7df38b6f5d1659d087d52bef23f29619a6cc2b5217302e8e4b1b5efefe7b946bab65a72b5a84a281dc1a6e18eafa5a1e9f8a0 SHA512 562221fc2cf4ff843e9fb16c40673e379ebaa82f12d092cff2454527a6e58ba5067abc5ef5950a82d089cad975de14cdaf01c9e29f98126da8e96a97168102f6
+EBUILD ubuntu-keyring-2018.02.28.ebuild 457 BLAKE2B c63cdf7150c404853160294e4b3230b4da99a9dafb17cbfc4ee72d940bda89ec6818a675b7a050b150cca3e02a0a6f1d5e832957663b3beec4daa987556becde SHA512 3f7744413a46f63430cc115b6953258fa3d1b7aeaf91b895a8a588901e096fb9da73ff19f750f0b83bdb98a257eef73e6dee840e0d096e254601a0e8f54da73b
+EBUILD ubuntu-keyring-2018.09.18.1.ebuild 489 BLAKE2B 53c436ce217a5e5347ef852519b94654a7a5cb499e017f637938205e2ec0cee96907f9619087a6d2e1d8812d78722a636623585e599560c5e52ad4d7eb00cb38 SHA512 9f1429a550f6633ca56cc0c5ca23e0ae0f7b3536cbb2a2dbe41f5e83cab215c8b8fd5d283570fccb3ecf3f74abac0b205e1919a1be3a753442d55b79741f9f3e
 MISC metadata.xml 249 BLAKE2B 3647e2ef94ad009c86dc9d42c1396ad9420ade97042882b8d8f60f676c465cfd6ea3cea4b77caccadd99eb0cbe1ef83b18b799ec676da4ecfbff528d21bb5ffb SHA512 334ac61f9acc5c4917fd29afb3b420b1689b39be80cada419bed1db033e64130866d0995abe5f1c75eb1290f51734e9ad4c8d06fd8b49c288ecf617a0693d273
diff --git a/app-crypt/ubuntu-keyring/ubuntu-keyring-2018.02.28.ebuild b/app-crypt/ubuntu-keyring/ubuntu-keyring-2018.02.28.ebuild
index 4b624c322c14..102c69fe7fed 100644
--- a/app-crypt/ubuntu-keyring/ubuntu-keyring-2018.02.28.ebuild
+++ b/app-crypt/ubuntu-keyring/ubuntu-keyring-2018.02.28.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 DESCRIPTION="GnuPG archive keys of the Ubuntu archive"
-HOMEPAGE="http://packages.ubuntu.com/zesty/ubuntu-keyring"
+HOMEPAGE="https://packages.ubuntu.com/bionic/ubuntu-keyring"
 SRC_URI="mirror://ubuntu/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.tar.gz"
 
 LICENSE="GPL-2+"
diff --git a/app-crypt/ubuntu-keyring/ubuntu-keyring-2018.09.18.1.ebuild b/app-crypt/ubuntu-keyring/ubuntu-keyring-2018.09.18.1.ebuild
new file mode 100644
index 000000000000..27144165c204
--- /dev/null
+++ b/app-crypt/ubuntu-keyring/ubuntu-keyring-2018.09.18.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="GnuPG archive keys of the Ubuntu archive"
+HOMEPAGE="https://packages.ubuntu.com/cosmic/ubuntu-keyring"
+SRC_URI="mirror://ubuntu/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S="${WORKDIR}"/${P%%.1}ubuntu1
+
+src_install() {
+	insinto /usr/share/keyrings/
+	doins keyrings/*.gpg
+
+	dodoc changelog README
+}
diff --git a/app-crypt/xca/Manifest b/app-crypt/xca/Manifest
index b3595b5ca0be..246e64722284 100644
--- a/app-crypt/xca/Manifest
+++ b/app-crypt/xca/Manifest
@@ -1,6 +1,8 @@
 AUX xca-1.0.0-desktop.patch 391 BLAKE2B 1cbec5681df8da9230b783c8ea048a199bd31a38fce6781dcd86b926e03b245de05b148d8df9034f5c7470dcf5823bd4a080cbb011a1a32fc0b96d8a8a5d950d SHA512 5dd62d8d2f4485b6155e466bb9a012f44104ff36c97bae61e8155880b937fc1271e94fb5b83627bd828e3cde0ab421a150458d050cb512d633d1c5c97f80f163
 DIST xca-1.4.1.tar.gz 959107 BLAKE2B 7437cdbaa5277998de200e9a5ad3a7d44aed9ae8af8fd926d7ed1917d49bec79562455ca2e82557149d748840f299ffd66edfc7f265be7d5bdcd6e4fe8dbaf9b SHA512 8294669c4887ba7a9060c3c2c06014b8a1807898569842ed61c066e8a864de014fba51a2ff867b579048083fdd4934cc7f97c92268de4944bf4aafea9c2e7b42
 DIST xca-2.1.0.tar.gz 1055745 BLAKE2B c3ea2953be7cacb8c4c6fb6911f2e51806d40f294d8c9daef1d47da4f3e6ffa4933d199b8b92cab828286ececab2ea7195d5a46455e4d4703f0a67d0d7861db9 SHA512 ad46b290067b0a22bb6baeb0d065879bea74cd2c853f67c2be3d0c2bdaa5ca4ebef606c0f08bd0b130df4ec13418d470062b708ab479800eab7c18dffa46af03
-EBUILD xca-1.4.1.ebuild 1205 BLAKE2B f99cee8ebf2a07078045f01b4adf8db7736376b20536f00fe458824cc03f87c264a566cefdac56a2705ab5f4fc45d783ba6ca085eee7126e452d09ef2da7a4c0 SHA512 a59498a8576994a5cb9dfec0c204d65e5a2cdd2f0963c5c93ad2148fccfff93fab7658b512c40d7fe8364a39fe5d023332008308aeff35acf96dc18ad3079a6a
-EBUILD xca-2.1.0.ebuild 1452 BLAKE2B e4c94fca222d135959d2a897460177a0a804ec52fe557cd9ab61ac33571e9da6819a7b6d985d0b3182678a822bbc1d393f44d7d1b7633ddddf5d25451e420ba7 SHA512 e008114523bdd00806571cbbde4bac62f14201c0c02195f25a035a575c089fbee87b40cfd0606d26f6aab44f9eda2e3f0c367ff1253ad16aab2ce3fb7685ff30
+DIST xca-2.1.1.tar.gz 1055613 BLAKE2B bb6d6b4742c7a799bf1a65e1ed2f8ab8b4d695e717e630600bc22f0e0d4a9ae95d5d98d3e85ccfbdd07eb08cf7dba6b94c702790e21fe4899fce8fc33e4f7154 SHA512 e7c3fdb515bb7a719a775b97efcabe71dc1ccc31a7ddd7cb1a9543fb16d131bce180917418091927334a4dd169daef919a4d9476a29ab4355688c961e3340dd3
+EBUILD xca-1.4.1.ebuild 1206 BLAKE2B efe75fe96b26d9179bcb51365e5dd67be4e952629c9961e93522a576d4c233dfba2d1aafb6bc86eb5832efa16e7c869e1bda274847028756bf0ea939caa88b49 SHA512 692b76cd35fe8928890017bedfbebcb99d692bf1efc07f39230561240cf2e70acf021418c634f13f985e35a17b54727a58e537f309a3ddf0fd885267cbd80d74
+EBUILD xca-2.1.0.ebuild 1453 BLAKE2B b892c63cf6df72362d5a0fcef1a6b4f3679116ea3cfdcbffdf6a9b738fc9a0c3fee77f0095754d6bc2662949bf988b9a34506e44788c898909602fd0295a8bef SHA512 0f082f78fa1defafe7b3125226908115c9672b170d26cd2b6d91e98d0e2e0a8c7b4212a6344978a53f5ad7db77fef9ac10b023152a91d10142237c886daea712
+EBUILD xca-2.1.1.ebuild 1453 BLAKE2B b892c63cf6df72362d5a0fcef1a6b4f3679116ea3cfdcbffdf6a9b738fc9a0c3fee77f0095754d6bc2662949bf988b9a34506e44788c898909602fd0295a8bef SHA512 0f082f78fa1defafe7b3125226908115c9672b170d26cd2b6d91e98d0e2e0a8c7b4212a6344978a53f5ad7db77fef9ac10b023152a91d10142237c886daea712
 MISC metadata.xml 313 BLAKE2B 6e1376d870ee5ab083ed80dcc19c1acd60d487e285e9bdba7b92c13e97cb05a3a6fa8bc4c6107d5d54470e6ca93889fca15c1a2f7e690a169ca7aff64bd2499e SHA512 ebc38746afd94878384ef0e4d7933e2a7433216716b1854cfc0227c3f0abf0847d784d36de4b04a778743e442298abd3769329deecdc771003681ecd3dbf3fa1
diff --git a/app-crypt/xca/xca-1.4.1.ebuild b/app-crypt/xca/xca-1.4.1.ebuild
index 894cba578bee..27a4d7c8af8b 100644
--- a/app-crypt/xca/xca-1.4.1.ebuild
+++ b/app-crypt/xca/xca-1.4.1.ebuild
@@ -6,7 +6,7 @@ EAPI="6"
 inherit xdg-utils
 
 DESCRIPTION="A GUI to OpenSSL, RSA public keys, certificates, signing requests etc"
-HOMEPAGE="http://hohnstaedt.de/xca/"
+HOMEPAGE="https://hohnstaedt.de/xca/"
 SRC_URI="https://github.com/chris2511/${PN}/releases/download/RELEASE.${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/app-crypt/xca/xca-2.1.0.ebuild b/app-crypt/xca/xca-2.1.0.ebuild
index 1577add7f676..083396d5b9ed 100644
--- a/app-crypt/xca/xca-2.1.0.ebuild
+++ b/app-crypt/xca/xca-2.1.0.ebuild
@@ -6,7 +6,7 @@ EAPI="6"
 inherit xdg-utils
 
 DESCRIPTION="A GUI to OpenSSL, RSA public keys, certificates, signing requests etc"
-HOMEPAGE="http://hohnstaedt.de/xca/"
+HOMEPAGE="https://hohnstaedt.de/xca/"
 SRC_URI="https://github.com/chris2511/${PN}/releases/download/RELEASE.${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/app-crypt/xca/xca-2.1.1.ebuild b/app-crypt/xca/xca-2.1.1.ebuild
new file mode 100644
index 000000000000..083396d5b9ed
--- /dev/null
+++ b/app-crypt/xca/xca-2.1.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit xdg-utils
+
+DESCRIPTION="A GUI to OpenSSL, RSA public keys, certificates, signing requests etc"
+HOMEPAGE="https://hohnstaedt.de/xca/"
+SRC_URI="https://github.com/chris2511/${PN}/releases/download/RELEASE.${PV}/${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-libs/libltdl:0=
+	dev-qt/qtgui:5
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtwidgets:5
+	!libressl? ( dev-libs/openssl:0=[bindist=] )
+	libressl? ( dev-libs/libressl:0= )
+	doc? ( app-text/linuxdoc-tools )"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5"
+
+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
+
+	ewarn "Make a backup copy of your database!"
+	ewarn "This version completely changes the database format to SQL(ite)"
+	ewarn "Don't try to open it with older versions of XCA (< 1.4.0). They will corrupt the database."
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}