gentoo resync 08.09.2018

4 files changed, 2 insertions, 111 deletions

diff --git a/app-crypt/p11-kit/Manifest b/app-crypt/p11-kit/Manifest
index 841f7baa49d4..03b9c30b8927 100644
--- a/app-crypt/p11-kit/Manifest
+++ b/app-crypt/p11-kit/Manifest
@@ -1,7 +1,3 @@
 DIST p11-kit-0.23.12.tar.gz 1257028 BLAKE2B 8add003ad298b7c4548c40f863835e9aae4234a66a4b216149be7c473f2b3b7ffb633b95883d58e5b039c974dd8571e56e23f6dcc77e484672605e6178d75ad2 SHA512 ae43b1f6ba5400cf5ae7b64b8c93aa47e5c7ee927196828600fd88beb6fdf6bcb6a63bc822d356757255638f9fbf10896e0604e32a1332a9a833836fa0468726
-DIST p11-kit-0.23.2.tar.gz 1022733 BLAKE2B 09d1e1c9c9cc9bd330923f6aa37026b6f3b67fd728e4fdf2c692f0eaa1a27b1a045c263ba66d57063b8a03f8dc1ccd4d20bf5f255fc6e21d8ea600696f45d9ea SHA512 b665d89f0d752a41b01ec53e29c801c4fdcaf3f21fce524984b10acef0477ad5dbac085edd35ffb747423d0e1e09660b8d29501c979cf54937d3b9d2561cf18f
-DIST p11-kit-0.23.9.tar.gz 1091561 BLAKE2B 9ad061e703f8a7bcf677d974316adc3c96c34765bcee9834e65850b16fd7afa6ab2ffade18a65b99b85ec1af877d74938cf9369797f914d622c15e218801351a SHA512 6a8a569483763d3ffacadf669b8ba9b9be38a77dd8dc366ca0cb91c44753517fa1879d4422e4e8dfbcac594565727839a619566a170c0f94f8e112f18b0086ed
-EBUILD p11-kit-0.23.12.ebuild 1985 BLAKE2B df7e9ea182f7c897d681e7171d057c6e54bac6e10edca6d5797d4659be8488a3eef17e7407a2e356576fa9845edfc51de4b3b4acbfde654ba8965084b50b62a8 SHA512 b018a44a7c03796e4fe5cf85872b38be0815ccb4bb11c2b97fdbe3a8cce1a36c8a0fa01f974779a1a8da52d105370ed477f136b08ea074678ffd347797f043dd
-EBUILD p11-kit-0.23.2.ebuild 1311 BLAKE2B 6f255091c7997b46f069719d8b9c20258ea36cd44bd06907d2620686714c6b8a5e4f68d9bfd5487ea5f6b0a5166af1bcdd3c9b4d3cbbb23641954cc882208491 SHA512 f953eb10926bdee9eb715cfa4333eea30e238f46795caec23cf495f573fd33fd464705de86c9ab9af55eb98d4652c6204dfce578abc854af44343ece85f3c70c
-EBUILD p11-kit-0.23.9.ebuild 1981 BLAKE2B ea17f5981f26ee2d34d5bfa1737a7cc4e9ff182dd56997bf7e1af26500a09ac325379dfb17c00ecdb5085346a58ce8d52ac7c05cb4185b97fefb67d3fb94e1ae SHA512 2265c63bf95e9899303bc8b12ca7a511cfa99e20ffcc214014d4c7cce2d6ec55cdf2afb69c7790eb074546c50768f085c0a02ad43ebcfa2798db43693f4e7b57
+EBUILD p11-kit-0.23.12.ebuild 1972 BLAKE2B 6dcbcaec1e9d9a9083773895a813ee0629479023dbc9d24e4c457ac7c07b6b0483d2ac79002b2538bb116b08c00b6b269f9af1c679b4fb60427def94205709bf SHA512 823fd39dc0d39603689016ae55943766224631fff0844b48ce199978c79325d183772f92a2a6f2a95198903267ba91e4d3040e267453fc998b9c4c0674d46851
 MISC metadata.xml 454 BLAKE2B 82db424896936d17b167806a47d54674d1d6eebe192ad1f8b4e985b00f74f10aa5f18ea587b866906571a91dcfda83626f6b25ebdbd6a6e02da65b34511b2b0e SHA512 24042c945cc3ab622b74c30eaa08819ebce4af9320b083ceb1f3f4db110fba6539121b4dbf0d245afdc395a9854bec022575861f7ae4e9418018d6bddbd4a888
diff --git a/app-crypt/p11-kit/p11-kit-0.23.12.ebuild b/app-crypt/p11-kit/p11-kit-0.23.12.ebuild
index 8c36bbf47e96..2fbefcc00f72 100644
--- a/app-crypt/p11-kit/p11-kit-0.23.12.ebuild
+++ b/app-crypt/p11-kit/p11-kit-0.23.12.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~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 )"
 
diff --git a/app-crypt/p11-kit/p11-kit-0.23.2.ebuild b/app-crypt/p11-kit/p11-kit-0.23.2.ebuild
deleted file mode 100644
index b39df734b446..000000000000
--- a/app-crypt/p11-kit/p11-kit-0.23.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit ltprune multilib-minimal
-
-DESCRIPTION="Provides a standard configuration setup for installing PKCS#11"
-HOMEPAGE="https://p11-glue.freedesktop.org/p11-kit.html"
-SRC_URI="https://p11-glue.freedesktop.org/releases/${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"
-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
-}
-
-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() {
-	prune_libtool_files --modules
-}
diff --git a/app-crypt/p11-kit/p11-kit-0.23.9.ebuild b/app-crypt/p11-kit/p11-kit-0.23.9.ebuild
deleted file mode 100644
index 9b870b147b09..000000000000
--- a/app-crypt/p11-kit/p11-kit-0.23.9.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 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
-}