gentoo resync : 23.09.2020

3 files changed, 3 insertions, 81 deletions

diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index 74669641e384..6919ce47025a 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -1,7 +1,5 @@
 AUX libgcrypt-1.6.1-uscore.patch 843 BLAKE2B a1023bf915e342dd52d07d4c497d3e514c8c4b6c621e4f8704c4841fd95d48773f0af850a456c6f80b80deed878be1334f08f8181f97dce64ed9e61f5cb1bae5 SHA512 971814ac34f17464a96fbc110fe995923d873981949a0126e50c206d39499d6146fd00414e837774e6932e4b491cc68c4147278d6216dda630fb876bc8f61791
 AUX libgcrypt-multilib-syspath.patch 588 BLAKE2B 6a8d30246263339571455df3c1cccfc9f38e50117cef34bc92ce37a296c3e31017c0190923ea992f51706c55a63c6f75b1d9fc7d8d40930707486f419e1795c4 SHA512 913c1a474aba50ec3589fb5a991f65204ba2cc28203b92353fdef8fb092350c3be814a57f29a26a2176627509a4f573f6db02ebdbcde3f04a2f1d632879293dc
-DIST libgcrypt-1.8.5.tar.bz2 2991291 BLAKE2B 93276b4536f71c07bb103e10607592e02add413f633d96cc95513daa6e6b0e098fe803bb6a0e405a241fddc5ce0cfad61658d57c27bd724eecd32fd862af4c99 SHA512 b55e16e838d1b1208e7673366971ae7c0f9c1c79e042f41c03d14ed74c5e387fa69ea81d5414ffda3d2b4f82ea5467fe13b00115727e257db22808cf351bde89
 DIST libgcrypt-1.8.6.tar.bz2 2997781 BLAKE2B 90ecacae75633dfff248b9c07a72126aaa4a5c285141f89c42237326ae3bfb99c937eef05d87b466c3d8f5cf022725ccee5c0dbc74d4eb57523a8a2892864b65 SHA512 28a26f665b7e327b79815849ee6e84ab384ee9105d81d4d06e4feeea07d986f940cbbb9faaae8712068cace45b4110a62965a93201da0e1ad008b65808b2b29b
-EBUILD libgcrypt-1.8.5.ebuild 2303 BLAKE2B 6a53021a185faa4382b2e2285fa5c2d11dd22fe58dc96997d57ecc488a147901fdf284980b817832ab74479213140f41403f0ba04f6de8a9091bfd15f502e0fd SHA512 d6a9b8a2fef2dcb37f7ce86247b2147fb3bd35d320c21e2973f73edff7c48fe7a742c6fdf54e4f884767dc5603c5fa470d7da44a6511257f2e1ed2b9327a5eed
-EBUILD libgcrypt-1.8.6.ebuild 2280 BLAKE2B 998db4aa411fd93ec925e9a175d1b6f127c337883119ab727640ed096196b929b8822a4d56489513c3293e64e8c701b78653fccdb5e4ba60a00301b7232761e7 SHA512 11f08c192981573c502c81dfb7c2f396639e48904a523cbf5b0a072c1aecff2c60bfdaaed400c69f73ba17459575a69df5711ce66d0018fe755c4278d09b20d6
+EBUILD libgcrypt-1.8.6.ebuild 2252 BLAKE2B 282625b77faf7a06d9ed5b33e96d163254af1c0b1edcdaec38ed4a882b1a623cb7ade5a482987430fd59f0b2688f2cebbbf50435a59471b13e0a56005a9cd181 SHA512 a656809c97a012245ece9578eeaec9e1d8b1d2cf12b307762d28c2ac9fa9f8abcb38dcad676e79990feeca10840138cf5134b8fa15920316b43f541fe6c82a33
 MISC metadata.xml 425 BLAKE2B c695b3057b3db22d3daf36a70b3d6000b55dc9c7fd4ca3a6274dde8a03c15976152bb7c44e6c4f01c11a98122f646c9660fd6d9e8d5b36041b02d63b27c97d0d SHA512 5d7c60f28eb813fc9f758cc6aaa07fb3a1e3ebe77ce89dba2f8fc56907a6d17affa252e92a2c2edd302ffa83d8d54f64f1b002411c418aae8e9cd3de19458c14
diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.5.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.5.ebuild
deleted file mode 100644
index 5fbc1de87647..000000000000
--- a/dev-libs/libgcrypt/libgcrypt-1.8.5.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic multilib-minimal toolchain-funcs
-
-DESCRIPTION="General purpose crypto library based on the code used in GnuPG"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1 MIT"
-SLOT="0/20" # subslot = soname major version
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc o-flag-munging static-libs"
-
-RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-BDEPEND="doc? ( virtual/texi2dvi )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.6.1-uscore.patch
-	"${FILESDIR}"/${PN}-multilib-syspath.patch
-)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/libgcrypt-config
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	if [[ ${CHOST} == *86*-solaris* ]] ; then
-		# ASM code uses GNU ELF syntax, divide in particular, we need to
-		# allow this via ASFLAGS, since we don't have a flag-o-matic
-		# function for that, we'll have to abuse cflags for this
-		append-cflags -Wa,--divide
-	fi
-	local myeconfargs=(
-		CC_FOR_BUILD=$(tc-getBUILD_CC)
-		--enable-noexecstack
-		$(use_enable o-flag-munging O-flag-munging)
-		$(use_enable static-libs static)
-
-		# disabled due to various applications requiring privileges
-		# after libgcrypt drops them (bug #468616)
-		--without-capabilities
-
-		# http://trac.videolan.org/vlc/ticket/620
-		# causes bus-errors on sparc64-solaris
-		$([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm")
-		$([[ ${CHOST} == sparcv9-*-solaris* ]] && echo "--disable-asm")
-
-		GPG_ERROR_CONFIG="${EROOT}/usr/bin/${CHOST}-gpg-error-config"
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" \
-		$("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')
-}
-
-multilib_src_compile() {
-	default
-	multilib_is_native_abi && use doc && VARTEXFONTS="${T}/fonts" emake -C doc gcrypt.pdf
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-	multilib_is_native_abi && use doc && dodoc doc/gcrypt.pdf
-}
-
-multilib_src_install_all() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.6.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.6.ebuild
index c8e40f012825..5b264afc9cdf 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.8.6.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.8.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 LICENSE="LGPL-2.1 MIT"
 SLOT="0/20" # subslot = soname major version
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc o-flag-munging static-libs"
+IUSE="doc o-flag-munging"
 
 RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
@@ -42,8 +42,8 @@ multilib_src_configure() {
 	local myeconfargs=(
 		CC_FOR_BUILD=$(tc-getBUILD_CC)
 		--enable-noexecstack
+		--disable-static
 		$(use_enable o-flag-munging O-flag-munging)
-		$(use_enable static-libs static)
 
 		# disabled due to various applications requiring privileges
 		# after libgcrypt drops them (bug #468616)