gentoo resync : 02.06.2019

4 files changed, 101 insertions, 7 deletions

diff --git a/dev-ada/xmlada/Manifest b/dev-ada/xmlada/Manifest
index c022a5336efb..42314f28a0af 100644
--- a/dev-ada/xmlada/Manifest
+++ b/dev-ada/xmlada/Manifest
@@ -1,4 +1,5 @@
-AUX xmlada-2018-gentoo.patch 1133 BLAKE2B 6b15f8225c8d4094417f20b61261fc247a4c9290831265b15cf1a3f865d532c6e685cebf5c8cf635fc51ae0a44386428ee8b9300738a5fe0c2951e4a68cb7bb8 SHA512 47d383b18c6c46653c5369b691af47d8b7ea333d32d7ddcc5cb6831dea08dbfeec353ffa0e4de279baff4fedf911c39e28a6608529357ad70b9c1ce0a9a42b49
+AUX xmlada-2018-gentoo.patch 1553 BLAKE2B efc30a51ffa02bbf20704cb5e89f540e0da880ee9ff7f7c9d9a0bed48aee34706d803bd8fc22e61ce984f92dd63da5503b618b983a42a3a9a62a1f78987382d0 SHA512 89e82f45f6762078fe7dd695c46270f7015ce7938f8348c926f7571ba8fb757588be1bb4b8c3e8e8108e4547151506bfe47cea452cd1d0ec8223afdcfdff1f13
 DIST xmlada-gpl-2018-src.tar.gz 1582215 BLAKE2B 11012dab19f45507eeb5ce6ebec9a77ceb5dfb7749960922f0f48bb1b0409305fd43466a7af90b48ff0a0cf58612e8859274a92e0fe272b4e57a59b92a1725f1 SHA512 8970c4e68defad66625c1110554dadfc485fbbe42e832987593cf727e98f13dd87c90b84461187dbbe2b1051831e6e70f9f53d6a0cfc07451726d601b2856430
+EBUILD xmlada-2018-r1.ebuild 1947 BLAKE2B 0cafb5e8a347f4ffe68416af6ea936ec61f30da8951b2b099fcfff0d1502ff974d9538de8786722507e3f0abad05bf9f2febade8243e70968514c7413f3ef829 SHA512 50096d45540d4edcfde73271b5fc4f7a228bafebd0210a48f17f09267f664c7ac83b082b29a3ac9d5f887d9e30f12784cf4d20d34518b5a261f2cb8902410983
 EBUILD xmlada-2018.ebuild 1871 BLAKE2B f36dba5e21dadead63933f44e9b62da81ba3a40e523f92485515c7b9ccda27a84ba454325cbd7155de2da0552708266d4d05907255c852eef685e7ff007093fb SHA512 0753455dcdcc5f9e95d3966cdfffaf4fc7598f75efdc175f401ef759edcf86f89039b5035ca469399b3c67ef6e73387ec5aa53ff2145632e0b0809979d0a2580
-MISC metadata.xml 1143 BLAKE2B 7f633dfb6a079c1e981b7b7fe53f60df746919bea32c32c257002c3e13682d24b269d5bbe1b61700df930b7722d3f503bfff52c00676301f7a19523749edda81 SHA512 ce5fe7f5ca7d79bbd4b648608f1521056b62b90c70aec62b49e4be5737319df56a9248bd57b695b1469e2bb9b9b49c6c910c2321f1a690546ae1447bb0519006
+MISC metadata.xml 1211 BLAKE2B c4a426110f0fee7aedb724e8e20528c1975ef2e95b107fc9c7712a5d9a747bded5ab0992f744f375d522f1aa5afe564c3f48af0ddbd4385d32d37795014c8ad9 SHA512 bfe1919e064a72a81cd50197880579c2280e38bd63956ad329c26f0bc0b493df3718036feebf5f380d4ab669c7ace09878e36102317658f473e05e50fd900cf6
diff --git a/dev-ada/xmlada/files/xmlada-2018-gentoo.patch b/dev-ada/xmlada/files/xmlada-2018-gentoo.patch
index 9e79572e3067..439b85026d5f 100644
--- a/dev-ada/xmlada/files/xmlada-2018-gentoo.patch
+++ b/dev-ada/xmlada/files/xmlada-2018-gentoo.patch
@@ -1,5 +1,5 @@
---- xmlada-gpl-2017-src/Makefile.in.old	2017-12-04 20:09:23.730805855 +0100
-+++ xmlada-gpl-2017-src/Makefile.in	2017-12-04 20:09:51.586331155 +0100
+--- a/Makefile.in	2017-12-04 20:09:23.730805855 +0100
++++ b/Makefile.in	2017-12-04 20:09:51.586331155 +0100
 @@ -62,7 +62,8 @@
  
  # Rebuild the tests (and not the XML/Ada code itself)
@@ -9,8 +9,8 @@
  		-XTESTS_ACTIVATED=Only xmlada.gpr
  
  # Run the tests. This requires an install of XML/Ada first
---- xmlada-gpl-2017-src/tests/Makefile.old	2017-12-04 21:38:29.722818904 +0100
-+++ xmlada-gpl-2017-src/tests/Makefile	2017-12-04 21:38:54.229382658 +0100
+--- a/tests/Makefile	2017-12-04 21:38:29.722818904 +0100
++++ b/tests/Makefile	2017-12-04 21:38:54.229382658 +0100
 @@ -1,8 +1,6 @@
  TESTS= test_unicode \
  		 test_state \
@@ -28,3 +28,14 @@
  		gprbuild -q -Pdefault.gpr; \
  		./validate > $(RESULTS)/multiple_xsd.out; \
  		cp $(RESULTS)/multiple_xsd.out $(RESULTS)/multiple_xsd.diff; \
+--- a/input_sources/input_sources-http.adb	2019-05-29 10:18:23.428517625 +0200
++++ b/input_sources/input_sources-http.adb	2019-05-29 10:17:53.451007226 +0200
+@@ -191,7 +191,7 @@
+ 
+       Create_Socket (Socket);
+       Set_Socket_Option (Socket, Socket_Level, (Reuse_Address, True));
+-      Set_Socket_Option (Socket, Option => (Receive_Buffer, 3000));
++      Set_Socket_Option (Socket, Socket_Level, (Receive_Buffer, 3000));
+       Connect_Socket (Socket, Addr);
+ 
+       Channel := Stream (Socket);
diff --git a/dev-ada/xmlada/metadata.xml b/dev-ada/xmlada/metadata.xml
index 22eacbe16159..17a114e73ebb 100644
--- a/dev-ada/xmlada/metadata.xml
+++ b/dev-ada/xmlada/metadata.xml
@@ -8,7 +8,8 @@
 	<use>
 		<flag name="gnat_2016">Compile with dev-lang/gnat-gpl-2016</flag>
 		<flag name="gnat_2017">Compile with dev-lang/gnat-gpl-2017</flag>
-		<flag name="gnat_2018">Compile with dev-lang/gnat-gpl-2017</flag>
+		<flag name="gnat_2018">Compile with dev-lang/gnat-gpl-2018</flag>
+		<flag name="gnat_2019">Compile with dev-lang/gnat-gpl-2019</flag>
 		<flag name="shared">Build shared library</flag>
 		<flag name="static-pic">Build static library with pic code</flag>
 	</use>
diff --git a/dev-ada/xmlada/xmlada-2018-r1.ebuild b/dev-ada/xmlada/xmlada-2018-r1.ebuild
new file mode 100644
index 000000000000..48988109dcfc
--- /dev/null
+++ b/dev-ada/xmlada/xmlada-2018-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multiprocessing
+
+MYP=${PN}-gpl-${PV}
+
+DESCRIPTION="Set of modules that provide a simple manipulation of XML streams"
+HOMEPAGE="http://libre.adacore.com/"
+SRC_URI="http://mirrors.cdn.adacore.com/art/591aeb88c7a4473fcbb154f8 ->
+	${MYP}-src.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnat_2016 gnat_2017 +gnat_2018 gnat_2019 +shared static-libs static-pic"
+REQUIRED_USE="|| ( shared static-libs static-pic )
+	^^ ( gnat_2016 gnat_2017 gnat_2018 gnat_2019 )"
+
+RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
+	gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )
+	gnat_2018? ( dev-lang/gnat-gpl:7.3.1 )
+	gnat_2019? ( dev-lang/gnat-gpl:8.3.1 )"
+DEPEND="${RDEPEND}
+	dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]"
+
+S="${WORKDIR}"/${MYP}-src
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+src_configure () {
+	econf --prefix="${D}"/usr
+}
+
+src_compile () {
+	build () {
+		gprbuild -j$(makeopts_jobs) -m -p -v -XLIBRARY_TYPE=$1 \
+			-XBUILD=Production -XPROCESSORS=$(makeopts_jobs) xmlada.gpr \
+			-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 | grep DIFF && 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 "${D}"/usr/share/doc/${PN}/.buildinfo || die
+	rm -r "${D}"/usr/share/gpr/manifests || die
+}