gentoo resync : 06.12.2017

5 files changed, 70 insertions, 4 deletions

diff --git a/dev-ada/xmlada/Manifest b/dev-ada/xmlada/Manifest
index 58e5c6843058..e0fe04022d28 100644
--- a/dev-ada/xmlada/Manifest
+++ b/dev-ada/xmlada/Manifest
@@ -1,6 +1,7 @@
-AUX xmlada-2016-gentoo.patch 736 BLAKE2B 735fe5de39998f65777c4cdebd2390e9c3eb487d53a505faf8d2a1b083c71a439a5ef127e645b1aa23c9e90cedd82feb2f570d394aab308aed1432f46467a750 SHA512 23de23e5af65b02133730cdc30112e1f0585019aa3e6154b30b029f3d2f3bec74d7fe93549d5c505426eb2a13e6b820bafb78c02885dd70c4f3bf66b754171d4
+AUX xmlada-2016-gentoo.patch 1573 BLAKE2B a6c2d94f32fdea812777543eeef5403c6dcabd3314411a58cadcf0c877f3cf315c75e4147ec07be66ffa5d20a1b6672408aadc6c8dff5ececc1c891c4f1a1bb7 SHA512 c30789f6e5bfccbda41ac1742991dab5f7d4acf9fdac33247a68c47ae2c66f6451e918b005fe69af3f488c233a2a70b7eb791c5993d20c43f5d270e3a6693795
+AUX xmlada-2017-gentoo.patch 1133 BLAKE2B 6b15f8225c8d4094417f20b61261fc247a4c9290831265b15cf1a3f865d532c6e685cebf5c8cf635fc51ae0a44386428ee8b9300738a5fe0c2951e4a68cb7bb8 SHA512 47d383b18c6c46653c5369b691af47d8b7ea333d32d7ddcc5cb6831dea08dbfeec353ffa0e4de279baff4fedf911c39e28a6608529357ad70b9c1ce0a9a42b49
 DIST xmlada-gpl-2016-src.tar.gz 1440671 BLAKE2B 32998fbdb680f3a1ea7915f144c3039441d8608ded9fe2df99d9b5c9d13436a020c25a9773cced753ffa3ff89a918bbb1ef3ca310cbc58f583682deb7dcc9d09 SHA512 d1d7c3d91731394235aed4b80c91b1babe30d5f184282fae8087ee556318475e3923ed628b805693fc89a4d9bb219b0fb0937bc5024a742226da0245d36ed652
 DIST xmlada-gpl-2017-src.tar.gz 1578393 BLAKE2B 7b4894040b6044e86c96cbd530ebda5c0cfc4ad0e2b472d46798a93f535aca0916b03385a3aef49bd4e59d508a9665c856360e9cab0a4f67b15091228b629d81 SHA512 371f6adc01550a4bb13204ec0404dc1165438db595f4346813e5a23a155de74c857c40c55adde173919c2fe35b3b91d78b235c9718ee86bc848e62ddfd7fa2b4
-EBUILD xmlada-2016.ebuild 1237 BLAKE2B 0b53093c667a9d5f7b4f229a5a7d74403bbf39d836e0e05ee7a85f3140d1734b37a727096a90a652c8947771112044cdfb896c6a31d94d01a09ddc477dd029bb SHA512 1a30b3a57563657c760f3c1dca68c523aac805de9bdc0a07036d4376d0ceb1c68f6569a70205a3faa689b69b18537396f85cd2fe526fb14e728723940edbbc3d
-EBUILD xmlada-2017.ebuild 1481 BLAKE2B c26b9a4eaebfb75012a03f9df54555fdfd7b7d757c778fdf1e149937771cd5d4360a19c45cf5f80dea1de372dfc7c892ace4f1826b84fc2491c3823db23beede SHA512 49a749c0d45be451c55035dfccbbe2eba694a10146805b10a461b7941bec13f1706ebe42bba8caa70eb17337cae48bf2bcf5f70a9e42dd98a99d63b6e1c2f06d
+EBUILD xmlada-2016.ebuild 1300 BLAKE2B 85a44117b4e06011b98826db73e27170103c3dc0a4836dbbb4e52173e655470c57146c24235e3000f348b28117476ee9afe2ccd1b035afa695edd2e8517358b8 SHA512 ac3e75f8dfb7907865a1a72c4c33b9610899fa2d8f64b3b79bb3776b222cce3e86bcd2d30d28a6ec48608f64edd8940223aa46429ac5794ba50d4e483dc186a4
+EBUILD xmlada-2017.ebuild 1589 BLAKE2B 6ced473010522b1edd37d2bf9c16125a4cb6a54bfe006f35d18a3331ebf7acbf02a278b61359d4d75cb18b6eb7804858547f64937a2fa50ec86963cbef0a8bf0 SHA512 e9b59268de457144eaf7a06a738dfc3b5345977099d7bab0d00396ba28cafa4bfb615b6132bbdb34fc2335eb3c93087e86498f147a35d4e77f3dac8103ab4809
 MISC metadata.xml 1125 BLAKE2B 83c42db46eee7113a19c4cabb92e2f2b4607609e3ee4b624a5cf680c9a5d0b8394f31f9f99b973cd563b04a268aaab2f74f4bc2c1209179235f9f4814363087d SHA512 ab8a13a6e09513797895a7966adf026a21aa5f738853b039ec15d7091e32a8dd747c1c179ef92a24f2eb83f0a381c819f891bf35e6b4a90e1085aced8606f14d
diff --git a/dev-ada/xmlada/files/xmlada-2016-gentoo.patch b/dev-ada/xmlada/files/xmlada-2016-gentoo.patch
index 7c28a02289f8..a90b963edd3c 100644
--- a/dev-ada/xmlada/files/xmlada-2016-gentoo.patch
+++ b/dev-ada/xmlada/files/xmlada-2016-gentoo.patch
@@ -1,6 +1,6 @@
 --- xmlada-2016-src/Makefile.in.old	2016-12-04 21:58:57.251338692 +0100
 +++ xmlada-2016-src/Makefile.in	2016-12-04 21:59:31.332755615 +0100
-@@ -49,13 +49,13 @@
+@@ -49,16 +49,17 @@
  endif
  
  static:
@@ -17,3 +17,26 @@
  
  # Rebuild the tests (and not the XML/Ada code itself)
  test: force
++	GPR_PROJECT_PATH=schema:input_sources:dom:sax:unicode \
+ 	${GPRBUILD} -p -XLIBRARY_TYPE=static ${GPROPTS} \
+ 		-XTESTS_ACTIVATED=Only xmlada.gpr
+ 
+--- xmlada-gpl-2016-src/tests/Makefile.old	2017-12-04 21:15:16.330459020 +0100
++++ xmlada-gpl-2016-src/tests/Makefile	2017-12-04 21:15:33.176156634 +0100
+@@ -1,8 +1,6 @@
+ TESTS= test_unicode \
+ 		 test_state \
+-		 test_xml \
+ 		 test_adacore_dom \
+-		 test_schema \
+ 		 test_date_time \
+ 		 test_numbers \
+ 		 test_adacore_schema \
+@@ -71,6 +71,7 @@
+ test_multiple_xsd:
+ 	@echo "multiple xsd"
+ 	@cd schema/multiple_xsd; \
++		GPR_PROJECT_PATH=../../../distrib:../../../input_sources:../../../dom:../../../sax:../../../schema:../../../unicode \
+ 		gprbuild -q -Pdefault.gpr; \
+ 		./validate > $(RESULTS)/multiple_xsd.out; \
+ 		cp $(RESULTS)/multiple_xsd.out $(RESULTS)/multiple_xsd.diff; \
diff --git a/dev-ada/xmlada/files/xmlada-2017-gentoo.patch b/dev-ada/xmlada/files/xmlada-2017-gentoo.patch
new file mode 100644
index 000000000000..9e79572e3067
--- /dev/null
+++ b/dev-ada/xmlada/files/xmlada-2017-gentoo.patch
@@ -0,0 +1,30 @@
+--- 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
+@@ -62,7 +62,8 @@
+ 
+ # Rebuild the tests (and not the XML/Ada code itself)
+ test: force
++	GPR_PROJECT_PATH=schema:input_sources:dom:sax:unicode \
+ 	${GPRBUILD} -p -XLIBRARY_TYPE=static ${GPROPTS} \
+ 		-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
+@@ -1,8 +1,6 @@
+ TESTS= test_unicode \
+ 		 test_state \
+-		 test_xml \
+ 		 test_adacore_dom \
+-		 test_schema \
+ 		 test_date_time \
+ 		 test_numbers \
+ 		 test_adacore_schema \
+@@ -71,6 +71,7 @@
+ test_multiple_xsd:
+ 	@echo "multiple xsd"
+ 	@cd schema/multiple_xsd; \
++		GPR_PROJECT_PATH=../../../distrib:../../../input_sources:../../../dom:../../../sax:../../../schema:../../../unicode \
+ 		gprbuild -q -Pdefault.gpr; \
+ 		./validate > $(RESULTS)/multiple_xsd.out; \
+ 		cp $(RESULTS)/multiple_xsd.out $(RESULTS)/multiple_xsd.diff; \
diff --git a/dev-ada/xmlada/xmlada-2016.ebuild b/dev-ada/xmlada/xmlada-2016.ebuild
index a99eb9103ca9..585a5492bb7d 100644
--- a/dev-ada/xmlada/xmlada-2016.ebuild
+++ b/dev-ada/xmlada/xmlada-2016.ebuild
@@ -40,6 +40,11 @@ src_compile () {
 	done
 }
 
+src_test() {
+	emake test
+	emake run_test | grep DIFF && die
+}
+
 src_install () {
 	for kind in shared static static-pic; do
 		if use ${kind}; then
diff --git a/dev-ada/xmlada/xmlada-2017.ebuild b/dev-ada/xmlada/xmlada-2017.ebuild
index 4d5d16493c38..b80b4c4237f5 100644
--- a/dev-ada/xmlada/xmlada-2017.ebuild
+++ b/dev-ada/xmlada/xmlada-2017.ebuild
@@ -26,6 +26,8 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}"/${MYP}-src
 
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
 src_configure () {
 	econf --prefix="${D}"/usr
 }
@@ -45,6 +47,11 @@ src_compile () {
 	done
 }
 
+src_test() {
+	emake test
+	emake run_test | grep DIFF && die
+}
+
 src_install () {
 	for kind in shared static static-pic; do
 		if use ${kind}; then