gentoo resync : 18.03.2018

6 files changed, 11 insertions, 7 deletions

diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index 229171a4364b..bd7f7003f9bb 100644
--- a/dev-ada/Manifest.gz
+++ b/dev-ada/Manifest.gz
diff --git a/dev-ada/gnatcoll/Manifest b/dev-ada/gnatcoll/Manifest
index 08d250a147f7..bb769a6bedc5 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 3032 BLAKE2B b4db5d1e5360095e9064d4e293f8b907b25f19f71efe9f27f5674b02ec591cb378fce0cae4c58a3e394c40bfb7ad2a2e7885741cae5829fde63c7f5d20f480d0 SHA512 fde684e6591b9d3cb910e49fe794ed5a68bab8aabdc4a91b87a20c2b3043e5ddd72248319d2e8b5696cf73541649a5e8e01ee06a0d35117fd7028a7f41d7cb37
-EBUILD gnatcoll-2017.ebuild 3160 BLAKE2B 0a59d0cfb9aea80cce4d4f5a30ff2aa15e780b19d1fa1f79bb723ac00e8f39e3cd987586f2404599eee4196239f1a9406f3cfa379d857c544c4b1246d35fffd7 SHA512 26495bc36cb61de56a498c718ab9776545d870aa5e469ba17be07e5231d40da7dca7787a947257124952e39550aebaa251920e6ea509e079eaf5bf14dd126809
+EBUILD gnatcoll-2016.ebuild 3056 BLAKE2B adddbf442f3a3d810304ff12b3d28e75c41ac8cae465168cf658ff1f7f3997d04f1f38381b4cdb1a9a70e799ea7737abf8ada88e9617e79b784e029840cf5e14 SHA512 c107404ff7d4ccb9ea8c034927882288ff35233278f88d760dbf9c2cbb6b1b0ec7b75d63565b162de67aa76dcac899526e7eefa06bb60a7f3d4c07085cc3c8f7
+EBUILD gnatcoll-2017.ebuild 3184 BLAKE2B 4bb17329961af0afda0d1d66650ca85a350be0353670752cf3a94e9863661584455135c591d8a0dcd6faf5e20d60c731ca13c38b2acb468650160362cc403c60 SHA512 d11f55d8fde417a6a22cbc08008452d56898625bc7b10867ba14559aee85d5977551b65d50dfaf03a1e865d6f70b667645d9efa7cbc287099d519d9fdafb28fe
 MISC metadata.xml 1362 BLAKE2B 0660675cc1821ffb20a9a80bce768db18252bf049f6f52cf3389a7681cc4a31b040350008e6477a2259c8faba5689525586cd35cdf4bcb9df298941021c5a0bd SHA512 64620ff6da6c812968ac057a3724b9733d4d14e1cacd654bf750efe33f64910ae74da07bbca0d6996f58405c083636e574f1b93958d0fe4447e1896ded2b3940
diff --git a/dev-ada/gnatcoll/gnatcoll-2016.ebuild b/dev-ada/gnatcoll/gnatcoll-2016.ebuild
index 8363e70ddcdf..3865a18e258c 100644
--- a/dev-ada/gnatcoll/gnatcoll-2016.ebuild
+++ b/dev-ada/gnatcoll/gnatcoll-2016.ebuild
@@ -42,6 +42,7 @@ DEPEND="${RDEPEND}
 	dev-ada/gprbuild[gnat_2016=,gnat_2017=]"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	tools? ( static-libs )
 	pygobject? ( gtk )
 	^^ ( gnat_2016 gnat_2017 )"
 
diff --git a/dev-ada/gnatcoll/gnatcoll-2017.ebuild b/dev-ada/gnatcoll/gnatcoll-2017.ebuild
index 995ff143031a..14dc21490465 100644
--- a/dev-ada/gnatcoll/gnatcoll-2017.ebuild
+++ b/dev-ada/gnatcoll/gnatcoll-2017.ebuild
@@ -41,6 +41,7 @@ DEPEND="${RDEPEND}
 	dev-ada/gprbuild[gnat_2017]"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	tools? ( static-libs )
 	pygobject? ( gtk )
 	!gnat_2016 gnat_2017"
 
diff --git a/dev-ada/gps/Manifest b/dev-ada/gps/Manifest
index ba2f226bab4d..9a35192ec2e9 100644
--- a/dev-ada/gps/Manifest
+++ b/dev-ada/gps/Manifest
@@ -1,5 +1,5 @@
 AUX gps-2017-gentoo.patch 13283 BLAKE2B 91b546a0ad1f78fc087980b1366f2e3d22bcc9584df7b975d99122b51a6251ec87532c904411cf4cd95c6898e7a9217a8429cf0157db0f8ad6aef94fed778361 SHA512 82caf18d500d10f6841140f57528726e1dd6d115e5ad6538442af80abe0068b98f137fc35027ded1ef3603e3c7003de0f1ff4cc7eb93d6d8863909fa61fc635b
 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 1708 BLAKE2B 40b43e2fd921c90e5c20c65e903a98d4df08470ed66d7ef8a1503e7d8b48f6484cf6f6006b22b0aec1ee3cfbc34af218d12e2c4897daf4f0464971e898120b6d SHA512 209c0bfff4b3150a5ccc4f691c98d9d7dd8708a742f419307b5336aaca77d128a71cfc05e434d0a913f62fda574911c4be679513ba9e4a2db4a869d092aaf812
+EBUILD gps-2017.ebuild 1787 BLAKE2B 52263fa67bf9d363adbbaa6f2b3c0617514e80069961244513c86356337be7cd9207ec3d85d0a5b89c57f2ee78696ba886403d41a999ff70ea457ba03e145727 SHA512 f97eca6931b6b9639045f65f18a9b1528974cb636607917a66b048853e47b32fcc05f9b63aad8b5c2484b6c3f24743268ca480743a5297a11c7ec07a3a739ce1
 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 559fab81ea12..c33f7a002f7c 100644
--- a/dev-ada/gps/gps-2017.ebuild
+++ b/dev-ada/gps/gps-2017.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,11 +16,11 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed03b
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
 RDEPEND="${PYTHON_DEPS}
-	>=dev-ada/gnatcoll-2017[gtk,iconv,pygobject,sqlite,tools]
+	>=dev-ada/gnatcoll-2017[gtk,iconv,pygobject,sqlite,static-libs,tools]
 	>=dev-ada/gtkada-2017
 	dev-ada/libadalang
 	dev-libs/gobject-introspection
@@ -63,7 +63,9 @@ src_configure() {
 }
 
 src_compile() {
-	emake GPRBUILD_FLAGS="-v ${MAKEOPTS}"
+	emake GPRBUILD_FLAGS="-v ${MAKEOPTS} \
+		-XLIBRARY_TYPE=relocatable \
+		-XXMLADA_BUILD=relocatable"
 }
 
 src_install() {