gentoo resync : 13.06.2020

3 files changed, 3 insertions, 146 deletions

diff --git a/dev-lang/gnat-gpl/Manifest b/dev-lang/gnat-gpl/Manifest
index 77b341585167..d796118bab9d 100644
--- a/dev-lang/gnat-gpl/Manifest
+++ b/dev-lang/gnat-gpl/Manifest
@@ -25,7 +25,6 @@ DIST gcc-6.3.0-patches-1.0.tar.bz2 7596 BLAKE2B e3c298bd80b83e72d6ea9b4ec777d4f2
 DIST gcc-7-gpl-2018-src.tar.gz 90302033 BLAKE2B 2f79137e176bff04c4fb17ab863302943588226d5b599dfa1acf0e495111be1c581f4e130f911c312916669c4f2707eec5218601db090d5060248b2fe481d710 SHA512 79f06deca5753251de82a703f4a9698c117706290df779291a5405edb06f1c225d1d2416bda0e67dcd87cc308bf79504e89d4bd8e22aa0eedfbf06d88bc37f33
 DIST gcc-7.3.0-patches-1.8.tar.bz2 14435 BLAKE2B 3e5c1abad56ccd6e0aa7739cb7cd651ec07ef9bf25be554343f1fa0444f251de41bde5fe6f8bb9e85e3f7a5cf8b2b83515647d93d62f338fa7843581fcaff2f8 SHA512 4d9d76b3d47f1af4f23cae15278d165b22065a3d1512323d1e31b5e0cb47e4654733dc43fa11906a3bd18e827621c9a5ec62b73563f8e5ead663c29f7d0d7345
 DIST gcc-8-2019-20190517-18C94-src.tar.gz 95266904 BLAKE2B 8dc1983317517e9d7221ffd3d1c804367c98a7142b3964e6382ee037da2cfebc9e044640549c77905646727e97ba108445b00f36916a65c326e862230608a7dc SHA512 50933d7eab927a2d118e01c5cb85336203544f6fbc3f245a148e952320d6f8452fcd5d355019a144e8af03357d129bb145397506db0a62fddf1f746b6671e7fc
-DIST gcc-8.3.0-patches-3.tar.bz2 15944 BLAKE2B f1ae61be794123f34ca88c279bfe33abadd37eea0ca0267ac9c0c77707dc8305063a7ecc2e23511c281f7e903dff349fef016d3fbbf3237acf383fe1639d4b7b SHA512 f43d86a55c932df4a494c6b687101a2992b91b1a4e01677165ed0f04de6108150ef713762f71d0ef764dbd4bad97a99d15fcb42c23e4bb42d83a866ff2d0c614
 DIST gcc-8.3.0-patches-4.tar.bz2 17095 BLAKE2B 449d83371bf5a70020f4caad38d7b8f79bc4b3aeb13b060d28b56506fdd33e15527ab38c41baa3134dc9a25208dadfafab5992e93b2e9719dda420f830e7a8bf SHA512 0dcc5ce887b5c1dd9977ca1b1d8760563edf7ce2d39644f6212397c55c325ee441e1e02aea623bff157d95827db25528791137edc24931a88baad6499d0d15d5
 DIST gcc-interface-4.9-gpl-2016-src.tar.gz 339037 BLAKE2B 8218ea3a3e3ddb11febb5f2fbcfad69ec25251d3ed6bf4f9c70dc9b3720cc2fb3310d704db40bd0c749be89b17a2b3766ddae3d6158313480073856057ad4bcf SHA512 507df314d1890c228c19f458bd51197377deaaa2d6082fe1e71b62b683252ee5fba4adfe2386246e14618b1c77288e0dcb5bf501e2daaca249b6299462c2f6bd
 DIST gcc-interface-6-gpl-2017-src.tar.gz 347016 BLAKE2B 934c6dac491abece9a6868d28fe9d2a6a1109238fe25c9b94abe83dfc22a1085489f0e0384626da0a3abeebe7537c5715df49a7e2d40577c96eb7ac897b84fd8 SHA512 5833303fce5bf812ccbc71f3d3726c0cb877937d75327edb15097c0b7dba58024a52688392906695ab92fb4e5d7a6623671eac9a05d17937dc0270bafcde920a
@@ -40,6 +39,5 @@ DIST gnat-gpl-2018-src.tar.gz 8706578 BLAKE2B ba245fd91cc5263d5b8c159d9e75caf6be
 EBUILD gnat-gpl-2016-r4.ebuild 4309 BLAKE2B d09b887127874269dae21ef5befa8643b49702b4f7934af0c5d06dd5c0bd3bf7255fa5c63c644b696738a127bd5e602cc88ace982738af7453c3a5523a10f730 SHA512 62b8d6f9c09b600119af3d8fac1130e8f366bcf234a82c4bf4ce84ff8799889b9ca462f0b884ee2f78bc1744c9042d55111e8fe5d3b6d0613928981fb27bd5f9
 EBUILD gnat-gpl-2017-r1.ebuild 3750 BLAKE2B be2513ac0e0f9c899b6660355d9417e83ac7ac3c200012bef5b817f4ba8ae916f81438fcc7478bb096b0271a40f83ae8f2a4b5f52a627fc71fe0458127a21c4e SHA512 4626e97ee7c0841bc78c4128584a07b6a4f0f0f42e11b67aab0e569a00c6ec02a0bfb3cb78b740bd1e3430fc5bbcf80831ccadc7dfd1673594a14c51186563e2
 EBUILD gnat-gpl-2018-r3.ebuild 3760 BLAKE2B ffd8d01aecf4c70d9f00176c3d71b8c71fbe0913618e4350c77dbe4d3425376720b10e2a57e30254fb1924c9862a433c1640ab29a036b6faa0e627d3cb6c88b2 SHA512 630636ebac26b66014ffd389faff5693ec40718db7dc9649233c367bbce68d295c31fdb18c896c9b1ce51c57e064db79267c88d5a5e7f9a3f81e17a10ed28724
-EBUILD gnat-gpl-2019-r1.ebuild 3614 BLAKE2B 94e7f91af4ae1c815c42325108f0c80bbb698cd42c6511c133485c8bfbbe429a7dfc1199513ec3ebcdf0116e4e3b42669dc6b72f2e6a3771b1ae2dae90da3ab2 SHA512 eae91bca84869a1a0e4308ec8f8f35aa3e22be8d049097d00f9950d8ac07078a184ff8d9c3fcb7ef4ecbe1f849ba93b1de074652fa13570c73bb1b8fac318a2f
-EBUILD gnat-gpl-2019-r2.ebuild 3616 BLAKE2B aa83e67923a2e58839e516d8f23143e9b63b6a40e882975b5c4804638bb508c2b379613d332a50559a27f2e2e419ac26a0ad4086f403df09d200c3a2752a5934 SHA512 2d0a4127993cafac7bb76810748b712f1fcb89ef0a3fc84f6af2df07416601994af6fbcb06d47b08d129dbbb0e5b84e3703ed4098468f661ed6f0dd7c075b5c7
+EBUILD gnat-gpl-2019-r2.ebuild 3603 BLAKE2B 2df7cbc37b3080ae88c911fa75c977f48ba69e8f8d52ddfe8bca7f2f558a4a8362bfc1ab9285806a004ef70ea11dd89747214094caa8ad9aa48db89af33107bf SHA512 3c05ab26066429d83dd6efff65fdeb3e91f05446a83d8b4fc68b3d534a4c5e7ef6769f16b5d02b00747e68cc617a5b7035fd011721b9b4916b52245419405cec
 MISC metadata.xml 2217 BLAKE2B 3862fbb5ca8625a16c4031de574ff280c9aef0522dee6a8578615d5161daefaf636c8564cb4995e0096ff74728c9bb68e61af93c799c736c1f0fb69b34a4d1d3 SHA512 5880952bc0f2de368250178859059204fc527dd8e3b178ef689e5f1cebae90dd65840658afeda3f1ac18115ef6023b9ebea45a485e56dcfec719ce091f36c274
diff --git a/dev-lang/gnat-gpl/gnat-gpl-2019-r1.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2019-r1.ebuild
deleted file mode 100644
index 6f1e39dc569f..000000000000
--- a/dev-lang/gnat-gpl/gnat-gpl-2019-r1.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PATCH_GCC_VER=8.3.0
-PATCH_VER="3"
-
-TOOLCHAIN_GCC_PV=8.3.1
-
-REL=8
-MYP=gcc-${REL}-${PV}-20190517-18C94-src
-GNATDIR=gnat-${PV}-20190517-18C94-src
-INTFDIR=gcc-interface-${REL}-${PV}-20190510-18F59-src
-BTSTRP_X86=gnat-gpl-2014-x86-linux-bin
-BTSTRP_AMD64=gnat-gpl-2014-x86_64-linux-bin
-
-# we provide own tarball below
-GCC_TARBALL_SRC_URI="
-	http://mirrors.cdn.adacore.com/art/5cdf865331e87aa2cdf16b49
-		-> ${GNATDIR}.tar.gz
-	http://mirrors.cdn.adacore.com/art/5cdf8a0731e87a8f1d425049
-		-> ${MYP}.tar.gz
-	http://mirrors.cdn.adacore.com/art/5cdf87cc31e87aa2cdf16b50
-		-> ${INTFDIR}.tar.gz
-	bootstrap? (
-		amd64? (
-			http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c ->
-			${BTSTRP_AMD64}.tar.gz
-		)
-		x86? (
-			http://mirrors.cdn.adacore.com/art/564b3e9dc8e196b040fbe248 ->
-			${BTSTRP_X86}.tar.gz
-		)
-	)"
-
-inherit toolchain-funcs toolchain
-
-DESCRIPTION="GNAT Ada Compiler - GPL version"
-HOMEPAGE="http://libre.adacore.com/"
-
-LICENSE+=" GPL-2 GPL-3"
-KEYWORDS="amd64 x86"
-IUSE="+ada +bootstrap"
-RESTRICT="!test? ( test )"
-
-RDEPEND="!sys-devel/gcc:${TOOLCHAIN_GCC_PV}"
-DEPEND="${RDEPEND}
-	elibc_glibc? ( >=sys-libs/glibc-2.13 )
-	>=sys-devel/binutils-2.20"
-
-S="${WORKDIR}"/${MYP}
-PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )"
-
-pkg_setup() {
-	toolchain_pkg_setup
-
-	if use amd64; then
-		BTSTRP=${BTSTRP_AMD64}
-	else
-		BTSTRP=${BTSTRP_X86}
-	fi
-
-	if use bootstrap; then
-		GCC="${WORKDIR}"/${BTSTRP}/bin/gcc
-	else
-		GCC=${ADA:-$(tc-getCC)}
-	fi
-
-	gnatbase=$(basename ${GCC})
-	gnatpath=$(dirname ${GCC})
-
-	GNATMAKE=${gnatbase/gcc/gnatmake}
-	if [[ ${gnatpath} != "." ]] ; then
-		GNATMAKE="${gnatpath}/${GNATMAKE}"
-	fi
-}
-
-src_unpack() {
-	if ! use bootstrap && [[ -z "$(type ${GNATMAKE} 2>/dev/null)" ]] ; then
-		eerror "You need a gcc compiler that provides the Ada Compiler:"
-		eerror "1) use gcc-config to select the right compiler or"
-		eerror "2) set the bootstrap use flag"
-		die "ada compiler not available"
-	fi
-
-	toolchain_src_unpack
-	if use bootstrap; then
-		rm ${BTSTRP}/libexec/gcc/*/4.7.4/ld || die
-	fi
-}
-
-src_prepare() {
-	CC=${GCC}
-	CXX="${gnatbase/gcc/g++}"
-	GNATBIND="${gnatbase/gcc/gnatbind}"
-	GNATLINK="${gnatbase/gcc/gnatlink}"
-	GNATLS="${gnatbase/gcc/gnatls}"
-	if [[ ${gnatpath} != "." ]] ; then
-		CXX="${gnatpath}/${CXX}"
-		GNATBIND="${gnatpath}/${GNATBIND}"
-		GNATLINK="${gnatpath}/${GNATLINK}"
-		GNATLS="${gnatpath}/${GNATLS}"
-	fi
-	mkdir bin || die
-	ln -s $(which ${GCC}) bin/gcc || die
-	ln -s $(which ${CXX}) bin/g++ || die
-	ln -s $(which ${GNATMAKE}) bin/gnatmake || die
-	ln -s $(which ${GNATBIND}) bin/gnatbind || die
-	ln -s $(which ${GNATLINK}) bin/gnatlink || die
-	ln -s $(which ${GNATLS}) bin/gnatls || die
-
-	cd ..
-	mv ${GNATDIR}/src/ada ${MYP}/gcc/ || die
-	mv ${INTFDIR} ${MYP}/gcc/ada/gcc-interface || die
-	eapply "${FILESDIR}"/${P}-gentoo.patch
-	rm patch/27*.patch || die
-	rm patch/28*.patch || die
-	cd -
-	sed -i \
-		-e 's:$(P) ::g' \
-		gcc/ada/gcc-interface/Makefile.in \
-		|| die "sed failed"
-	toolchain_src_prepare
-}
-
-src_configure() {
-	export PATH=${PWD}/bin:${PATH}
-	downgrade_arch_flags "$(gcc-version)"
-	toolchain_src_configure
-}
-
-pkg_postinst() {
-	toolchain_pkg_postinst
-	einfo "This provide the GNAT compiler with gcc for ada/c/c++ and more"
-	einfo "The compiler binary is ${CTARGET}-gcc-${TOOLCHAIN_GCC_PV}"
-	einfo "Even if the c/c++ compilers are using almost the same patched"
-	einfo "source as the sys-devel/gcc package its use is not extensively"
-	einfo "tested, and not supported for updating your system, except for ada"
-	einfo "related packages"
-}
diff --git a/dev-lang/gnat-gpl/gnat-gpl-2019-r2.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2019-r2.ebuild
index f6f02fcd579a..397ec960074f 100644
--- a/dev-lang/gnat-gpl/gnat-gpl-2019-r2.ebuild
+++ b/dev-lang/gnat-gpl/gnat-gpl-2019-r2.ebuild
@@ -40,9 +40,9 @@ DESCRIPTION="GNAT Ada Compiler - GPL version"
 HOMEPAGE="http://libre.adacore.com/"
 
 LICENSE+=" GPL-2 GPL-3"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+ada +bootstrap"
-RESTRICT="!test? ( test )"
+RESTRICT="test"
 
 RDEPEND="!sys-devel/gcc:${TOOLCHAIN_GCC_PV}"
 DEPEND="${RDEPEND}