gentoo christmass resync : 25.12.2020

3 files changed, 2 insertions, 109 deletions

diff --git a/dev-libs/gmp/Manifest b/dev-libs/gmp/Manifest
index 4b40e3151abb..135e6aeaa1fe 100644
--- a/dev-libs/gmp/Manifest
+++ b/dev-libs/gmp/Manifest
@@ -1,8 +1,6 @@
 AUX gmp-6.1.0-noexecstack-detect.patch 970 BLAKE2B 3b74021e37d5fd6b0b7baa6ad8298962c54cceb769a5f70b3c5fb5ef82392ee2308e6613cd93b0a78b69235c1a73aedc0eb54bbc77b0daebc022d3f1bd05413d SHA512 29af921eed5dbd2d506bc1acdc0eacb8b7f5e7f575fd62038f00a910242bf622980a4197dae18daf5915963c3407ca7eb5bdcb9760f958794348b449fc54e042
 AUX gmp-6.1.2-gcc-apple-4.0.1.patch 979 BLAKE2B 0fe8bf2db0e4633f5d230f02a0bbeb8f0a0dea5c5f2b79e0821733612dadcb0ae4c5815255640afe383e8424e2cf323c0ae33990ee2c21e963811ac434b466a1 SHA512 d1d9898c1978dcdc41dce95d2fc9e23f2ccb0615d02ca453045ece04e9bfd45aa9194774e1e3ea4efe7b40c8f2179233dbecbaa748e7c40d4f31f3adc78d878e
-DIST gmp-6.2.0.tar.xz 2012444 BLAKE2B 928141cf7b0b70f78b66e7bc52aecd39a5fc30e8865b6de6effb5b061ade05a5a51b4680ef2f36ea0d682b319d54ceb1c6c8ef93bde6c2eef2e8b826a34602c3 SHA512 a066f0456f0314a1359f553c49fc2587e484ff8ac390ff88537266a146ea373f97a1c0ba24608bf6756f4eab11c9056f103c8deb99e5b57741b4f7f0ec44b90c
 DIST gmp-6.2.1.tar.xz 2027316 BLAKE2B c0d85f175392a50cfa01bc6b0a312b235946ad8b4f6f84f6dabd33d7a6f2cc75c9b0e1e33057be07750bfa0145b7c4cf3b6188a5be6ca9d7271ec2276c84ebcb SHA512 c99be0950a1d05a0297d65641dd35b75b74466f7bf03c9e8a99895a3b2f9a0856cd17887738fa51cf7499781b65c049769271cbcb77d057d2e9f1ec52e07dd84
 DIST gmp-man-6.2.0.pdf 828998 BLAKE2B 0bf56bf0a6f1aac0e1fb9a5a37552f846a2d4a01bfd3f5b5c531d42a9afc48c19552e08971785805f59e3f2a5fd89e3f986f841dca2e340813596cfd76574e61 SHA512 25d129efedd329cd2d4535557c6912191f587bfd8ef028618b4ca6199ec7bf7a9ae862e7f5e5b5448c86888452a39fc7bf95cf9c18311858dd1aa9ae1c716239
-EBUILD gmp-6.2.0-r1.ebuild 3008 BLAKE2B 32304976b7a0c1c8d8dd5cde7f0b30b41e3568e40fb3b22283fcd87df5e9fca03224dc0f9a5ef31040df914c499070edb9664c34db3534a1d8b5662eef90a564 SHA512 1f007bbd5ebcfe296cdc58db07a96a64819e4e9b2354b3480580b905f458a90e7756157ba9dc88f34dd0b556c0e111956164d477285ce299c134decc166e8124
-EBUILD gmp-6.2.1.ebuild 3090 BLAKE2B 649e43d598437975eade390df11c295f0525af1f68f906bbb5b9fe8a7d13fa17755c28d1a15724bb44f58eefa22df3b219be22200dfd7815423126f4163aa206 SHA512 5ab0d2e36e55fc4373bb2224ab6ea6f86f049973df60c95d9cded1a7d2d8ba6ea40044213332ebd24d26e2671257ce05e8c135014580d563e3b0b16bbbdbd81a
+EBUILD gmp-6.2.1.ebuild 3081 BLAKE2B 6b01532390466dce9e277d9cdf71c32718c5bec50ff14ed11959ece01acbcf4b6f9b95a1ec9e7c0c3e3418f8a5bfbeb2d065439f494c7882e5f6fca98fab02a8 SHA512 2af2f0427b04caaf9df95e6d4e3386c137ed431bf5c5a240039c0ef19918a359d2d49004625490de3fe9b3d11b5e70555ddd4daf32c4b485d6834d0b4d378b69
 MISC metadata.xml 523 BLAKE2B fc919502e81ea5a1a169284b1782a8044887082e485cfb8497eef7c4cd5cf6c2170818ca6a60b43d90d92eea03f82535a58e72346ba3e8eff240a3a3be4a7f99 SHA512 ea63c1b90851f602787ff84b8e6dbc51f56bf9e5c724ff4a9e7367af83ce8d2d8d0a17770c29e23d00167cbe033292b614195912bd40cb404824c4d22bdda82b
diff --git a/dev-libs/gmp/gmp-6.2.0-r1.ebuild b/dev-libs/gmp/gmp-6.2.0-r1.ebuild
deleted file mode 100644
index 4417fecb70cc..000000000000
--- a/dev-libs/gmp/gmp-6.2.0-r1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic eutils libtool multilib-minimal toolchain-funcs
-
-MY_PV=${PV/_p*}
-MY_PV=${MY_PV/_/-}
-MY_P=${PN}-${MY_PV}
-PLEVEL=${PV/*p}
-DESCRIPTION="Library for arbitrary-precision arithmetic on different type of numbers"
-HOMEPAGE="https://gmplib.org/"
-SRC_URI="ftp://ftp.gmplib.org/pub/${MY_P}/${MY_P}.tar.xz
-	mirror://gnu/${PN}/${MY_P}.tar.xz
-	doc? ( https://gmplib.org/${PN}-man-${MY_PV}.pdf )"
-
-LICENSE="|| ( LGPL-3+ GPL-2+ )"
-# The subslot reflects the C & C++ SONAMEs.
-SLOT="0/10.4"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+asm doc +cxx pic static-libs"
-
-BDEPEND="sys-devel/m4
-	app-arch/xz-utils"
-
-S=${WORKDIR}/${MY_P%a}
-
-DOCS=( AUTHORS ChangeLog NEWS README doc/configuration doc/isa_abi_headache )
-HTML_DOCS=( doc )
-MULTILIB_WRAPPED_HEADERS=( /usr/include/gmp.h )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.1.0-noexecstack-detect.patch
-)
-
-src_prepare() {
-	default
-
-	# note: we cannot run autotools here as gcc depends on this package
-	elibtoolize
-
-	# https://bugs.gentoo.org/536894
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		eapply "${FILESDIR}"/${PN}-6.1.2-gcc-apple-4.0.1.patch
-	fi
-
-	# GMP uses the "ABI" env var during configure as does Gentoo (econf).
-	# So, to avoid patching the source constantly, wrap things up.
-	mv configure configure.wrapped || die
-	cat <<-\EOF > configure
-	#!/usr/bin/env sh
-	exec env ABI="${GMPABI}" "$0.wrapped" "$@"
-	EOF
-	# Patches to original configure might have lost the +x bit.
-	chmod a+rx configure{,.wrapped} || die
-}
-
-multilib_src_configure() {
-	# Because of our 32-bit userland, 1.0 is the only HPPA ABI that works
-	# https://gmplib.org/manual/ABI-and-ISA.html#ABI-and-ISA (bug #344613)
-	if [[ ${CHOST} == hppa2.0-* ]] ; then
-		GMPABI="1.0"
-	fi
-
-	# ABI mappings (needs all architectures supported)
-	case ${ABI} in
-		32|x86)       GMPABI=32;;
-		64|amd64|n64) GMPABI=64;;
-		[onx]32)      GMPABI=${ABI};;
-	esac
-	export GMPABI
-
-	#367719
-	if [[ ${CHOST} == *-mint* ]]; then
-		filter-flags -O?
-	fi
-
-	# --with-pic forces static libraries to be built as PIC
-	# and without TEXTRELs. musl does not support TEXTRELs: bug #707332
-	tc-export CC
-	ECONF_SOURCE="${S}" econf \
-		CC_FOR_BUILD="$(tc-getBUILD_CC)" \
-		--localstatedir="${EPREFIX}"/var/state/gmp \
-		--enable-shared \
-		$(use_enable asm assembly) \
-		$(use_enable cxx) \
-		$(use pic && echo --with-pic) \
-		$(use_enable static-libs static)
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	# should be a standalone lib
-	rm -f "${ED}"/usr/$(get_libdir)/libgmp.la
-	# this requires libgmp
-	local la="${ED}/usr/$(get_libdir)/libgmpxx.la"
-	use static-libs || rm -f "${la}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	use doc && cp "${DISTDIR}"/gmp-man-${MY_PV}.pdf "${ED}"/usr/share/doc/${PF}/
-}
diff --git a/dev-libs/gmp/gmp-6.2.1.ebuild b/dev-libs/gmp/gmp-6.2.1.ebuild
index 85f0e1d3160b..4467d61aca90 100644
--- a/dev-libs/gmp/gmp-6.2.1.ebuild
+++ b/dev-libs/gmp/gmp-6.2.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="ftp://ftp.gmplib.org/pub/${MY_P}/${MY_P}.tar.xz
 LICENSE="|| ( LGPL-3+ GPL-2+ )"
 # The subslot reflects the C & C++ SONAMEs.
 SLOT="0/10.4"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+asm doc +cxx pic static-libs"
 
 BDEPEND="sys-devel/m4