gentoo resync : 06.12.2017

17 files changed, 88 insertions, 21 deletions

diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index c7729d8a6900..d06afed17292 100644
--- a/dev-ada/Manifest.gz
+++ b/dev-ada/Manifest.gz
diff --git a/dev-ada/gnatcoll/Manifest b/dev-ada/gnatcoll/Manifest
index 9303f60e0b0d..1316706809ce 100644
--- a/dev-ada/gnatcoll/Manifest
+++ b/dev-ada/gnatcoll/Manifest
@@ -2,6 +2,6 @@ AUX gnatcoll-2016-gentoo.patch 14137 BLAKE2B 9e3c7086a4ecce79dbb7d2c21f5d97b46bf
 AUX gnatcoll-2017-gentoo.patch 10577 BLAKE2B 02d129052b0b10429ce8e003b0a0759a547884f92d67b0018170f8d2e8719cf22da1f277f9568673006e8f7abdb4759ec37626e3b4260d343f5560e479f0c729 SHA512 bf61075b9ce327b37d01f36d8fcb38f6f2e197167abb02a1dee9a96d456a710c986ed079a40e07edceb280281f8c8465315f09e5a0e3b880f3db44371ae3efef
 DIST gnatcoll-gpl-2016-src.tar.gz 5687584 BLAKE2B 0ff5489f3e02ceeb44292f0d13907959884a55ec8f00fcadb21ee4e8a07f863a3bae3c7ae18d3fc669895a76b5f8f495699d31af71940a5abd32b156ad5fe247 SHA512 8cf06e7c5d58d3b159855534791e7969882e04856ba9d03982a63dcfc630f5b5910c6cad57fec9b00c3d04008b0cb0a1fb238e349766348fa4548868238ede8a
 DIST gnatcoll-gpl-2017-src.tar.gz 5785988 BLAKE2B 828aff797f7d992bf3f5dda7f8ce8a79e97ecd98253a657fb6e79a2fd08aac97e19cb421f47010f8c1f26442a013b9126ab3a95353d9ce0f29d071601e9dfe2f SHA512 e8b7f2c00816597f33496168bf8928841a2037e517908810761849e23633b2c229d47e4bfaa808e5a619da52bc165f17b8aefa5dee39ecf1a6773b3b1db80363
-EBUILD gnatcoll-2016.ebuild 2958 BLAKE2B 081478374475a8038bf27b6aa82293970f7b0971807d4a1938bbcee5cc97d77b89a180db3a10ab4b0ce19bf91c36bf9ca73afbdd2a8017fd97c857e21329cb2f SHA512 6153da56e4e3d084b0dcee220080eb94e529df8defffdf1e7ebc19c5f5b1d0b452ee7fbb0a3220fc7fcf7eb378079289581d2090e0ee4fa925dcfc98cc7a53bc
-EBUILD gnatcoll-2017.ebuild 3076 BLAKE2B cb822a8e287931c30913c11bb47efe5498de69fffa8bac0979aa5df70d6e02d58a6b53944661497f90f574aa8dc60ccb8a46f2aea55d294700f8e813833c80a4 SHA512 9cf9159a8035a45386885138d4dac6b6adca6755d28a981ae92a149b27505532900f37a78ff8f6243242fbd89518dd6c35c964dfc4afe290d17a737316b6ab20
-MISC metadata.xml 1473 BLAKE2B dbcae7c0fcf02880fec66bc055d318274499b05714b8065a792f5ff56bd2e4dacc59b77bf7d909495c58f9d667d6703fe8e7594b13993eb0808167ca8bc60d21 SHA512 43c44b85940e585406e90e856f83af23a605d69c3e52af16b17e22eb49de170422a4981c366f19f7554c68a67d4633da117c19eceb8824fa33a7f8e21316ddaa
+EBUILD gnatcoll-2016.ebuild 2963 BLAKE2B 88c6806748d1ec08ef4a7767857ce4a2f691b609f17b4de376c9ec4edc25b7492ab65d96e94b4786dee5b6cf875561191491bb667b8b632a3801b53be8efe2b8 SHA512 9420452c92ec7a23214598e93b73bab38adad717c52f4350c1c5b3317d95592a1e6ea76ee3aad8063fcdf8eab15b8a99e516697f815e6f5da6845c5547c87150
+EBUILD gnatcoll-2017.ebuild 3081 BLAKE2B 9f713c2dab41e8e5a7830c6e4f1778ecda29c9e8954238aa666f5ee75d56e6da10312228c875538afceaed858902aceeceb346e782570937a1a7e8abb669d0f8 SHA512 ee90912564942e7d7903e89fceefba024508fce11453c45e684f460e8b06c732d9f85e6072ad33b2b14399faebaf721413cca10c4bd20dcbd9622180ce46eacf
+MISC metadata.xml 1412 BLAKE2B 363f55392d7b2859157ecde38b7d2ff918cbd52d4b24a327d80460ee0b1fbcb3f220e32df31b1dd7ce59258c267a2ca843be30b6eba3ffb6f4ccdc1d8360bc3c SHA512 607a522c91bf0e1d7f7bbbdb541d35108e4d77760f9dbb375abca7a361602d9157ed60d1b71fd51af652b718a763010be8daab44eb3a87aa7d47ca0f20e468fc
diff --git a/dev-ada/gnatcoll/gnatcoll-2016.ebuild b/dev-ada/gnatcoll/gnatcoll-2016.ebuild
index 580ad95e1d3d..c65349de0a8a 100644
--- a/dev-ada/gnatcoll/gnatcoll-2016.ebuild
+++ b/dev-ada/gnatcoll/gnatcoll-2016.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/5739942ac7a447658d00e1e7
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="gmp +gnat_2016 gnat_2017 gtk iconv postgresql pygobject projects readline
+IUSE="gmp +gnat_2016 gnat_2017 gtk iconv postgres pygobject projects readline
 	+shared sqlite static syslog tools"
 
 RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
@@ -32,7 +32,7 @@ RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
 		x11-libs/pango
 	)
 	pygobject? ( dev-python/pygobject:3[${PYTHON_USEDEP}] )
-	postgresql? ( dev-db/postgresql:* )
+	postgres? ( dev-db/postgresql:* )
 	sqlite? ( dev-db/sqlite )
 	projects? (
 		=dev-ada/libgpr-2016[gnat_2016=,gnat_2017=,shared?,static?]
@@ -79,7 +79,7 @@ src_configure() {
 		--with-python \
 		$(use_with gmp) \
 		$(use_with iconv) \
-		$(use_with postgresql) \
+		$(use_with postgres postgresql) \
 		$(use_enable projects) \
 		$(use_enable pygobject) \
 		$(use_enable readline gpl) \
diff --git a/dev-ada/gnatcoll/gnatcoll-2017.ebuild b/dev-ada/gnatcoll/gnatcoll-2017.ebuild
index 0c258cd1aba3..7c2b9061a3f9 100644
--- a/dev-ada/gnatcoll/gnatcoll-2017.ebuild
+++ b/dev-ada/gnatcoll/gnatcoll-2017.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed016
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="gmp gnat_2016 +gnat_2017 gtk iconv postgresql pygobject projects readline
+IUSE="gmp gnat_2016 +gnat_2017 gtk iconv postgres pygobject projects readline
 	+shared sqlite static syslog tools"
 
 RDEPEND="dev-lang/gnat-gpl:6.3.0
@@ -31,7 +31,7 @@ RDEPEND="dev-lang/gnat-gpl:6.3.0
 		x11-libs/pango
 	)
 	pygobject? ( dev-python/pygobject:3[${PYTHON_USEDEP}] )
-	postgresql? ( dev-db/postgresql:* )
+	postgres? ( dev-db/postgresql:* )
 	sqlite? ( dev-db/sqlite )
 	projects? (
 		>=dev-ada/libgpr-2017[gnat_2017,shared?,static]
@@ -79,7 +79,7 @@ src_configure() {
 		--with-python \
 		$(use_with gmp) \
 		$(use_with iconv) \
-		$(use_with postgresql) \
+		$(use_with postgres postgresql) \
 		$(use_enable projects) \
 		$(use_enable pygobject) \
 		$(use_enable readline gpl) \
diff --git a/dev-ada/gnatcoll/metadata.xml b/dev-ada/gnatcoll/metadata.xml
index cca8442f43b8..5bc4030a3e0e 100644
--- a/dev-ada/gnatcoll/metadata.xml
+++ b/dev-ada/gnatcoll/metadata.xml
@@ -8,7 +8,6 @@
 	<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="postgresql">Adds support for postgresql</flag>
 		<flag name="projects">Adds support for projects</flag>
 		<flag name="pygobject">Adds support for pygobject</flag>
 		<flag name="shared">Build shared library</flag>
diff --git a/dev-ada/gps-bin/Manifest b/dev-ada/gps-bin/Manifest
index 08bf1b265e1d..b1547d98affc 100644
--- a/dev-ada/gps-bin/Manifest
+++ b/dev-ada/gps-bin/Manifest
@@ -1,3 +1,3 @@
 DIST gnat-gpl-2016-x86_64-linux-bin.tar.gz 372813330 BLAKE2B a0374ad730ae275aaedcf5663c30f8e0221af32f14391fe87a3ce0630d4498a1e90671c02830d62f78857571a5a521af91f6db409a7b3c367c7b0f059571eefd SHA512 5115ac3be0badc5125ee048a98230f18363d72107da3325ce602c0e618cee2e3646a0decc00a2388f14bc61bfed51dd0622f365f5f7ee8b0cec2187ebcf8e075
-EBUILD gps-bin-2016.ebuild 1502 BLAKE2B 9a916b04fdc22f26be3bf7c30daf74bbd9962a717a17268586d481bfe7927e84109a16e162cf24d54e7d39b3bc6e6bbe8417331d0ee22cb23218e28d6fb40199 SHA512 7b90c805cb4b9c66daf018d5bd075c29d9c0e48eb0542d798e1b0fe78e6e007e9571d63d3d4886eeb706ffb8e1a0a6018121913258489343582a298cd9dbd163
+EBUILD gps-bin-2016.ebuild 1500 BLAKE2B 32b2a084ea499feedd0b4933030d0d788bcff87285b28ef8c7a876a533678bf5672d42c2dfe6ac66fb88afbcbc78f39d526d9d29c5b723dc2d283fb3b7e30a3a SHA512 a50cfed20c261764fea8e2311a61511d195bbbc83fda86b0da74e3aef4883c38426e633951a3b817e051cf0786b54f3556fff6cd38e6c6c3a6a63a68f2a9ef8f
 MISC metadata.xml 1020 BLAKE2B 31b305e3aa3f0c87a449779685bc366e34b4c8f63989f5180feaa26df90322b276081b4bb2e10c23c3e7d139dc9b96e48c42ef7145646bcd1ef0ec6c106a06fb SHA512 b5c9fcae1f4d37762f6bb0457b245c60b3b96449f68b9fbd0f4c1d919174c18d3c2a82c26e1d0ca02177cbc2480125aac3ff47b61c2404571e85d0588ca9644e
diff --git a/dev-ada/gps-bin/gps-bin-2016.ebuild b/dev-ada/gps-bin/gps-bin-2016.ebuild
index c8fcc1c78b71..f112dba176b4 100644
--- a/dev-ada/gps-bin/gps-bin-2016.ebuild
+++ b/dev-ada/gps-bin/gps-bin-2016.ebuild
@@ -17,7 +17,7 @@ IUSE=""
 
 DEPEND=""
 RDEPEND="${DEPEND}
-	dev-ada/gnatcoll[gnat_2016,iconv,postgresql,projects,readline,sqlite]
+	dev-ada/gnatcoll[gnat_2016,iconv,postgres,projects,readline,sqlite]
 	dev-libs/atk
 	dev-libs/glib
 	dev-libs/gobject-introspection
diff --git a/dev-ada/gps/Manifest b/dev-ada/gps/Manifest
index 8fadaae1fe14..0d2365361d68 100644
--- a/dev-ada/gps/Manifest
+++ b/dev-ada/gps/Manifest
@@ -1,5 +1,5 @@
 AUX gps-2017-gentoo.patch 11521 BLAKE2B d036d5b495cf3d08718347f5f2dba6c327cd97aec437b9b82df7808fc6de5ed24100cdfafec0a54bc162e64b17f9ffa868239582c69b57e218ae5efd5c8da4fa SHA512 950f9b27f50b18d30c29babcc212d52577b20ef17acae8ea4d5a1973b18ab6d01a2ba8d70b5693ea03ad0f50e06011aab6ee54f9399e1c58d61793f4f33794bd
 DIST gnat-gpl-2017-x86_64-linux-bin.tar.gz 496338280 BLAKE2B b3eee6d311fb9c20bc8fa7217c0731ca1e91ced38700df1d63d91a16c3fa28dfd44c7c8e867c3a857b88e4f0c8b2a7200fb6a8a630b8403538c4784f8914d1a5 SHA512 01a8f3be9b7b7e83cc5bd4a45137b1d35c6448bc22a88bcaf5d312cd63e11081b6b2fe9f09ad2a27d8f0b6471fc5c1a99573bf3bcee1589329054074eaeef04f
 DIST gps-gpl-2017-src.tar.gz 41216830 BLAKE2B 51ca89c38fa81888a9cf1831cf97f7e0ad72c444328a29063249a4fe72bbdc8357552d470872e9fbbeaf349ef0427b59fa41a0efb56200a07a9426343c731a57 SHA512 101ecef7f183de1da0c2b09d77f284a5e8c5ae56f34a897c8d471e79fe9a2832742608ff5251197ba2a52b5d9dfee6c6937fc22cd55f6d8f38359b070393cb64
-EBUILD gps-2017.ebuild 1629 BLAKE2B f03738019a930d22c4b7e23cc75b670de32a611a9c93fe770641df68461354a2ca8a4c9b34ba1cd7dc372527e2bda6e157fd7b02fe699d751d95edfb3827e74e SHA512 6b1a443e067c071c2116689e5f0f522d9ced9c4cb8de94a78129ef92593a1eb150ee3263e98841f496876139313b0b89159721b4be37a609eed0d89eadafa8b5
+EBUILD gps-2017.ebuild 1646 BLAKE2B 7d99c9dfc4bb0d98eb9d27b06e8b3c58930de167c163da43d239eb940e1b09778d592ceb4c4d5a10b03d41d29a8cce9c80c6a9f93fd3c8812df70125867b559a SHA512 c892e29d4dc2ee70c6ea85da4379cb4d11f8225ea2d8d7f352bb194cfe5c6d39a1ce9b3d46b4d6eb4d0b8c1a0852fceedd556119a1236da0f9a73b2d1437b314
 MISC metadata.xml 438 BLAKE2B 105849097d35788d4178db05bd3c9ab5b17eb94bee320d0dfc2914889a3764824f53950f674a4d1488b649a344729e03bb8eacda9896636a632b1288a0abf07c SHA512 2bf4e76aab6f461c501b34fee6fbf719715af34e2af827daee3a145de31b96b5568009a21daaa4269a19386b0be45dd419710e926505bda7763312c809864aae
diff --git a/dev-ada/gps/gps-2017.ebuild b/dev-ada/gps/gps-2017.ebuild
index 209c3305c697..1425084ddd95 100644
--- a/dev-ada/gps/gps-2017.ebuild
+++ b/dev-ada/gps/gps-2017.ebuild
@@ -34,6 +34,8 @@ RDEPEND="${PYTHON_DEPS}
 
 DEPEND="${RDEPEND}"
 
+RESTRICT="test"
+
 S="${WORKDIR}"/${MYP}
 
 PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
diff --git a/dev-ada/libgpr/Manifest b/dev-ada/libgpr/Manifest
index 571e56926784..1295a74e6495 100644
--- a/dev-ada/libgpr/Manifest
+++ b/dev-ada/libgpr/Manifest
@@ -2,6 +2,6 @@ AUX libgpr-2016-gentoo.patch 2822 BLAKE2B 759977ffe76fefc27c1aecdfe8a8647c78c8c3
 AUX libgpr-2017-gentoo.patch 2047 BLAKE2B 8c8befa6b392863163fac1c03acc63b96c075929fec2207fb654ab191bb6a8995e0c2576c218c59b90b1eb90d330ea7837d032427b9b9495bdd5e98709363070 SHA512 51b82725f94488c06e9a9aece82b9a3df78f7a763ed6ae6055335c0eae802207a698e186fb321261b4c45539c2fba076d08605dd5fc64508d71928210fe80f0c
 DIST gprbuild-gpl-2016-src.tar.gz 2142261 BLAKE2B 69948427eb6315b9fb2b84755192b53c035f74093dacb34852713083779bf8bd88dac6b38fe7685f6a40ecb2482f78b15a5221913df997847eee8b1359cf6c14 SHA512 6b9e00248aaee90f3c00e7ce442c2b551b8532ec4d94a4471858d117feb27e91fd6d218995d4b71ee3f1f0677e9547d562fc2cda9ba80c3f6eb8d840ed56eb7e
 DIST gprbuild-gpl-2017-src.tar.gz 2454957 BLAKE2B 890e5aa29e9f8fa8b140988ee8e5d6042640c34fe0877acde959de803bf690bb33c63b1c7e7db486f804882bddd77ab76ffbaa4dd27da327e21ed0376cadb99d SHA512 12f3682d64ce0718de4940c1e71a4380b20021805d88543842dbf3b5ce5d518c23a6b2d868565579baf81efa1d8cf05c7778253162f0df5d7adc0eb1865c9f88
-EBUILD libgpr-2016.ebuild 1149 BLAKE2B d02f6784996799048d4982e242ca1f0b96c390420ec53ccb1e8f36749007fe4241935ae98781a276323d9252cbd5b2d59a660b3b6cdb06c3502c095e66649559 SHA512 9141c6fa2dc91758b309c2eb21fa845d98078fadddb9b26c40fdfcb5f453f31e7245a76cb05986dda476ca7777a1fcdb6c948d06c79aa1365bbbc427842bbaa3
-EBUILD libgpr-2017.ebuild 1530 BLAKE2B 557923a73032448e12d524d9be9e893f4d904d75720968c7899b6b114db428d53941e4c93d8e7e03987df2929603c29af38554339167fe7dff5bea0cb4468d42 SHA512 79ce27b7c90f4732458e018cec135462bafebf14d472493549ef20be606b1512a300ddfb30c91495b8104c8b79d7ed0218682108c894c9ec52f2b14b1896f12c
+EBUILD libgpr-2016.ebuild 1168 BLAKE2B dfb30003c3f2ff033c0748dd62c7b2236804050c9cae7e76a83cf2bc02b92bb447b28a9b0102e7399427cf89ead48bd17ed381f4afe5ad4c8aa015b5457f5cc6 SHA512 7b8eb381deb93b476d661e01b36a19314a2c75e811a38c6471a97c70ee3ab7305c90cb402ac9772c80063dda640893effef7d1d8b7a7b43992b061fada97d00c
+EBUILD libgpr-2017.ebuild 1549 BLAKE2B ef7ed848ecccd7cc7d53437c859ef066fa80aa3af7e0190a6cb47ae5595ade408f40e696ed159862e0d6073a67cfd8db8eefc3654c0a9747522101ef61fd8a59 SHA512 68f2ded303465eef392a550e540a58b7aca5ce8e82727cc4db30d1f99c7571942f5e8a8619c6ddb701c8bab7b2d4cf3fdf37bf2583c91a912e541e05fb641363
 MISC metadata.xml 1157 BLAKE2B 7a4bc1bbe6ebfb46595c86335b371dc07b7a3f45ab1dbb4cffe382ed8006dd83ba095702ef462580c272341f7ead36e08c6de27900667e4ee2610de4edb1dc76 SHA512 47a7793368b83f9f9101df74a87214ae6615c163a6ffbb24644b102b427ca8559f39f16075b6b5048b8dade368f540f2b8e9b19b376905996b0915c74faff580
diff --git a/dev-ada/libgpr/libgpr-2016.ebuild b/dev-ada/libgpr/libgpr-2016.ebuild
index b750ef5400a7..9747b4797515 100644
--- a/dev-ada/libgpr/libgpr-2016.ebuild
+++ b/dev-ada/libgpr/libgpr-2016.ebuild
@@ -7,7 +7,7 @@ inherit toolchain-funcs multiprocessing
 
 MYP=gprbuild-gpl-${PV}
 
-DESCRIPTION="Multi-Language Management"
+DESCRIPTION="Ada library to handle GPRbuild project files"
 HOMEPAGE="http://libre.adacore.com/"
 SRC_URI="http://mirrors.cdn.adacore.com/art/57399662c7a447658e0affa8
 		-> ${MYP}-src.tar.gz"
diff --git a/dev-ada/libgpr/libgpr-2017.ebuild b/dev-ada/libgpr/libgpr-2017.ebuild
index 16acad675fe9..333c21736a07 100644
--- a/dev-ada/libgpr/libgpr-2017.ebuild
+++ b/dev-ada/libgpr/libgpr-2017.ebuild
@@ -7,7 +7,7 @@ inherit toolchain-funcs multiprocessing
 
 MYP=gprbuild-gpl-${PV}
 
-DESCRIPTION="Multi-Language Management"
+DESCRIPTION="Ada library to handle GPRbuild project files"
 HOMEPAGE="http://libre.adacore.com/"
 SRC_URI="
 	http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deecff7
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