gentoo resync : 29.06.2021

5 files changed, 8 insertions, 4 deletions

diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index 7408746558d3..00a100ed1d0c 100644
--- a/dev-ada/Manifest.gz
+++ b/dev-ada/Manifest.gz
diff --git a/dev-ada/gnatcoll-core/Manifest b/dev-ada/gnatcoll-core/Manifest
index 3b06ee72952c..57d218d4a938 100644
--- a/dev-ada/gnatcoll-core/Manifest
+++ b/dev-ada/gnatcoll-core/Manifest
@@ -3,5 +3,5 @@ DIST gnatcoll-core-2020-20200429-19B7C-src.tar.gz 1396475 BLAKE2B 329e7f799ad62d
 DIST gnatcoll-core-2021-20210518-19ADF-src.tar.gz 1460647 BLAKE2B 42954ed9dfc41914f34973fcfe950b4415af455d8319e802a213994107c7d7a45a6a42b2d260f165fe5ec6589873a7a2c75665b68b97431b13d7694f48273b8c SHA512 6a58920a057dee656df9f64f610f9f1398bc3cbc4ed74a740e8693f2b45da83628c3ce8f76f624bdb101d348603a24bccb47aa770ade1ffbf24da806f4d1de20
 EBUILD gnatcoll-core-2020-r1.ebuild 1590 BLAKE2B d91ea0e079e7c1d2d8c200a8c96bef3b3d157e6e8408b3f51e8c7a546389a186762939e3d5a9cb90c501441929fd50a2554774b30dfc3639aaa2ab19f1a70873 SHA512 b2b4c5df7f7eb3ca474963e1fb2ae793cf0a26b111e53c6fbf5a20df74f6d5c407e1742d6aecb66c8884f9f16a3b5c9c33b191df10b47de491d159243139b031
 EBUILD gnatcoll-core-2020.ebuild 1578 BLAKE2B 5481ee650d75cc3f963c0c8992c46133e5b9db29d95a850f915ae7183ee0c877e48e2247ab9e7a27cf80ad181557b64eadc3c71d3e4f1fd66005b90b61312f95 SHA512 310d4563b3f16f60a893ecfd4cf28cb2425b7d0c33c1b9402308c76876cd6f2dc0016cb4e1a3b74ec062ac7ad723ce4ff119dc9c16011dc2bd0469c4a294a7ee
-EBUILD gnatcoll-core-2021.ebuild 1612 BLAKE2B 430cd6214796df035571b64d1d8bab34b793f5bec0c4644cfcbb57c21f5d1d47b8ce6f8ef4c38f81b38b174a77cbe348c2e331bd82c5e6e9ce6f677887ba3265 SHA512 9676bb49b5734d1f4cfb8f03fd36dda97d27a3c8643d55e4ff2dbd706aded38ac5e8a645591c04c08bb99607d9a60308a88fa6577f91e8392e8385a18b67bc0f
+EBUILD gnatcoll-core-2021-r1.ebuild 1705 BLAKE2B ed8be0e86c943f0810202984c27df434b14713dc8b949017e97f41e8314b2c9ea9ae6a13d9036ceca4e3b20de0945ba8a6795adbdc35265dbe45b62dee474148 SHA512 ff2283f14b19c741252e622799bcc45b6a01b6bdf69417864a9e75fe0f009a83673ff47879a5583d3e455faa4fc11a16a2cdaee7a2f7ae4887cc467cded90c88
 MISC metadata.xml 1095 BLAKE2B 52c64e5050f7d0be080c1c05a6beef22b88e1389c61c958c8f0ccd6958e7686c3b8ca5dcca685f0314e68e1713635475178d63edef1d41277ca83fdb59322529 SHA512 57963c0ed66d0f4844b6d41e66c3c2451f4d61da45119b38e3ef2e5b80de94d6426eefbc0307928c3629e052bd4c0fdd2e6e2cf7678029308299ffb151960905
diff --git a/dev-ada/gnatcoll-core/gnatcoll-core-2021.ebuild b/dev-ada/gnatcoll-core/gnatcoll-core-2021-r1.ebuild
index 37e4d267930d..4312e1c8404c 100644
--- a/dev-ada/gnatcoll-core/gnatcoll-core-2021.ebuild
+++ b/dev-ada/gnatcoll-core/gnatcoll-core-2021-r1.ebuild
@@ -72,4 +72,6 @@ src_install() {
 	fi
 	rm -r "${D}"/usr/share/gpr/manifests || die
 	einstalldocs
+	dodir /usr/share/gnatdoc
+	mv "${D}"/usr/share/doc/gnatcoll "${D}"/usr/share/gnatdoc/ || die
 }
diff --git a/dev-ada/xmlada/Manifest b/dev-ada/xmlada/Manifest
index 9bfeb17faa87..1272ce54d082 100644
--- a/dev-ada/xmlada/Manifest
+++ b/dev-ada/xmlada/Manifest
@@ -2,5 +2,5 @@ AUX xmlada-2019-gentoo.patch 1053 BLAKE2B 33403adf7bf4f774d7fbcf9f07fe0d248a0c7e
 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 1983 BLAKE2B c0a5071421bea52e92e98b9aaed78674ef99b27e2d025e9a6e802268329ddd10e2d98155f51d96591d2c2efc55fa1b58d4f0684b04580061a4db6331e0c432c8 SHA512 8398141057cfbb291b4dd11b54d11186068e141d3e8a06ef9fe4eedf256d1a868baef2ceb5d595d54a2396c2ceec70dfb0c4a0a446c2a8a964a821b5b66be6b8
-EBUILD xmlada-2021.ebuild 1858 BLAKE2B d49f9f81eafcfc01c725ff7edbb50e1ce526e2b00aaba0ed8a2c90c142da9d30e1c6e637c4a655b516a2022da66b453c9076ade2aa5cbf4570b0571e031f5059 SHA512 eeee8789ee053d02cd0dbb2ac1efc4eed798b730ecef1ac4612a4962549e989b52ea8f1cece0fa83f06469e99ef646778502063ff076be53f0228324456ba6be
+EBUILD xmlada-2021-r1.ebuild 1996 BLAKE2B 56c8f0f6383c45a97f9a21ae2c6061339ba04d961394c405c47bc00eac0b23b51704281f487964ef7e08385dd37770582970a815a975ffdd2be7d6355bda1d97 SHA512 7a91b20c80eb51c3ac1739637f8d728f1ebb3eaf7268767cbb90a799d2ca0bc2e29d6f119682943ebc1ae99edd01ddea12dc5e751413243bd619bb5ef83ccb3f
 MISC metadata.xml 907 BLAKE2B c57fbc3e91a6647b5687dc02c78986d161d6a8482119984a420685ce5366a4e0901aca404d066259b1e8384ba45875f15e54810d6d0fe97812ed3fb1983f1a91 SHA512 eb1acaf3359b0ca8544e07e5681ec2ab800581401644f3ee2313dcca9be163e2bdeac16b551aacb19402fd13c18e0787850fb5529382e3e0e77ba4a1b420f53a
diff --git a/dev-ada/xmlada/xmlada-2021.ebuild b/dev-ada/xmlada/xmlada-2021-r1.ebuild
index e6db9a16536f..13c8b4190f26 100644
--- a/dev-ada/xmlada/xmlada-2021.ebuild
+++ b/dev-ada/xmlada/xmlada-2021-r1.ebuild
@@ -72,8 +72,10 @@ src_install() {
 	fi
 
 	einstalldocs
-	dodoc xmlada-roadmap.txt
 	rm -f "${D}"/usr/share/doc/${PN}/.buildinfo
-	rm -rf "${D}"/usr/share/examples
+	dodoc xmlada-roadmap.txt
 	rm -rf "${D}"/usr/share/gpr/manifests
+	dodir /usr/share/gnatdoc
+	mv "${D}"/usr/share/doc/${PN} "${D}"/usr/share/gnatdoc/ || die
+	mv "${D}"/usr/share/examples/xmlada "${D}"/usr/share/doc/"${PF}"/examples || die
 }