gentoo auto-resync : 17:09:2022 - 23:18:12

4 files changed, 111 insertions, 3 deletions

diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index 89165f3e45fc..be8a3f9072ff 100644
--- a/dev-ada/Manifest.gz
+++ b/dev-ada/Manifest.gz
diff --git a/dev-ada/xmlada/Manifest b/dev-ada/xmlada/Manifest
index 817593addf33..a7d40955feac 100644
--- a/dev-ada/xmlada/Manifest
+++ b/dev-ada/xmlada/Manifest
@@ -2,5 +2,6 @@ AUX xmlada-2019-gentoo.patch 1053 BLAKE2B 33403adf7bf4f774d7fbcf9f07fe0d248a0c7e
 DIST xmlada-2021-20210518-19D50-src.tar.gz 1555951 BLAKE2B 589815d4781471a48d3bb4a12475762cb2ba8f885df8ea774f009c8be9ded41bccc414bb88a2b3d313701b0b2edefcd065fac8a13d208a7bb1679a3467a60c35 SHA512 e2fb1a87cb0cebae842f87412d0ccc8a18b20e5e2c4e3d9ad6ec3a6ae18e4e53c12efd9ea3f2515baa5bfec2b4ddee7808385cc471e3cca9b8c4be3d03093e85
 DIST xmlada-22.0.0.tar.gz 1022947 BLAKE2B cea409a45a3b0c8eba48f858278d4e7129eca2e77fa749f5a761e31a81834efba67223f07c99441a9673a8f6de9a608a12cf610225ca5aee7fbde0235d9af1d9 SHA512 7e8a0cab2f4c300fe3b0d31e00d17334e36798430e49868448caa696044964464f558cffba8f35e35a58b097c968322891119b2abd9f210737ca877f0189f32e
 EBUILD xmlada-2021-r1.ebuild 1979 BLAKE2B e932b44dc05adc4ca2812bd2d017c46ea63c02f8524acf00e22926bd5074ab615a6bbbf320f08ebaf7232a4e3f390e682d39d63d05fa60d5663ca03a25bdca52 SHA512 6ff134121e7377750a58c3751e5a35c5169fa61aa2cdea49275e13b854f24b0ad87af4959e286182e3bd944167f2f8b50985ec628e314ad57a0bc378271db4e4
-EBUILD xmlada-22.0.0.ebuild 1736 BLAKE2B 1e8f3c6cf44696ae9e42d3aed631b1a8d8774089128bbc696159bb0546813586a21a8291ba244b0dc7a1508f11b510e52f1172fa1febeb9fab2322902bb034ee SHA512 3e30eb9d55c9b2a5eb11010df98f36dbd6248f2f016971241142beb3eafbebff285d6aa52f06410d822807848296f35c06f04b98f105285fc4069ac0ec157e9b
+EBUILD xmlada-2021-r2.ebuild 2683 BLAKE2B 0f3b14673403496204a2f2452b10e6917ae7d82467acc19fe5ce1ce90d44528dad5f53ddb59b0b220f250fcb22519936d088af50a92ddf19fe75538696c90505 SHA512 45ff39702c2a290c55a168898136979081cff69e6d9e485419a3b1e7a75e5f615c36f8db41bc93e1dc0b7f9b0d90b12c78a6ec60b75a3ecf6c10f1da7bed43f8
+EBUILD xmlada-22.0.0.ebuild 2440 BLAKE2B e4a8a852c3fe3f0305f4ecef44789252da765b80460c56def4a449366eafb3352e86e8e277a2220f9f088ab5b1c50e3db9adb0ae7894ab626ff33b86a3b47be3 SHA512 e478ff69f47e0640967891f4facc5a2fd46f9640a2c3233e5a7a28b4c8c32424f6ebdd8bc97002c5b15c9beb5591afd6e9ad92fb4b798a58227b352d386926ac
 MISC metadata.xml 987 BLAKE2B 0cea4d25986c676a4418a482ece808fe48869771b7c021727b7b81785ae254d68eab90a6ba52e5a62b2fbf2ea2539103cfc4b4909ebc6c578c33d61d8b3bb16e SHA512 c578017e1aceb4e81669eb3a44cb7e154f5ef16e09b88de70c5fb4675619fbbbaa0260ad7e7ba7bf07a957e64ac9ee8dc172d91df9f8ee1801ff5e4787e09092
diff --git a/dev-ada/xmlada/xmlada-2021-r2.ebuild b/dev-ada/xmlada/xmlada-2021-r2.ebuild
new file mode 100644
index 000000000000..f5640a9457f6
--- /dev/null
+++ b/dev-ada/xmlada/xmlada-2021-r2.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ADA_COMPAT=( 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="${ADAMIRROR}/${ID}?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() {
+	GPR_PROJECT_PATH=schema:input_sources:dom:sax:unicode \
+	gprbuild -j$(makeopts_jobs) -m -p -v -XLIBRARY_TYPE=static \
+		-XBUILD=Production -XPROCESSORS=$(makeopts_jobs) xmlada.gpr \
+		-XTESTS_ACTIVATED=Only \
+		-largs ${LDFLAGS} \
+		-cargs ${ADAFLAGS} || die "gprbuild failed"
+	emake --no-print-directory -C tests tests | 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
+	rm -f "${D}"/usr/share/doc/${PN}/.buildinfo
+	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
+	rm -f "${D}"/usr/share/examples/xmlada/*/b__*
+	rm -f "${D}"/usr/share/examples/xmlada/*/*.adb.std*
+	rm -f "${D}"/usr/share/examples/xmlada/*/*.ali
+	rm -f "${D}"/usr/share/examples/xmlada/*/*.bexch
+	rm -f "${D}"/usr/share/examples/xmlada/*/*.o
+	rm -f "${D}"/usr/share/examples/xmlada/*/*example
+	rm -f "${D}"/usr/share/examples/xmlada/dom/domexample2
+	rm -f "${D}"/usr/share/examples/xmlada/sax/saxexample_main
+	mv "${D}"/usr/share/examples/xmlada "${D}"/usr/share/doc/"${PF}"/examples || die
+}
diff --git a/dev-ada/xmlada/xmlada-22.0.0.ebuild b/dev-ada/xmlada/xmlada-22.0.0.ebuild
index 574afc8518b7..4dc1c1fcb620 100644
--- a/dev-ada/xmlada/xmlada-22.0.0.ebuild
+++ b/dev-ada/xmlada/xmlada-22.0.0.ebuild
@@ -43,8 +43,13 @@ src_compile() {
 }
 
 src_test() {
-	emake test
-	emake run_test | tee xmlada.testLog
+	GPR_PROJECT_PATH=schema:input_sources:dom:sax:unicode \
+	gprbuild -j$(makeopts_jobs) -m -p -v -XLIBRARY_TYPE=static \
+		-XBUILD=Production -XPROCESSORS=$(makeopts_jobs) xmlada.gpr \
+		-XTESTS_ACTIVATED=Only \
+		-largs ${LDFLAGS} \
+		-cargs ${ADAFLAGS} || die "gprbuild failed"
+	emake --no-print-directory -C tests tests | tee xmlada.testLog
 	grep -q DIFF xmlada.testLog && die
 }
 
@@ -69,5 +74,13 @@ src_install() {
 	einstalldocs
 	dodoc xmlada-roadmap.txt
 	rm -rf "${D}"/usr/share/gpr/manifests
+	rm -f "${D}"/usr/share/examples/xmlada/*/b__*
+	rm -f "${D}"/usr/share/examples/xmlada/*/*.adb.std*
+	rm -f "${D}"/usr/share/examples/xmlada/*/*.ali
+	rm -f "${D}"/usr/share/examples/xmlada/*/*.bexch
+	rm -f "${D}"/usr/share/examples/xmlada/*/*.o
+	rm -f "${D}"/usr/share/examples/xmlada/*/*example
+	rm -f "${D}"/usr/share/examples/xmlada/dom/domexample2
+	rm -f "${D}"/usr/share/examples/xmlada/sax/saxexample_main
 	mv "${D}"/usr/share/examples/xmlada "${D}"/usr/share/doc/"${PF}"/examples || die
 }