gentoo resync : 30.06.2018

18 files changed, 194 insertions, 100 deletions

diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 3c022d4d44f3..bb8fc20b5696 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/ccid/Manifest b/app-crypt/ccid/Manifest
index 6c7531a37ef0..a9603bd12b03 100644
--- a/app-crypt/ccid/Manifest
+++ b/app-crypt/ccid/Manifest
@@ -1,8 +1,6 @@
 AUX 92_pcscd_ccid-2.rules 2275 BLAKE2B a72b8d2bb8cf56f621a0762dac95500f93afa224228f403395c9590758c8fa986b3e8d0d1b12353ec7fed5a40f6af900fcd57eaaa7b339018fe42c2b509c0c5d SHA512 f327eee35ca6009069389f935ca89feea4e693e8f0c73f8f218d2639faee4ce35df85832a71e3fe98ce24aae31861aa8bd290833e59ada75c1e1a2df9ff0a477
-DIST ccid-1.4.26.tar.bz2 628038 BLAKE2B ba0cc8aa92a7b960d12e0ebfba79910c84eff11815495bda76287bacb7638093270eb2b5bc502c67b1a789a6bef19deac338312b044d74f6f7348adebd2a621e SHA512 4a2e5e9412f2aa4870e14114e54da96fd8b3418ea6d3a236b83e19d6349adb20a94ef7f48628c108f8459f008c10b0606bbf4d797ae4be9183e1acde032c618c
 DIST ccid-1.4.27.tar.bz2 632817 BLAKE2B a18de0594c9535c4564bc27886fc69a0edc54343941d77b9558f331a932d12d2b58303ae3994337e380f16648f7bb2a8aa90c00aae4c7cffe242e000003c5dcd SHA512 14fb5d9878ed36de912d860d8537758170781f225957a99d5fed447dcfba0cba3133f78d2cc4bc7db60d3527399f70e4a7d1d1f8348fb50d1bcfc75820a23522
 DIST ccid-1.4.29.tar.bz2 635761 BLAKE2B ff14bc6e181a6d44b8ef463a2255d0362842f6e1e7c79e0a01caaba0a88892f7b0f2bd9d2dadae7be8b0655d2502e5471cff29e582928d62235fa070f2eb1ba8 SHA512 9ff37acad086e959f660069b245fe06ecada140623025a19dfbff55edec71e1e72bce09ac4fc506ad985dd0831dafc6b12f5a5b109b38bf9ba7583856eb19418
-EBUILD ccid-1.4.26.ebuild 1491 BLAKE2B 2cd423da96b5435911add36396df823c711505988a9203ef7e8d3be6d0e86cf9e0e59a0d37f2032e7c57b5af582603cbf4f7dac8dfdb6419add9b3ba35292833 SHA512 70c1a4cadcf082935f3591e16a4e926ac2435f4f6c26744f3b1ec4d081425e395a588636c4e7000d1131f2865d61a8f4d080004c1320fe584c3af7c8aac2d81a
 EBUILD ccid-1.4.27.ebuild 1492 BLAKE2B 23f38ec767ff61b9da25eb292439956069b64ad2d162ada3454eeb2fe4db4d2436458a85e7f1858719d268a64e0d9db4bfc4c4062a5dea853e6075876dd4c16d SHA512 37a42df7ba9eeb766ad42f3e79d1bd85b80a753f11f7a4ebb0b088a95498212ea0d6fd98d541e28da0a39698d3446c6429416cc9fabedd9bf176bb0f9ea5add3
 EBUILD ccid-1.4.29.ebuild 1497 BLAKE2B e01d89f17e0f2d4932d92aa80f23143a5bc6bfd02566dfbbdc7730f8a2fd96f39064f898d6732c0f071be65ad9bf588e52bc01e0e2f447c5fce68940ee6eb74f SHA512 946b90228ee7f78abc5a825bb89df3c1d626bbff046e7833bd89eefc6b80b17b881606984b66dbb1fdeeeadb27cc19a5535102253fd5122bfa2e4b2928ca0c3b
 MISC metadata.xml 397 BLAKE2B 0b62fc531114bb9221d17ee3524db0858f4ff373b71a1b7beda520035eaf5679a63a420381dc52e40942a519bf15f95fae97b531267df133cf68687c49dad565 SHA512 8e8643f46728232ffffe25fe9906948c6a8bb94733dbdeaf2700afd0cf4a7567a27698c1832edf858c2a433187cac9d847dc7ad709d6398133b40b639e37cb4b
diff --git a/app-crypt/ccid/ccid-1.4.26.ebuild b/app-crypt/ccid/ccid-1.4.26.ebuild
deleted file mode 100644
index 965211bf2bfe..000000000000
--- a/app-crypt/ccid/ccid-1.4.26.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs udev
-
-DESCRIPTION="CCID free software driver"
-HOMEPAGE="https://ccid.apdu.fr/"
-SRC_URI="https://ccid.apdu.fr/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86"
-IUSE="twinserial kobil-midentity +usb"
-
-RDEPEND=">=sys-apps/pcsc-lite-1.8.3
-	usb? ( virtual/libusb:1 )"
-DEPEND="${RDEPEND}
-	kernel_linux? ( virtual/pkgconfig )"
-
-DOCS=( README AUTHORS )
-
-src_configure() {
-	econf \
-		LEX=: \
-		$(use_enable twinserial) \
-		$(use_enable usb libusb)
-}
-
-src_compile() {
-	default
-	use kobil-midentity && emake -C contrib/Kobil_mIDentity_switch
-}
-
-src_install() {
-	default
-
-	if use kobil-midentity; then
-		dosbin contrib/Kobil_mIDentity_switch/Kobil_mIDentity_switch
-		doman contrib/Kobil_mIDentity_switch/Kobil_mIDentity_switch.8
-	fi
-
-	if use kernel_linux; then
-		# note: for eudev support, rules probably will always need to be
-		# installed to /usr
-
-		# ccid >=1.4.11 version changed the rules drastically in a minor
-		# release to no longer use the pcscd group. Using the old ones in
-		# the mean time.
-		udev_newrules "${FILESDIR}"/92_pcscd_ccid-2.rules 92-pcsc-ccid.rules
-
-		# disable Kobil_mIDentity_switch udev rule with USE=-kobil-midentity
-		if ! use kobil-midentity; then
-			sed \
-				-e '/Kobil_mIDentity_switch/s/^/#/' \
-				-i "${D}/$(get_udevdir)"/rules.d/92-pcsc-ccid.rules || die
-		fi
-
-	fi
-}
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index b41344fecc0e..78c46c7bc679 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -16,5 +16,5 @@ EBUILD gnupg-2.2.4-r2.ebuild 3270 BLAKE2B fe28baa02fab59b834d43a932539aef9931943
 EBUILD gnupg-2.2.4.ebuild 3202 BLAKE2B 15937df613d5f8c91cf186643983659f431c8f25dbcf0d69db6dc4f02145d587c81cd6a1a62053d492fbe59f2efa921147e72e588f3da52c0a94d7b8e27cc95e SHA512 180a4dec88ac9b800db26cca8a98dba57f8624d08c2167221e90b16ad873f2c113385b98a1abe716ac3eb752d159f8f5cd95a2c69d4150ffa03cf34b7534ee79
 EBUILD gnupg-2.2.6.ebuild 3219 BLAKE2B 1f481af4f31c3298ea6aa3a233c6ca183698957636490bf92737558b936798ae0c06110bc1e9d37f7975fe1a69974a6d06cdfc9e2d9e2c378e5ab644bee9ce2d SHA512 8a8320f58a40f6dd2504346d91474568c40c6527d018e48dacfec81723697dc204d399fa1e7caaef598528132d8d0d8e268590fcb859ba4aeeae72c7b35ef119
 EBUILD gnupg-2.2.7.ebuild 3219 BLAKE2B 1f481af4f31c3298ea6aa3a233c6ca183698957636490bf92737558b936798ae0c06110bc1e9d37f7975fe1a69974a6d06cdfc9e2d9e2c378e5ab644bee9ce2d SHA512 8a8320f58a40f6dd2504346d91474568c40c6527d018e48dacfec81723697dc204d399fa1e7caaef598528132d8d0d8e268590fcb859ba4aeeae72c7b35ef119
-EBUILD gnupg-2.2.8.ebuild 3214 BLAKE2B e9982486021920f2efe95871a2633ffe5db1d1d184de227755bb0c430d7b1d4697528bcfaa309dc47ca5a5d16ec10fab5cb8f939e1f24be862eab31003c5f5b3 SHA512 b568f04342ce664bc08200a9785f1189eadbdb10b24076365503c7750d504423910f9554a399a3cc92301d194023fcf4afb65333c1c840e643d67f1d6720cb34
+EBUILD gnupg-2.2.8.ebuild 3211 BLAKE2B 96dac795e2055cf21bc71e7f76519b79f7de5cebdac942cadf95e3d7c66c422688c01d33a15e643815709753656ae03bf83632c8af36b68f4af49112286e47e7 SHA512 2058f685e307210eae134f8550b953530036be5e63d66aef16a2b58dc075dc787dea4c82d4d20cc8ac0a298b45be1aa751962354c05735c0e7740f4f3209d041
 MISC metadata.xml 1198 BLAKE2B 745e725cf4c88e72dae88f6c2030ec755a79c449c68caaf0fbd1af6f996791500ae9490127cc50cc165180f754de1c71216e89fb899329c0b108810a866612cf SHA512 cd4ad4996e1c641bf8b6815a72f90427fa3c20864fe440157068ebb38300228e907ccf34fca2fd9ba821eeadee741c0cf8d8b09ce60c965f340e64c4fae3c069
diff --git a/app-crypt/gnupg/gnupg-2.2.8.ebuild b/app-crypt/gnupg/gnupg-2.2.8.ebuild
index 5cc1f9157f93..b7e58af2f24b 100644
--- a/app-crypt/gnupg/gnupg-2.2.8.ebuild
+++ b/app-crypt/gnupg/gnupg-2.2.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~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 ~m68k ~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="bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb wks-server"
 
 COMMON_DEPEND_LIBS="
diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest
index 484c44e04ea1..f9d4b533efce 100644
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@@ -1,5 +1,5 @@
 DIST gpgme-1.10.0.tar.bz2 1370162 BLAKE2B b421d91a4fcd2e8887dc1a5c276fe1cce66f379741d86dfca751f4863039c39ccaf492c7683d6f6a0de407d2a6056e3496e45e3d472eef36a879e8b903e58c57 SHA512 8ffa348ef4775ed3209486444d54411e28c9a0ff1d7a4315feb0b2856ccd5d110b219100ea41262ca0016af69a1936d79fee0eadf2599c7c5bbeed05d11f7ab5
 DIST gpgme-1.11.1.tar.bz2 1419232 BLAKE2B 93980c24e6d692f35105db23a02db891ef022addd583d5bda8e55ec3552dfebb87c9feebb74fdd59fa353a3b08571e51537f8dcaf63af018beff467a848e97e9 SHA512 42fa6f5d6217aaad9b44b969de9603167d179af9a1573342187718ff123cd88c686211c3dc5f2d9cacc20226ab5b8fef85cb66a19ada71d267c397d8ba52cf1a
 EBUILD gpgme-1.10.0.ebuild 2856 BLAKE2B 91de73844ba2c16d354d10aa6e1172365dbbbeddec97efabbcaa66bba316c86d357d24b3f0db8f34bd423f4976f5be25fe0dffe08eb8f881e7aa4395fd4c101c SHA512 a77cd079ba24dc9967a90ccf5278bd4d5991b10df9823d4c6bc6e7eea6b40fbed1fb067d69576ac6fdd7b6d26b02f4f0311c07c4d5c736ad3a431166d3344ee9
-EBUILD gpgme-1.11.1.ebuild 2865 BLAKE2B ce50ed82945b52ea38a271dd84be1fae4b6c32d21dbabd7ab8ba49ff414bfe5e7f53ceb97845935311597ec27f89efab8b224c9a8057dfdcfb4eb18bb36642bb SHA512 2f51d3246749375b0a202ff0d2514e6a9073ddb17bb59630208836062f55769106a695a0bd423ffdaff9303403706ebf05951f9cad221e46baef7214154df73e
+EBUILD gpgme-1.11.1.ebuild 2859 BLAKE2B c77d0e68d40e3e5d5af9e1521279de9018f5cfb6fe621b8741225bc6d7e435c7076b7d0ee7ab6b767daa6afc63db010e8fe12efff81298d292d3d41a6310fdc1 SHA512 1f716ff93963e5348b77b6e9ed8fa868837a8f883ad46bf849d25e91e28523608edae6dd2757a568b98a3558dc0f67a82d2c4097be43bbf14d5558e3162a376a
 MISC metadata.xml 315 BLAKE2B 18ded955b84237e03c8d14dc65f6b869c12674d4a87906f8fbc7650d02b20418cc2d97e9be6ea32f1aa170a8763cad3b91f9ac9b821a825fea0583cc66bed728 SHA512 502b5daf04f1b706514aba7d18cd454e1e99f63462159d3f5baebd1617bfa4760c7ea6fae9b7624fae2bc5943f8950211c6f4b326b6b62c3cf7eba4fc1255334
diff --git a/app-crypt/gpgme/gpgme-1.11.1.ebuild b/app-crypt/gpgme/gpgme-1.11.1.ebuild
index 764c52bd0163..8455d4756913 100644
--- a/app-crypt/gpgme/gpgme-1.11.1.ebuild
+++ b/app-crypt/gpgme/gpgme-1.11.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gnupg/gpgme/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="1/11" # subslot = soname major version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-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 sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="common-lisp static-libs cxx python qt5"
 
 COMMON_DEPEND=">=app-crypt/gnupg-2
diff --git a/app-crypt/kstart/Manifest b/app-crypt/kstart/Manifest
index 6a1076e66d92..71a99e1369e2 100644
--- a/app-crypt/kstart/Manifest
+++ b/app-crypt/kstart/Manifest
@@ -1,5 +1,5 @@
 DIST kstart-4.1.tar.gz 269215 BLAKE2B 0d979953206e1598c121e21b2c52a123a4b5d93872ce8292638e21c5d9a4c1be0345990f1a74fa60e9a5ce58d6f166cca5ae525f97c67f7a908d73e7657d6fe8 SHA512 74a8a3f2c8d2c95f166f5861fb05a2d659a31db3165e27e81e5cf216bde44809d937ebc00995f89fa3b9df68609e3081303eb30742f5c4d90151b1410f0bd3cc
 DIST kstart-4.2.tar.gz 296651 BLAKE2B 127bf28ef538681d188ae79ed67cedaa7d9022c1fe6741b3486ce7d5901c4a77d0aec7d00164240a79ffc70b56dd7fdeaf42e76dd2b02effe79bcad41ad8e271 SHA512 7ce9c1f964c0d469b4b8a5de88ae83186e99116959941c4e7f69c59165d0c22aac432ac26dd5fe54f7c2f725048bb55b787107aea8408e2fd6c9ad02dcb31552
-EBUILD kstart-4.1.ebuild 703 BLAKE2B 13a694ec705c84b094951060bf0ca384a0b6d43d69bd49be8e70f51d87d0fcf5453e50ada968d593de065ec77d13d32fcd372963af29101d42fabbe8297220dc SHA512 386e094d7e64e97ab91fb6f9d7254db7cfad903d308cc630429ce8181e1d51e4ba01bfe18f71bf78183913dc3e9c8b376c9a314bdf4ee4a95984202a0bdfa9ad
-EBUILD kstart-4.2.ebuild 663 BLAKE2B 3b48b751ee03f8c40b7dc12bcce054ddf339d330d1547cea3241bb22015deda85fd089d5be3647c827ba96835ee3c87ce956c769ddc4ad9e4755e46454cfabdc SHA512 adbf1bada5c2c0b9d55932d2823c6873462125a85427a83955bae3a1451f1faa5b1a062b9cd9c34099a2013e597d1156654aecc1ba773a97431d701381d02c6d
+EBUILD kstart-4.1.ebuild 706 BLAKE2B 3f43a948aa353100c667e7629132bdbcf22d076d207442a7e0c97b690009dc4d3054811c1ea98af7046182227fb4d5024d1bb24b64e9848b7b983b4d8d6b7865 SHA512 2b8865c5460966d049363d1ddef18db1abbadb1c7e527b9a22dfcd4eac9eca6938485772756ad906183e076dee9d29ef459c2b877335196f81033bf1c5f01c98
+EBUILD kstart-4.2.ebuild 666 BLAKE2B ce11818d2327c2ca3d8ff561a5f22248523b1c13162dbec270eadc05667dfbedd262c5b3d7adba98486e93f2bbfe9a6f5de275516fac6d027a1b81db5d6f9605 SHA512 d267f318c97bb1843f9ce3da3f7af0fb5d2cb570037d4c2e3ea8edcfc446c69a027caa05c9d9523d2094949925afbf71b75efc913ac42d1fd5de953920414bad
 MISC metadata.xml 807 BLAKE2B 9c7c0283dce5943b74d5d57b21fdfb11cd2f9b994ca1930e62997576e20e3a74cb468565824c44051b67fd87b44f70f08defcd834d2dc03e98b5de62289cf08c SHA512 d854205e8829d141c3cd94cc00db039fce23376cb4f75c2498ae46d714765103890329526d2fe85f2eeff238fe2620f616686e78c62c9a115051d5fc161d19b5
diff --git a/app-crypt/kstart/kstart-4.1.ebuild b/app-crypt/kstart/kstart-4.1.ebuild
index e3ad1f1dc019..c80974b18abb 100644
--- a/app-crypt/kstart/kstart-4.1.ebuild
+++ b/app-crypt/kstart/kstart-4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -7,8 +7,8 @@ inherit eutils
 
 DESCRIPTION="Modified versions of kinit for refreshing kerberos tickets
 automatically"
-HOMEPAGE="http://www.eyrie.org/~eagle/software/kstart"
-SRC_URI="http://archives.eyrie.org/software/kerberos/${P}.tar.gz"
+HOMEPAGE="https://www.eyrie.org/~eagle/software/kstart/"
+SRC_URI="https://archives.eyrie.org/software/kerberos/${P}.tar.gz"
 
 LICENSE="|| ( MIT Stanford ISC )"
 SLOT="0"
diff --git a/app-crypt/kstart/kstart-4.2.ebuild b/app-crypt/kstart/kstart-4.2.ebuild
index 076efc616f77..0f9b5ae1131c 100644
--- a/app-crypt/kstart/kstart-4.2.ebuild
+++ b/app-crypt/kstart/kstart-4.2.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Modified versions of kinit for refreshing kerberos tickets
 automatically"
-HOMEPAGE="http://www.eyrie.org/~eagle/software/kstart"
-SRC_URI="http://archives.eyrie.org/software/kerberos/${P}.tar.gz"
+HOMEPAGE="https://www.eyrie.org/~eagle/software/kstart/"
+SRC_URI="https://archives.eyrie.org/software/kerberos/${P}.tar.gz"
 
 LICENSE="|| ( MIT Stanford ISC )"
 SLOT="0"
diff --git a/app-crypt/monkeysphere/Manifest b/app-crypt/monkeysphere/Manifest
index b98d7e89ccf2..fca383926336 100644
--- a/app-crypt/monkeysphere/Manifest
+++ b/app-crypt/monkeysphere/Manifest
@@ -20,5 +20,5 @@ EBUILD monkeysphere-0.36-r2.ebuild 1781 BLAKE2B 76df9b0b9204bdc2b9250b00e30660ac
 EBUILD monkeysphere-0.37.ebuild 1459 BLAKE2B e9196602c64910a1cc816993c36fce60926354958403c78753cd9eaf5b737ecc6194639614387fa8bd65c4cfb398d0eb548583a95f2b20649f8d7ec575e7355a SHA512 5181dc7b06a7a5910bafe37438c152f54d4c0f6949cc6fc8a8e203324d16c345e18475c7a854709c722ff3d4d72c66b121a653c6f86d3a33a24ad16b0097f0c3
 EBUILD monkeysphere-0.38.ebuild 1635 BLAKE2B 7382941a153716cdafcb925258a75e52cc334cd2ec467f4a1908a03388c92dcc13b05a144d259f727acc93bb5b02133e15e7b91af8d7f1606c2c98de08bea371 SHA512 6dd69c21f73158cc68e4df4c4ba9a3e15387d20effadf8bb3566955acd8b62d9c5e59c8b47d98d3470dc5cfaa9e28e343ac8cec43aed5642b1568352150c3041
 EBUILD monkeysphere-0.39.ebuild 1441 BLAKE2B 588283fd2a272a963781f0ee4a6a1e24b157642a987bd4a54d40e82a3d5cca3d3cb8d408250a369916041abe16ae722824ad863ba4cb374144a0388cd4b841a6 SHA512 1eac7528acd605c46e1b0c869afc43e6e603b4f191650568b5ca9c478f22efdd0b41c31d09daf341309d8a31cdac8f2bc1ac29408f48315709a9923589f46b1a
-EBUILD monkeysphere-0.41.ebuild 1374 BLAKE2B a9ff5a99cc448f6f1ab19e10841663daa17fa030f8f46b28e6443250a89770bbce657df6494fe7c8e2bb635cf5af14a8b914eafb157b8cfce9020bbaf48f3ce1 SHA512 d163997b672964a3788203c4cedef6510704475c8e285a947f34a06cd428fc7a46a5a1fdd4fe8eaa0fefdf976778317c771d5b04f119d459006d7b75a0a20025
+EBUILD monkeysphere-0.41.ebuild 1372 BLAKE2B a290eb661701e8e2e930a25c584d54fc9c31b9373e0d181ffaa03074d04b8c39c7540c9e2a5bb4fc4558354103d34d9ebcdee29a5d941b32a7be673f2efb7f9f SHA512 5f044379bf2b0577bd322685eed5951c6271e8b55ee8338ccc517fc239f743ee43160c32b8293e8a8c345ef395fea7845e1cb4ddc33a705f75c5ef25f227b91f
 MISC metadata.xml 251 BLAKE2B 958e5ce6ef310471d4c88ef4cfd054eb9476b56abe4e8b82b003632bae4d56a800530601a7fd4b0129fdf22fe5124e8642f60835c6792cdfe38e09afb2d701ec SHA512 10bbd614739518c3b33fc05f34caa511ad71c599e2df0cb58514f05186b9c4ef73e00e3c78018c38581376a90a7968a01c35620fca32fdc5a91a762233a8c5fd
diff --git a/app-crypt/monkeysphere/monkeysphere-0.41.ebuild b/app-crypt/monkeysphere/monkeysphere-0.41.ebuild
index 6c792e154275..fc2a5255bbe5 100644
--- a/app-crypt/monkeysphere/monkeysphere-0.41.ebuild
+++ b/app-crypt/monkeysphere/monkeysphere-0.41.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ LICENSE="GPL-3"
 SLOT="0/0"
 IUSE=""
 SRC_URI="mirror://debian/pool/monkeysphere/m/monkeysphere/monkeysphere_${PV}.orig.tar.gz http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_${PV}.orig.tar.gz"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 
 DOCS=( README Changelog )
 
diff --git a/app-crypt/sbsigntool/Manifest b/app-crypt/sbsigntool/Manifest
index bf63001a7c0f..188aa58f7319 100644
--- a/app-crypt/sbsigntool/Manifest
+++ b/app-crypt/sbsigntool/Manifest
@@ -1,8 +1,9 @@
 AUX 0002-image.c-clear-image-variable.patch 822 BLAKE2B acb775f625ecd081d9b3d7e497b066218e82d2dc13f80c473c25361dc85098ee15e5f14530334e47c33fe7cc9b2349ffb1aaba7abe4fdd33bfdde05ed9191c39 SHA512 004ba118cbe8fe5cc291888966e5994373c0b9d8149bc5c652a72971138fab5e64d721061c69e8b864d6ca5cdb4ffa193520156941b6bd9c998b256f8d72697b
 AUX 0003-Fix-for-multi-sign.patch 1452 BLAKE2B eaa6e39c18d13f3819d5852eda27eb5a8d589241224965392f1b1e067b5cb9ff0ece7fa83697e5fb6f5f8dd0acec15b7bbe57fcd5f761fcb2e8e1fc51193641f SHA512 2aba55a116536e7f41e4aac2fd33eeb92cf89b14bcdd8b93b6e9dc9bdaf2f0162134e56f7d365640445bf801ad8590f6d49f14cdf80b791324647067d52ae435
+AUX sbsigntool-0.9.1-openssl-1.1.0-compat.patch 4727 BLAKE2B 3b47c8086220cf12778bf5cd6018627a30ea349677eeb2cfcd1eaa1b83a25d39499ab21a1a123181a51f4138624c17e574050216f59c480e38d9774936f8b6f0 SHA512 6946e1d67161345088aee3ab54129b6e904b6008f2b275ab4eb55ed24fb2b866029f7d7ca856c5dfe76c395580f04709ad1be974369a1b4954b9e87cf812fd4b
 DIST sbsigntool-0.8-ccan.tar.gz 113537 BLAKE2B 8fbf27463d30c1895930628a145be2d521ae4f6adb7af3299bf2f5f4319fd643df0a07347ef6851bd41d233af4c3fc5f77002771af1c43aa0f20665aef2390b8 SHA512 6857096879f116f1802eb6b44789cbea7bb24440bc0f16503aeadf5f276fa45943f322f844dbb9abee717655205d82b830143be3a7f4424fd4146b9360674a09
-DIST sbsigntool-0.8.tar.gz 55537 BLAKE2B f81a530995b90f4030ae2bb36cdf4c5bab8fde5bbc4646029af008df9368968c1f1774317e8b0f94e6c75a33f0d79892f26d99c2987c92766f520a3b9a8e2e57 SHA512 ffc2661135dcdbdd218640f0a0657127c5519ade7ddaaa894898e382b4898829e5b877be51fce48bddd186667bf533f779cd5a323c79aad8b0e63b74f7a2c128
+DIST sbsigntool-0.9.1.tar.gz 56497 BLAKE2B 22791bd4b490f36963a19e82da3ce7b93a56d948bf44d1ffdb62fa3291a3f815b2c19d68f9180b607c2b1438f656367ec1f9002f0b1225734d16a9aadc6d20ec SHA512 ae16232327c098bbc60a9701185d856d851cb7fa8f62be64d3c8f75c8b274b8521fcc4212226189def05db980690878ee6ac9a9b418166c92442aaf35e790d29
 DIST sbsigntool_0.6.orig.tar.gz 212375 BLAKE2B fab9141c7fbfa01ec24f975503ac83be4ae0664251a1311afb3d95124fec3750ce20a5ffab35b6965d4ee4585ab4ee91f25ae49488214a983b6fc006071d0968 SHA512 ed314d1cb7278cf5f27d4c3cd17f2195678419a7f9e47770429b6f95df35f7df035331e60c45970183ddd9b150a9b752f876c777929598b0525872b3255af95c
-EBUILD sbsigntool-0.6-r1.ebuild 1122 BLAKE2B 86c468b5de842a7b5228ebf0e4de8eb053b44e539d4bf46a563ac57e8ced2feedffa7b0ef8f891a03d5b722886e53e95a2b62d20e571434ad0b7534aac6edcf8 SHA512 3805523425a7a4b85094c7cc1a2db43b7a8a8b15ed63f587cb5d512d76774eb77a683500f33ccb69ee2c1e55a71587b2111c6fa1cd54820137da442158a9a28d
-EBUILD sbsigntool-0.8.ebuild 1242 BLAKE2B 7a26b18d70daa8c091325b3a016d634a243b57b05931b441050f77f8c435b01092ce99a52c08fe02e0d897c3c7374cd6adbdf9dfd12405a2b50f2e77678c2fd8 SHA512 bfa6d73bcf491ae0acc533d27721a18ad30b022afc26cd6f0e8cd4ade4828617ee7ef031e4782bb867b50d7652c3ccb9609b43cf4d871ffa69eb29b77bb9df34
+EBUILD sbsigntool-0.6-r2.ebuild 1063 BLAKE2B a1df369ad39fd98c81efb0c7b3f6fa43491739a3ccf36d3e5578e3dc017fef6ff8a0ec6067fb4e5f835b96dc4950d40ebeea398340a51e4aefaa9a964f59d0b1 SHA512 e9874cf541046004e0a0f2cffb4159a758eb5b878b7f3a9ecab7f36600c0b3abfa5798b69f223145d4d62df38d98f17b67319170ed6ec4209ee45c1e6c127ce5
+EBUILD sbsigntool-0.9.1-r1.ebuild 1334 BLAKE2B d773ec47da3c841c03673d852c2e32d1cea27c357028656050f3704ec1e0c7e456e712f237f90ef3dd5160a06619a8149ed24f22335e548b9bc3a718f5f5a428 SHA512 e3b42039618e185567e243f8c78756378cf0c75dd417018a658c2142bf8e9ef146f2e4e44235daa9d5d8972c7fc5c4aa1f113151c16d00800df4203f55a32fbc
 MISC metadata.xml 291 BLAKE2B 0aeb75750176d719f10db508a8924d0bf2fe75e8544b275a7c7e11c44320ce4f7819febb093dd3083a33a998a225f2a3b882407a8ffc03d1a57d03cbfc0a7ff2 SHA512 f7a520fc9a216ff983bd3d361c6ddb3b635eb5dcd94ed042e7c5d0beb0b4e10cdb231e2b4ace599ebb93d4bb46e071a744f1a780ec83f451bb2ee6bad4c2d8cc
diff --git a/app-crypt/sbsigntool/files/sbsigntool-0.9.1-openssl-1.1.0-compat.patch b/app-crypt/sbsigntool/files/sbsigntool-0.9.1-openssl-1.1.0-compat.patch
new file mode 100644
index 000000000000..2f9364f246ee
--- /dev/null
+++ b/app-crypt/sbsigntool/files/sbsigntool-0.9.1-openssl-1.1.0-compat.patch
@@ -0,0 +1,152 @@
+diff --git a/src/fileio.c b/src/fileio.c
+index 032eb1e..09bc3aa 100644
+--- a/src/fileio.c
++++ b/src/fileio.c
+@@ -40,6 +40,7 @@
+ #include <openssl/pem.h>
+ #include <openssl/err.h>
+ #include <openssl/engine.h>
++#include <openssl/ui.h>
+ 
+ #include <ccan/talloc/talloc.h>
+ #include <ccan/read_write_all/read_write_all.h>
+diff --git a/src/idc.c b/src/idc.c
+index 236cefd..6d87bd4 100644
+--- a/src/idc.c
++++ b/src/idc.c
+@@ -238,7 +238,11 @@ struct idc *IDC_get(PKCS7 *p7, BIO *bio)
+ 
+ 	/* extract the idc from the signed PKCS7 'other' data */
+ 	str = p7->d.sign->contents->d.other->value.asn1_string;
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	idcbuf = buf = ASN1_STRING_data(str);
++#else
++	idcbuf = buf = ASN1_STRING_get0_data(str);
++#endif
+ 	idc = d2i_IDC(NULL, &buf, ASN1_STRING_length(str));
+ 
+ 	/* If we were passed a BIO, write the idc data, minus type and length,
+@@ -289,7 +293,11 @@ int IDC_check_hash(struct idc *idc, struct image *image)
+ 	}
+ 
+ 	/* check hash against the one we calculated from the image */
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	buf = ASN1_STRING_data(str);
++#else
++	buf = ASN1_STRING_get0_data(str);
++#endif
+ 	if (memcmp(buf, sha, sizeof(sha))) {
+ 		fprintf(stderr, "Hash doesn't match image\n");
+ 		fprintf(stderr, " got:       %s\n", sha256_str(buf));
+diff --git a/src/sbattach.c b/src/sbattach.c
+index a0c01b8..e89a23e 100644
+--- a/src/sbattach.c
++++ b/src/sbattach.c
+@@ -231,6 +231,7 @@ int main(int argc, char **argv)
+ 		return EXIT_FAILURE;
+ 	}
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	ERR_load_crypto_strings();
+ 	OpenSSL_add_all_digests();
+ 	OPENSSL_config(NULL);
+@@ -239,6 +240,7 @@ int main(int argc, char **argv)
+ 	 * module isn't present).  In either case ignore the errors
+ 	 * (malloc will cause other failures out lower down */
+ 	ERR_clear_error();
++#endif
+ 
+ 	image = image_load(image_filename);
+ 	if (!image) {
+diff --git a/src/sbkeysync.c b/src/sbkeysync.c
+index 7b17f40..419b1e7 100644
+--- a/src/sbkeysync.c
++++ b/src/sbkeysync.c
+@@ -208,7 +208,11 @@ static int x509_key_parse(struct key *key, uint8_t *data, size_t len)
+ 		goto out;
+ 
+ 	key->id_len = ASN1_STRING_length(serial);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	key->id = talloc_memdup(key, ASN1_STRING_data(serial), key->id_len);
++#else
++	key->id = talloc_memdup(key, ASN1_STRING_get0_data(serial), key->id_len);
++#endif
+ 
+ 	key->description = talloc_array(key, char, description_len);
+ 	X509_NAME_oneline(X509_get_subject_name(x509),
+@@ -927,6 +931,7 @@ int main(int argc, char **argv)
+ 		return EXIT_FAILURE;
+ 	}
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	ERR_load_crypto_strings();
+ 	OpenSSL_add_all_digests();
+ 	OpenSSL_add_all_ciphers();
+@@ -936,6 +941,7 @@ int main(int argc, char **argv)
+ 	 * module isn't present).  In either case ignore the errors
+ 	 * (malloc will cause other failures out lower down */
+ 	ERR_clear_error();
++#endif
+ 
+ 	ctx->filesystem_keys = init_keyset(ctx);
+ 	ctx->firmware_keys = init_keyset(ctx);
+diff --git a/src/sbsign.c b/src/sbsign.c
+index ff1fdfd..78d8d64 100644
+--- a/src/sbsign.c
++++ b/src/sbsign.c
+@@ -188,6 +188,7 @@ int main(int argc, char **argv)
+ 
+ 	talloc_steal(ctx, ctx->image);
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	ERR_load_crypto_strings();
+ 	OpenSSL_add_all_digests();
+ 	OpenSSL_add_all_ciphers();
+@@ -197,6 +198,7 @@ int main(int argc, char **argv)
+ 	 * module isn't present).  In either case ignore the errors
+ 	 * (malloc will cause other failures out lower down */
+ 	ERR_clear_error();
++#endif
+ 	if (engine)
+ 		pkey = fileio_read_engine_key(engine, keyfilename);
+ 	else
+diff --git a/src/sbvarsign.c b/src/sbvarsign.c
+index 7dcbe51..9319c8b 100644
+--- a/src/sbvarsign.c
++++ b/src/sbvarsign.c
+@@ -509,6 +509,7 @@ int main(int argc, char **argv)
+ 		return EXIT_FAILURE;
+ 	}
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	/* initialise openssl */
+ 	OpenSSL_add_all_digests();
+ 	OpenSSL_add_all_ciphers();
+@@ -519,6 +520,7 @@ int main(int argc, char **argv)
+ 	 * module isn't present).  In either case ignore the errors
+ 	 * (malloc will cause other failures out lower down */
+ 	ERR_clear_error();
++#endif
+ 
+ 	/* set up the variable signing context */
+ 	varname = argv[optind];
+diff --git a/src/sbverify.c b/src/sbverify.c
+index 3920d91..d0b203a 100644
+--- a/src/sbverify.c
++++ b/src/sbverify.c
+@@ -250,6 +250,7 @@ int main(int argc, char **argv)
+ 	verbose = false;
+ 	detached_sig_filename = NULL;
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	OpenSSL_add_all_digests();
+ 	ERR_load_crypto_strings();
+ 	OPENSSL_config(NULL);
+@@ -258,6 +259,7 @@ int main(int argc, char **argv)
+ 	 * module isn't present).  In either case ignore the errors
+ 	 * (malloc will cause other failures out lower down */
+ 	ERR_clear_error();
++#endif
+ 
+ 	for (;;) {
+ 		int idx;
diff --git a/app-crypt/sbsigntool/sbsigntool-0.6-r1.ebuild b/app-crypt/sbsigntool/sbsigntool-0.6-r2.ebuild
index 60b0606bfcd4..464a4e833fb6 100644
--- a/app-crypt/sbsigntool/sbsigntool-0.6-r1.ebuild
+++ b/app-crypt/sbsigntool/sbsigntool-0.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -12,11 +12,10 @@ SRC_URI="https://launchpad.net/ubuntu/+archive/primary/+files/${PN}_${PV}.orig.t
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="libressl"
+IUSE=""
 
 RDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
+	dev-libs/openssl:0=
 	sys-apps/util-linux"
 DEPEND="${RDEPEND}
 	sys-apps/help2man
diff --git a/app-crypt/sbsigntool/sbsigntool-0.8.ebuild b/app-crypt/sbsigntool/sbsigntool-0.9.1-r1.ebuild
index 853bb5244541..70e47576c088 100644
--- a/app-crypt/sbsigntool/sbsigntool-0.8.ebuild
+++ b/app-crypt/sbsigntool/sbsigntool-0.9.1-r1.ebuild
@@ -1,23 +1,22 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="6"
 
-inherit eutils toolchain-funcs autotools-utils
+inherit eutils autotools
 
 DESCRIPTION="Utilities for signing and verifying files for UEFI Secure Boot"
 HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/jejb/sbsigntools.git/"
-SRC_URI="https://dev.gentoo.org/~tamiko/distfiles/${P}.tar.gz
-	https://dev.gentoo.org/~tamiko/distfiles/${P}-ccan.tar.gz"
+SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/jejb/${PN}s.git/snapshot/${PN}s-${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~tamiko/distfiles/${PN}-0.8-ccan.tar.gz"
 
 LICENSE="GPL-3 LGPL-3 LGPL-2.1 CC0-1.0"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="libressl"
+IUSE=""
 
 RDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
+	dev-libs/openssl:0=
 	sys-apps/util-linux"
 DEPEND="${RDEPEND}
 	sys-apps/help2man
@@ -25,9 +24,16 @@ DEPEND="${RDEPEND}
 	sys-libs/binutils-libs
 	virtual/pkgconfig"
 
-S="${WORKDIR}"
+S="${WORKDIR}/${PN}s-${PV}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-openssl-1.1.0-compat.patch
+)
 
 src_prepare() {
+	mv "${WORKDIR}"/lib/ccan "${S}"/lib || die "mv failed"
+	rmdir "${WORKDIR}"/lib || die "rmdir failed"
+
 	local iarch
 	case ${ARCH} in
 		amd64) iarch=x86_64 ;;
@@ -40,7 +46,6 @@ src_prepare() {
 	sed -i 's/-m64$/& -march=x86-64/' tests/Makefile.am || die
 	sed -i "/^AR /s:=.*:= $(tc-getAR):" lib/ccan/Makefile.in || die #481480
 
-	AUTOTOOLS_IN_SOURCE_BUILD=1
-	AUTOTOOLS_AUTORECONF=true
-	autotools-utils_src_prepare
+	default
+	eautoreconf
 }
diff --git a/app-crypt/simp_le/Manifest b/app-crypt/simp_le/Manifest
index 335cdc59461c..c5f7e139c599 100644
--- a/app-crypt/simp_le/Manifest
+++ b/app-crypt/simp_le/Manifest
@@ -1,2 +1,2 @@
-EBUILD simp_le-9999.ebuild 970 BLAKE2B dfbe1e7dd9382bd1d9947c3e83440c91ad6d53be060ad68a9151df17d88faaf6c79738db679816fcdc7cf494eb1bb4420b2d7def51c561fcc0f90b989973119e SHA512 8b052fe13b046cb3b5d9c41a05435aef33342123ca6d81d644b258e521bffede242b2ced3724d673c8cdabc6a2e136d0de1fedeba15f3cf4cf39d4521ec3ecab
+EBUILD simp_le-9999.ebuild 974 BLAKE2B a082695b383776f5c06761b1f3fbe96080ef8b1879bed1edb6d8be7178111fa6674fa1e14905d11eb9274d8d05eae50c7758b38f49fb2cc57512bb14a69210c1 SHA512 e084a93c47f47633809da87926f43be029152040b44202191119d76fbfe712c01fc8fc3b25b92596a0d4dedcd028e02c351e821987bf9c2d0e9d0f3d509b915c
 MISC metadata.xml 216 BLAKE2B f1eb090754fb8175e134db2af7c1fdecac653f3fdf8b4fe6c1a1d620f14179f5fe438b215ba4ef12c28425bf75270cec5372fafe11d2485fc3ae3452b76492b4 SHA512 8bef1d32cbf417341184ed22b8cdae39c12ece60164324cb7a3e75bf6e1af0249225b79fd6d57a1e9a4edd265162b2030f9fa547c4f661d7fe577bc89d267026
diff --git a/app-crypt/simp_le/simp_le-9999.ebuild b/app-crypt/simp_le/simp_le-9999.ebuild
index 8680a1170bcd..8ff65c7a1ac8 100644
--- a/app-crypt/simp_le/simp_le-9999.ebuild
+++ b/app-crypt/simp_le/simp_le-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=(python{2_7,3_4,3_5})
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
 
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/kuba/simp_le.git"