gentoo resync : 15.06.2021

4 files changed, 7 insertions, 85 deletions

diff --git a/dev-ada/xmlada/Manifest b/dev-ada/xmlada/Manifest
index b56024a02bd6..9bfeb17faa87 100644
--- a/dev-ada/xmlada/Manifest
+++ b/dev-ada/xmlada/Manifest
@@ -1,7 +1,6 @@
 AUX xmlada-2019-gentoo.patch 1053 BLAKE2B 33403adf7bf4f774d7fbcf9f07fe0d248a0c7e54df1d4620231813519932b91522c6d17f4f1774b84f48975cb5ca1e14cb01e87607da86df5a005b6766c9b1ff SHA512 0cdd0e9ff1cafcacaaeadb541ab0fa6a783dfd4b2d51528d18eeb99fdcba4a0a1f005c6210d5ac6b0c3052eb67e777f5e481d7fd8ef723d93be1561fba2afe26
 DIST xmlada-2020-20200429-19A99-src.tar.gz 1533111 BLAKE2B e2c25e103c5c560cf7c9580118580e2952f3ef56c244b0f76c7f484e5629b684d5ee546d2d40520e1a4bf963271d360522423f4e7d81570f7dc1dbc8424c9147 SHA512 e53dd1fba504d2aa91ce29ea381c62adea12c5d8c72cd87396b903143279456cc6547c18035f6e988e95bd93607360075789532378f33cbe23bef9b49c8d984c
 DIST xmlada-2021-20210518-19D50-src.tar.gz 1555951 BLAKE2B 589815d4781471a48d3bb4a12475762cb2ba8f885df8ea774f009c8be9ded41bccc414bb88a2b3d313701b0b2edefcd065fac8a13d208a7bb1679a3467a60c35 SHA512 e2fb1a87cb0cebae842f87412d0ccc8a18b20e5e2c4e3d9ad6ec3a6ae18e4e53c12efd9ea3f2515baa5bfec2b4ddee7808385cc471e3cca9b8c4be3d03093e85
-EBUILD xmlada-2020-r1.ebuild 1826 BLAKE2B 87c968eb610b6de9d4bd195c6d0162a77fbfec5c8c75ad7dd60bf558d45ad5c19cb845a17fda948cd81ffd0e6511fddb3d3993578af8c45173da1bb12218044d SHA512 7e89f731395ffb53c0ec1c2de36bc965138523b35cfc2bdf403491201c19a9cd92e87623eb75f85415d338bceb8be7cfa62bb0c174be34f15bcbcaa80a76dcd6
-EBUILD xmlada-2020.ebuild 1986 BLAKE2B cdf92efc79b033ec8071a3464303c538e950e03cd24543b8ab054f698231a40af742607d7dd2ec9601543d0001a5192d762d72cfe31df109b8dd343644f030c8 SHA512 603a5f3ef31f01f138b0d5f59dce45fc7ae0f606cc094dbbac228569f9fec602b01ab38353c0652b72c2a97f858b9416106cf7f8bc96b4a50010430cc44f4546
-EBUILD xmlada-2021.ebuild 1827 BLAKE2B c3c6ed03bc25565f5c52464881c11e9b76d7a1b95b39cd936319e728cd988cefd00c119515401ebf1125d9f79156a3e0d7c8bc7e946bf539029df93d540c5b34 SHA512 189e4d0357fe174437e52d435a3603fc93f2e478f56713508d99a7743375d58730e40c29b7206bfc38ab69864be1e7d0f6d7681f3894149251cfbb1d302a5632
+EBUILD xmlada-2020.ebuild 1983 BLAKE2B c0a5071421bea52e92e98b9aaed78674ef99b27e2d025e9a6e802268329ddd10e2d98155f51d96591d2c2efc55fa1b58d4f0684b04580061a4db6331e0c432c8 SHA512 8398141057cfbb291b4dd11b54d11186068e141d3e8a06ef9fe4eedf256d1a868baef2ceb5d595d54a2396c2ceec70dfb0c4a0a446c2a8a964a821b5b66be6b8
+EBUILD xmlada-2021.ebuild 1858 BLAKE2B d49f9f81eafcfc01c725ff7edbb50e1ce526e2b00aaba0ed8a2c90c142da9d30e1c6e637c4a655b516a2022da66b453c9076ade2aa5cbf4570b0571e031f5059 SHA512 eeee8789ee053d02cd0dbb2ac1efc4eed798b730ecef1ac4612a4962549e989b52ea8f1cece0fa83f06469e99ef646778502063ff076be53f0228324456ba6be
 MISC metadata.xml 907 BLAKE2B c57fbc3e91a6647b5687dc02c78986d161d6a8482119984a420685ce5366a4e0901aca404d066259b1e8384ba45875f15e54810d6d0fe97812ed3fb1983f1a91 SHA512 eb1acaf3359b0ca8544e07e5681ec2ab800581401644f3ee2313dcca9be163e2bdeac16b551aacb19402fd13c18e0787850fb5529382e3e0e77ba4a1b420f53a
diff --git a/dev-ada/xmlada/xmlada-2020-r1.ebuild b/dev-ada/xmlada/xmlada-2020-r1.ebuild
deleted file mode 100644
index 4ed5844ed1f6..000000000000
--- a/dev-ada/xmlada/xmlada-2020-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ADA_COMPAT=( gnat_201{6..9} gnat_202{0..1} )
-inherit ada multiprocessing
-
-MYP=${P}-20200429-19A99-src
-
-DESCRIPTION="Set of modules that provide a simple manipulation of XML streams"
-HOMEPAGE="http://libre.adacore.com/"
-SRC_URI="https://community.download.adacore.com/v1/c799502295baf074ad17b48c50f621879c392c57?filename=${MYP}.tar.gz
-	-> ${MYP}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+shared static-libs static-pic"
-REQUIRED_USE="|| ( shared static-libs static-pic )
-	${ADA_REQUIRED_USE}"
-
-RDEPEND="${ADA_DEPS}"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[${ADA_USEDEP}]"
-
-S="${WORKDIR}"/${MYP}
-
-PATCHES=( "${FILESDIR}"/${PN}-2019-gentoo.patch )
-
-src_compile() {
-	build () {
-		gprbuild -j$(makeopts_jobs) -m -p -v -XLIBRARY_TYPE=$1 \
-			-XBUILD=Production -XPROCESSORS=$(makeopts_jobs) xmlada.gpr \
-			-largs ${LDFLAGS} \
-			-cargs ${ADAFLAGS} || die "gprbuild failed"
-	}
-	if use shared; then
-		build relocatable
-	fi
-	if use static-libs; then
-		build static
-	fi
-	if use static-pic; then
-		build static-pic
-	fi
-}
-
-src_test() {
-	emake test
-	emake run_test | tee xmlada.testLog
-	grep -q DIFF xmlada.testLog && die
-}
-
-src_install() {
-	build () {
-		gprinstall -XLIBRARY_TYPE=$1 -f -p -XBUILD=Production \
-			-XPROCESSORS=$(makeopts_jobs) --prefix="${D}"/usr \
-			--install-name=xmlada --build-var=LIBRARY_TYPE \
-			--build-var=XMLADA_BUILD \
-			--build-name=$1 xmlada.gpr || die "gprinstall failed"
-	}
-	if use shared; then
-		build relocatable
-	fi
-	if use static-libs; then
-		build static
-	fi
-	if use static-pic; then
-		build static-pic
-	fi
-
-	einstalldocs
-	dodoc xmlada-roadmap.txt
-	rm -f "${D}"/usr/share/doc/${PN}/.buildinfo
-	rm -rf "${D}"/usr/share/examples
-	rm -rf "${D}"/usr/share/gpr/manifests
-}
diff --git a/dev-ada/xmlada/xmlada-2020.ebuild b/dev-ada/xmlada/xmlada-2020.ebuild
index 6092f980feaf..9d23c04dd7f6 100644
--- a/dev-ada/xmlada/xmlada-2020.ebuild
+++ b/dev-ada/xmlada/xmlada-2020.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-ADA_COMPAT=( gnat_201{6,7,8,9} )
+ADA_COMPAT=( gnat_201{7..9} )
 inherit ada multiprocessing
 
 MYP=${P}-20200429-19A99-src
diff --git a/dev-ada/xmlada/xmlada-2021.ebuild b/dev-ada/xmlada/xmlada-2021.ebuild
index 48aca1fae2fe..e6db9a16536f 100644
--- a/dev-ada/xmlada/xmlada-2021.ebuild
+++ b/dev-ada/xmlada/xmlada-2021.ebuild
@@ -3,15 +3,16 @@
 
 EAPI=7
 
-ADA_COMPAT=( gnat_201{6..9} gnat_202{0..1} )
+ADA_COMPAT=( gnat_201{7..9} gnat_202{0..1} )
 inherit ada multiprocessing
 
 MYP=${P}-${PV}0518-19D50-src
+ID=6a2cf72f308cc787926b12ddc20993fcf2b8ea79
+ADAMIRROR=https://community.download.adacore.com/v1
 
 DESCRIPTION="Set of modules that provide a simple manipulation of XML streams"
 HOMEPAGE="http://libre.adacore.com/"
-SRC_URI="https://community.download.adacore.com/v1/6a2cf72f308cc787926b12ddc20993fcf2b8ea79?filename=${MYP}.tar.gz
-	-> ${MYP}.tar.gz"
+SRC_URI="${ADAMIRROR}/${ID}?filename=${MYP}.tar.gz -> ${MYP}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"