gentoo resync : 21.06.2020

9 files changed, 92 insertions, 15 deletions

diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index 68bc0d94349f..fe55d2508317 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 6b449e7841ff..0310b11b0eab 100644
--- a/dev-ada/gnatcoll-core/Manifest
+++ b/dev-ada/gnatcoll-core/Manifest
@@ -1,4 +1,6 @@
 AUX gnatcoll-core-2018-gentoo.patch 555 BLAKE2B d0913c845f4f7d96afbcec5d400599535417ee1c7b0d9f3c1e0c8766218c6a2556ff2de3e39febc1882b31e947876ca0849fad1564970f422530e58a8966c638 SHA512 90ef785337cb85aa7e2e2b5d0a24efc963512aa19780b215a96a1db6d980e55ff3b1409939e6d77913bf6416d158402ca900fd3ccc4cfb5362ee7440dfb42b64
 DIST gnatcoll-core-2019-20190515-24AD8-src.tar.gz 1423276 BLAKE2B 154b7a7f77c1f0d6414cb407958d64b84be8d19b7e3a12f69bd3dd1253b71df394aa0c842d2caf9d2de071ea5466589111526329155291f0d967c8b4cc2b18ac SHA512 9b2101448b96ac46cebada1fe3cb7b583cbf296f9b7d627771e83c56c78ce72c50ede5474f64f16feba252a18fd46b473901820766902b0c68d63beaf55a884a
+DIST gnatcoll-core-2020-20200429-19B7C-src.tar.gz 1396475 BLAKE2B 329e7f799ad62dfc6f71ca78a736bfc8c768a576f817d03b0d73e25b6e97ae0de0ad5a055bb800f7b83d7449ef8fe703c2779f73fc13a09bbcc1d3d8cc880fd1 SHA512 320878335f2ea1ce91a7770cc181e9cc228c80b1f7a3926a4e27c3822eb8f58726c62a014e2fa4c3f8699851ea87424be26d619ab4931b2e969e3a2e96e58b73
 EBUILD gnatcoll-core-2019-r1.ebuild 1521 BLAKE2B c968eba624a3c5a1c2fda36f63e90a8f02c6f8aa072925447cac7051202165a5dd461b0aab0276b879a259322753d9dd2f54dffe07df211195581ac9c1149879 SHA512 373dde5f1ceee4264137f8ba60c2288754610f5609cbe3be0f45cb0182673377434dd3ad136e23bd261e6822bb7482d5847bb552471dab98219712fc243d8b9b
+EBUILD gnatcoll-core-2020.ebuild 1575 BLAKE2B da5fdf4f52a5e1a3d84eb06656029d35ce3dae46a3f190bdb9f75d549a8e9cbded54fd0654477c332b5a52411d778467cb7d8f8e4967e2bf3edd0d714967d6ac SHA512 1810eb0b48439de97165b2c9a5f683336116e554a7e06c9609b149e1ef7f483cb86041c4d38954e9db87b1fd17f0ef9ea4154f7944dfa458453cbf5b26463a82
 MISC metadata.xml 1095 BLAKE2B 52c64e5050f7d0be080c1c05a6beef22b88e1389c61c958c8f0ccd6958e7686c3b8ca5dcca685f0314e68e1713635475178d63edef1d41277ca83fdb59322529 SHA512 57963c0ed66d0f4844b6d41e66c3c2451f4d61da45119b38e3ef2e5b80de94d6426eefbc0307928c3629e052bd4c0fdd2e6e2cf7678029308299ffb151960905
diff --git a/dev-ada/gnatcoll-core/gnatcoll-core-2020.ebuild b/dev-ada/gnatcoll-core/gnatcoll-core-2020.ebuild
new file mode 100644
index 000000000000..5eedcf63d7e7
--- /dev/null
+++ b/dev-ada/gnatcoll-core/gnatcoll-core-2020.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ADA_COMPAT=( gnat_201{6,7,8,9} )
+inherit ada multiprocessing
+
+MYP=${P}-20200429-19B7C
+
+DESCRIPTION="GNAT Component Collection Core packages"
+HOMEPAGE="http://libre.adacore.com"
+SRC_URI="https://community.download.adacore.com/v1/c94f2ac914cb305f6bef174329fa0b5003d84935?filename=${MYP}-src.tar.gz
+	-> ${MYP}-src.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+shared static-libs static-pic"
+
+RDEPEND="
+	>=dev-ada/libgpr-2020[${ADA_USEDEP},shared?,static-libs?,static-pic?]
+"
+DEPEND="${RDEPEND}
+	dev-ada/gprbuild[${ADA_USEDEP}]"
+
+REQUIRED_USE="${ADA_REQUIRED_USE}"
+
+S="${WORKDIR}"/${MYP}-src
+
+PATCHES=( "${FILESDIR}"/${PN}-2018-gentoo.patch )
+
+src_prepare() {
+	default
+	sed -i \
+		-e "s:@GNATLS@:${GNATLS}:g" \
+		src/gnatcoll-projects.ads \
+		|| die
+}
+
+src_configure() {
+	emake prefix="${D}"/usr PROCESSORS=$(makeopts_jobs) setup
+}
+
+src_compile() {
+	build () {
+		gprbuild -p -m -j$(makeopts_jobs) \
+			-XBUILD=PROD -v -XGNATCOLL_VERSION=${PV} \
+			-XLIBRARY_TYPE=$1 -XXMLADA_BUILD=$* -XGPR_BUILD=$1 \
+			gnatcoll.gpr -cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} || die
+	}
+	if use shared; then
+		build relocatable
+	fi
+	if use static-pic; then
+		build static-pic
+	fi
+	if use static-libs; then
+		build static
+	fi
+}
+
+src_install() {
+	if use shared; then
+		emake install-relocatable
+	fi
+	if use static-pic; then
+		emake install-static-pic
+	fi
+	if use static-libs; then
+		emake install-static
+	fi
+	rm -r "${D}"/usr/share/gpr/manifests || die
+	einstalldocs
+}
diff --git a/dev-ada/gprbuild/Manifest b/dev-ada/gprbuild/Manifest
index 5fa690552e10..119426443180 100644
--- a/dev-ada/gprbuild/Manifest
+++ b/dev-ada/gprbuild/Manifest
@@ -1,7 +1,7 @@
 AUX gprbuild-2017-config.patch 5738 BLAKE2B 6089d8aa9fc3654958e46eac7ed22f887dc7017c670df53d4aaec37d937bfea866f99ba1232d3f3c55532b0c4754bed4db074850c1160308eddd3223d4d2c921 SHA512 45fd4b1cf4bf94f333350a4d3b3cdd0efd673f4eb32e8b0c837d8cf08aa87bda2b57749c230785f53807f48fcad67331c82ce1857fffbcb4af395d26a5d8f886
 AUX gprbuild-2017-gentoo.patch 3381 BLAKE2B 4e4c4d19db49aa3100f0acb97af90d942ea39fa5cc6cca5e369cd3459fa898406be18b762b33764bcc8f8ad6b007f00a2a1098990efe10f4aff96b80961ab6ce SHA512 a20642a117f61dd82469fafbd07fcd1d652ae8a11e866aafd55fb643fb9582994f94d643a4bbfcd0985534947cc8b48220de7503f83e74234b17838ce4468a66
 AUX gprbuild-2019-gentoo.patch 11240 BLAKE2B 609968e7d95bb686db4362c06600a90cd9d9cde1c4058618ed40fd90585153b02316369dc3a439b84f3c8e1031d182ed3f739b449ed8e09761e90e2b80d73a4c SHA512 f48ed180ecfd8cb6691473e1f996f1805dcae693a0e2710fdfd0c246443cbe732ccc6dbb415c90396886b0b79d8aac22e3c7b720ca4f6da746e22485972aace5
-AUX gprbuild-2020-gentoo.patch 11219 BLAKE2B fc898b35f5a0901ca7cf8b229c2115a595387d16a586aecbcd75daa62fdcb413dfa2f1c970a9bc25632cd92919ea94f09bfb94d274ca00dc9d78cfeacce647c6 SHA512 4c34de0793f68f42c3577d57f6b7e7bde54a70807bccefa309317e4409b3d0fdac8aeb831b40545ab3e0d5219647c557e0aeadf73895e617bb2b3d67e7aea1e3
+AUX gprbuild-2020-gentoo.patch 11688 BLAKE2B 698f203f1a4b6086b1cc20300506db4d10e62bbade354891404fb8ac1e828370992e6e85cdb6777c6d1ae5831a2a65a1f7483ccb8a3b065c83233162055c1c8d SHA512 ec9c99db6fcd26b6971754dbab9187e6589a1bbc2e513cb205b37519c21296a91678aac09833839256cd6558d9e228878e63e264658b32b1b9403e40a61f02ab
 DIST gprbuild-2019-20190517-194D8-src.tar.gz 2507961 BLAKE2B 0f70d94cb0db9ddc1dd308862aaa305a91965a62a936cfbdde2ae9f3f735f0cc3d69596b09da4b979a1d7923087ab0ec5cf2d6541551f057b5e8e0c499065a90 SHA512 0388d7e6cdf625fef40b33da764091b3283dd88714c64ecfad4b5e99253f183b1a9b717c19281e6d45cc4277a05fadb2e2ace394d6f30638664b66c97123052b
 DIST gprbuild-2020-20200429-19BD2-src.tar.gz 2489399 BLAKE2B 3a036cb40bbe5522af63c376a672384093901b44df6fd74013f1eff9d269c2f5056224ab5e7d59b6f3cf126cd14dd30420056b09e887851351462de59f700e3a SHA512 d2ff6a5d8281d332a31533c7a5744b6169fd250c9086373fd658486c1e529564d9830b9ef3b2dfcbec5f8c1ba50d244a9eb45bf8fdccd53f8b711dcf29258dfd
 DIST gprbuild-gpl-2017-src.tar.gz 2454957 BLAKE2B 890e5aa29e9f8fa8b140988ee8e5d6042640c34fe0877acde959de803bf690bb33c63b1c7e7db486f804882bddd77ab76ffbaa4dd27da327e21ed0376cadb99d SHA512 12f3682d64ce0718de4940c1e71a4380b20021805d88543842dbf3b5ce5d518c23a6b2d868565579baf81efa1d8cf05c7778253162f0df5d7adc0eb1865c9f88
diff --git a/dev-ada/gprbuild/files/gprbuild-2020-gentoo.patch b/dev-ada/gprbuild/files/gprbuild-2020-gentoo.patch
index 66ec4f7f0dd1..9e6040b8ddc9 100644
--- a/dev-ada/gprbuild/files/gprbuild-2020-gentoo.patch
+++ b/dev-ada/gprbuild/files/gprbuild-2020-gentoo.patch
@@ -272,3 +272,15 @@
      </config>
    </configuration>
  
+--- a/share/gprconfig/linker.xml	2020-06-16 22:13:38.508782578 +0200
++++ b/share/gprconfig/linker.xml	2020-06-16 22:14:32.693966110 +0200
+@@ -112,6 +112,9 @@
+    for Object_Lister use ("nm", "-g");
+    for Object_Lister_Matcher use " [TDRB] (.*)";
+ 
++   LDFLAGS := External_As_List ("LDFLAGS", " ");
++   for Leading_Library_Options use LDFLAGS;
++
+    package Linker is
+       for Export_File_Format use "GNU";
+       for Export_File_Switch use "-Wl,--version-script=";
diff --git a/dev-ada/libgpr/Manifest b/dev-ada/libgpr/Manifest
index d368c7260588..a481d71a3c85 100644
--- a/dev-ada/libgpr/Manifest
+++ b/dev-ada/libgpr/Manifest
@@ -3,5 +3,5 @@ AUX libgpr-2020-gentoo.patch 321 BLAKE2B fe3affe50712460474125d074936fd9db526c43
 DIST gprbuild-2019-20190517-194D8-src.tar.gz 2507961 BLAKE2B 0f70d94cb0db9ddc1dd308862aaa305a91965a62a936cfbdde2ae9f3f735f0cc3d69596b09da4b979a1d7923087ab0ec5cf2d6541551f057b5e8e0c499065a90 SHA512 0388d7e6cdf625fef40b33da764091b3283dd88714c64ecfad4b5e99253f183b1a9b717c19281e6d45cc4277a05fadb2e2ace394d6f30638664b66c97123052b
 DIST gprbuild-2020-20200429-19BD2-src.tar.gz 2489399 BLAKE2B 3a036cb40bbe5522af63c376a672384093901b44df6fd74013f1eff9d269c2f5056224ab5e7d59b6f3cf126cd14dd30420056b09e887851351462de59f700e3a SHA512 d2ff6a5d8281d332a31533c7a5744b6169fd250c9086373fd658486c1e529564d9830b9ef3b2dfcbec5f8c1ba50d244a9eb45bf8fdccd53f8b711dcf29258dfd
 EBUILD libgpr-2019-r1.ebuild 1407 BLAKE2B b3f88bd6116977c382ba3c8164ada748af412c48a51333b7a0a510bdfe4e0ac08b72cb2045ac976a67eef6847cdf84308bcec3dd6430c7a6e5aa74f334e99182 SHA512 a182e1dba2020ad168bd1711afbd55fd8382039f3a23bb09b54afdd3b77c4ff0c5893c064020044354e2148c9b6ca82217f1ee7fccb9f93240c4d0d5e022c630
-EBUILD libgpr-2020.ebuild 1513 BLAKE2B 46a4264d80145926786582055c0c7ba56aa6d1cd0579beecc289aa57a0ec2ffd9a26ed96af9292d47034c97d11b5787ff363ed087ebdc77bdffba2ac82d9aa5d SHA512 f218a0e76f506cf30bf63a12a9b305f9be4cc320db669ce6db566b1ae6f315cdae29acbda809533626fd61bb98a5e2960235e46d234d70b39d47ddf978942477
+EBUILD libgpr-2020.ebuild 1451 BLAKE2B a99cc8becc87532c738062ca95aa94cdd45b40b17ffb727f7dd70137a9d7ca171ca325c2a15a968bec4a4ff4b769d55d4afc10404c1d9a99f8f3736114b4b171 SHA512 c51f63795df992d71c392515bbdda6672222153fa1a50d065b863ef1445559635b7d111d3a53f4470d0fcfbdf64220c43c54e2b53272b7fb398114ae7c9a70c3
 MISC metadata.xml 939 BLAKE2B a14a037f7b5a45004833b83bd6ef13accff7e1d107873c823f0c42dd663eb638a59fdbedd8ce06aa5c00cb53e2c89bbc9f23f1f0a4dd1a388b0f5f9d5f522617 SHA512 3a09da26b5f736ece53917fbee3939ebff2045297d81043cf282fa0e0b1344be9e551df0a92b35db38b6feeb516e5319a8c65507b2f574971c9f5df66bda8079
diff --git a/dev-ada/libgpr/libgpr-2020.ebuild b/dev-ada/libgpr/libgpr-2020.ebuild
index d502e034f8a1..df18b03f3959 100644
--- a/dev-ada/libgpr/libgpr-2020.ebuild
+++ b/dev-ada/libgpr/libgpr-2020.ebuild
@@ -23,10 +23,6 @@ DEPEND="${RDEPEND}
 	dev-ada/gprbuild[${ADA_USEDEP}]"
 REQUIRED_USE="${ADA_REQUIRED_USE}"
 
-QA_FLAGS_IGNORED=(
-	/usr/lib/gpr/relocatable/gpr/libgpr.so
-)
-
 S="${WORKDIR}"/${MYP}
 
 PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
diff --git a/dev-ada/xmlada/Manifest b/dev-ada/xmlada/Manifest
index e0ffe7b1faa0..22d42e7ea335 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-2019-20190429-19B9D-src.tar.gz 1582603 BLAKE2B e2be3e7c0c8b843bfc808a3dd726235a82588caed8c919975a97ce34c72d6d634361bbc34208590210936add9e2f881b59d01168ef79abed1e489c50b27094d8 SHA512 f8e0e25b0aee9a7a18223ae7761603082af55134f062c767d0cd0dbf0dbcb2058fc7c57532b567fb2c6efa464a53ead57b300578e98962025866e5c3ad73e380
 DIST xmlada-2020-20200429-19A99-src.tar.gz 1533111 BLAKE2B e2c25e103c5c560cf7c9580118580e2952f3ef56c244b0f76c7f484e5629b684d5ee546d2d40520e1a4bf963271d360522423f4e7d81570f7dc1dbc8424c9147 SHA512 e53dd1fba504d2aa91ce29ea381c62adea12c5d8c72cd87396b903143279456cc6547c18035f6e988e95bd93607360075789532378f33cbe23bef9b49c8d984c
 EBUILD xmlada-2019-r1.ebuild 1755 BLAKE2B c99e364b968451b1264622ee0aad3212966aeb8ca6875736f55127f7e997ed301e5df3ddbb4d748d63c70e0e42d7a2742124f0cf06bec503b50d49ee958a9113 SHA512 894a656bf01a4a45554b9c3babea6e9f0ec042bc460a8efda31a53b8456d61d284dd05fdf601aecf396d4bda4aced610382394282f4af781298d0108eb4c378b
-EBUILD xmlada-2020.ebuild 2360 BLAKE2B 8948fb0f573086a5f770442b6d607a0f9dc110fe38978e7e70d784d998c1dbd9464728df971ad6480742e032a3d9b00135963354d94007c025faabf5fb8daa98 SHA512 e63afd18d8d4c57e0e3876e56e278f2264335184fae1a1488d856501ac5c494a50c8346b3b3761f7a70f2e36a93f369b648fa7f88c544bc05b7084ef2eeb8170
+EBUILD xmlada-2020.ebuild 2036 BLAKE2B 5d863890ea765b70ad947c86c33e5fe08887e4716f765cab76383f99e7de978f94e08f4500ecfe594c0781be6f0633dd88940911e76382fbe1a7a9319b668844 SHA512 f71734e9300492633a0524a27142da1404d0ae20e09c7b5221b54196466ec30026fce98f8de68bacabb17e46a112b1875c8804e33713556f902bf0f31aa93697
 MISC metadata.xml 907 BLAKE2B c57fbc3e91a6647b5687dc02c78986d161d6a8482119984a420685ce5366a4e0901aca404d066259b1e8384ba45875f15e54810d6d0fe97812ed3fb1983f1a91 SHA512 eb1acaf3359b0ca8544e07e5681ec2ab800581401644f3ee2313dcca9be163e2bdeac16b551aacb19402fd13c18e0787850fb5529382e3e0e77ba4a1b420f53a
diff --git a/dev-ada/xmlada/xmlada-2020.ebuild b/dev-ada/xmlada/xmlada-2020.ebuild
index cbc536004e3a..50ecc0beceda 100644
--- a/dev-ada/xmlada/xmlada-2020.ebuild
+++ b/dev-ada/xmlada/xmlada-2020.ebuild
@@ -28,14 +28,6 @@ S="${WORKDIR}"/${MYP}
 
 PATCHES=( "${FILESDIR}"/${PN}-2019-gentoo.patch )
 
-QA_FLAGS_IGNORED=(
-	/usr/lib/xmlada/xmlada_dom.relocatable/libxmlada_dom.so.2020
-	/usr/lib/xmlada/xmlada_input.relocatable/libxmlada_input_sources.so.2020
-	/usr/lib/xmlada/xmlada_sax.relocatable/libxmlada_sax.so.2020
-	/usr/lib/xmlada/xmlada_schema.relocatable/libxmlada_schema.so.2020
-	/usr/lib/xmlada/xmlada_unicode.relocatable/libxmlada_unicode.so.2020
-)
-
 src_configure() {
 	econf --prefix="${D}"/usr
 }
@@ -89,5 +81,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
 }