gentoo resync : 05.12.2021

4 files changed, 14 insertions, 20 deletions

diff --git a/dev-ada/xmlada/Manifest b/dev-ada/xmlada/Manifest
index 3090a8d0ea60..37d07fd16566 100644
--- a/dev-ada/xmlada/Manifest
+++ b/dev-ada/xmlada/Manifest
@@ -1,6 +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.ebuild 1978 BLAKE2B 80246ce9388d25e62c38d48b76e404fea38c71865a1fb31710b7caee425dc453139e158243fab8ac65315e2c6bdb6556d6f15f7551fbe04f538c7dfe432890e8 SHA512 7ca808b394c9fd8ef70ec27789513ba315221f1eb472ac8b5f035a6c6bfb21a747e350b26714eceffa01d62f81be0747ebfb314874c45466ec3eae417075ea7e
-EBUILD xmlada-2021-r1.ebuild 1990 BLAKE2B f944e9584c490d6cfd5e39969a2f43b3c51eb760c771367bef89fa869642f3572df19e0e5c271e5bf4b4b18f6cc7f8554d3ad051ee0348058caf7af9810f83ea SHA512 058234e250aa38d808447c19829ea6977a5f4d25c1436d181a76437c18757aa9b11875426388bf6fb55e3e38462e660ce496665db1ca129ce010fb8ee0fafa9d
-MISC metadata.xml 908 BLAKE2B a29e2bb61aeb10e05688b87817fa6ee4d7bea40d1aafc6e417c925237cc499f6688bc0d4d95ddef435ada059df9e982378e82a11069e8fd0037cb03da851837e SHA512 dc34947845e621b35021fa15d049757ea1a48aca68f40126d1dcc3fb50e02a34b5319028946944c4e7f432d4899c701da8c7dad28ea666766ab0197ed196519b
+DIST xmlada-22.0.0.tar.gz 1022947 BLAKE2B cea409a45a3b0c8eba48f858278d4e7129eca2e77fa749f5a761e31a81834efba67223f07c99441a9673a8f6de9a608a12cf610225ca5aee7fbde0235d9af1d9 SHA512 7e8a0cab2f4c300fe3b0d31e00d17334e36798430e49868448caa696044964464f558cffba8f35e35a58b097c968322891119b2abd9f210737ca877f0189f32e
+EBUILD xmlada-2021-r1.ebuild 1980 BLAKE2B 1e5e65b6506018a4110246c55e51997a3cd81c2a31994b26bd48b8a8b34f66be0cf85b5db0262e0759bb520306ae3fd6900394cc6384be63c61cc98ce1e113d5 SHA512 2adf47283f61526d3cb26b32a0f94c4c65f0562297991e6003a6bdb5b9acb8d893eff734e57025fc400e7d74b2f36e59dcc1cb609e10847704a25c1df3ceab59
+EBUILD xmlada-22.0.0.ebuild 1725 BLAKE2B 5cf13418887df5644005a425d4b19cca6aef61ec40ff1aad7a56649efe67cfc5b0662da3faccc82a1ab9aed05814fdc5c9f224e0326ab1fef8acb9eb4dccb385 SHA512 ce846107bd5156d001b4fcadcd6daa27f21cc19b559c5aac3d0a4cda23cf1c24adc43dbaa356c941f94865eac75522189bd73eabbbdc7575b7605cc9e13534e9
+MISC metadata.xml 987 BLAKE2B 0cea4d25986c676a4418a482ece808fe48869771b7c021727b7b81785ae254d68eab90a6ba52e5a62b2fbf2ea2539103cfc4b4909ebc6c578c33d61d8b3bb16e SHA512 c578017e1aceb4e81669eb3a44cb7e154f5ef16e09b88de70c5fb4675619fbbbaa0260ad7e7ba7bf07a957e64ac9ee8dc172d91df9f8ee1801ff5e4787e09092
diff --git a/dev-ada/xmlada/metadata.xml b/dev-ada/xmlada/metadata.xml
index 0feea9d45d0e..e77e1bbcd64f 100644
--- a/dev-ada/xmlada/metadata.xml
+++ b/dev-ada/xmlada/metadata.xml
@@ -20,4 +20,7 @@
 		In addition, it includes a module to manipulate Unicode streams, since
 		this is required by the XML standard.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">adacore/xmlada</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ada/xmlada/xmlada-2021-r1.ebuild b/dev-ada/xmlada/xmlada-2021-r1.ebuild
index c0bf97b6e8e4..a946ece90d98 100644
--- a/dev-ada/xmlada/xmlada-2021-r1.ebuild
+++ b/dev-ada/xmlada/xmlada-2021-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-ADA_COMPAT=( gnat_2019 gnat_202{0..1} )
+ADA_COMPAT=( gnat_202{0..1} )
 inherit ada multiprocessing
 
 MYP=${P}-${PV}0518-19D50-src
diff --git a/dev-ada/xmlada/xmlada-2020.ebuild b/dev-ada/xmlada/xmlada-22.0.0.ebuild
index a91080c028ef..2f9ec8a4c638 100644
--- a/dev-ada/xmlada/xmlada-2020.ebuild
+++ b/dev-ada/xmlada/xmlada-22.0.0.ebuild
@@ -3,19 +3,17 @@
 
 EAPI=7
 
-ADA_COMPAT=( gnat_2019 )
+ADA_COMPAT=( 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"
+SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
+	-> ${P}.tar.gz"
 
 LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
 IUSE="+shared static-libs static-pic"
 REQUIRED_USE="|| ( shared static-libs static-pic )
 	${ADA_REQUIRED_USE}"
@@ -24,16 +22,10 @@ RDEPEND="${ADA_DEPS}"
 DEPEND="${RDEPEND}
 	dev-ada/gprbuild[${ADA_USEDEP}]"
 
-S="${WORKDIR}"/${MYP}
-
 PATCHES=( "${FILESDIR}"/${PN}-2019-gentoo.patch )
 
 src_compile() {
 	build () {
-		echo gprbuild -j$(makeopts_jobs) -m -p -v -XLIBRARY_TYPE=$1 \
-			-XBUILD=Production -XPROCESSORS=$(makeopts_jobs) xmlada.gpr \
-			-largs ${LDFLAGS} \
-			-cargs ${ADAFLAGS}
 		gprbuild -j$(makeopts_jobs) -m -p -v -XLIBRARY_TYPE=$1 \
 			-XBUILD=Production -XPROCESSORS=$(makeopts_jobs) xmlada.gpr \
 			-largs ${LDFLAGS} \
@@ -76,7 +68,6 @@ src_install() {
 
 	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
+	mv "${D}"/usr/share/examples/xmlada "${D}"/usr/share/doc/"${PF}"/examples || die
 }