gentoo resync : 30.12.2017

6 files changed, 36 insertions, 68 deletions

diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index f55ea9507d3f..c23e4f8c9372 100644
--- a/dev-ada/Manifest.gz
+++ b/dev-ada/Manifest.gz
diff --git a/dev-ada/gps/Manifest b/dev-ada/gps/Manifest
index 5a5264c67798..ba2f226bab4d 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 1673 BLAKE2B 0d8c504ff89fdf1478d5966e7c300aa0fdbc9a6f2260c1d46261cbb7aa364e0a7ad93963915f5fb1760a90a92027968bb4bcea57ae1a2e74036204fc7d33552c SHA512 40d6ccd2c4e1ccb94a59682670a3718502fd9b9fa18c7210f8e05b3f7630a86dc7ffb57237deb86c512765a92dc59cae86e56c7270a824a933fc79e32e971bf1
+EBUILD gps-2017.ebuild 1708 BLAKE2B 40b43e2fd921c90e5c20c65e903a98d4df08470ed66d7ef8a1503e7d8b48f6484cf6f6006b22b0aec1ee3cfbc34af218d12e2c4897daf4f0464971e898120b6d SHA512 209c0bfff4b3150a5ccc4f691c98d9d7dd8708a742f419307b5336aaca77d128a71cfc05e434d0a913f62fda574911c4be679513ba9e4a2db4a869d092aaf812
 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 7ab72b50e19c..559fab81ea12 100644
--- a/dev-ada/gps/gps-2017.ebuild
+++ b/dev-ada/gps/gps-2017.ebuild
@@ -20,12 +20,11 @@ KEYWORDS="~amd64"
 IUSE="doc"
 
 RDEPEND="${PYTHON_DEPS}
-	>=dev-ada/gnatcoll-2017[gtk,iconv,projects,pygobject,shared,sqlite,tools]
+	>=dev-ada/gnatcoll-2017[gtk,iconv,pygobject,sqlite,tools]
 	>=dev-ada/gtkada-2017
 	dev-ada/libadalang
 	dev-libs/gobject-introspection
 	dev-libs/libffi
-	sys-devel/llvm:=
 	sys-devel/clang:=
 	x11-themes/adwaita-icon-theme
 	x11-themes/hicolor-icon-theme
@@ -58,6 +57,11 @@ src_prepare() {
 	eautoreconf
 }
 
+src_configure() {
+	econf \
+		--with-clang=$(llvm-config --libdir)
+}
+
 src_compile() {
 	emake GPRBUILD_FLAGS="-v ${MAKEOPTS}"
 }
diff --git a/dev-ada/xmlada/Manifest b/dev-ada/xmlada/Manifest
index e0fe04022d28..bdede8896289 100644
--- a/dev-ada/xmlada/Manifest
+++ b/dev-ada/xmlada/Manifest
@@ -1,7 +1,5 @@
 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 1300 BLAKE2B 85a44117b4e06011b98826db73e27170103c3dc0a4836dbbb4e52173e655470c57146c24235e3000f348b28117476ee9afe2ccd1b035afa695edd2e8517358b8 SHA512 ac3e75f8dfb7907865a1a72c4c33b9610899fa2d8f64b3b79bb3776b222cce3e86bcd2d30d28a6ec48608f64edd8940223aa46429ac5794ba50d4e483dc186a4
-EBUILD xmlada-2017.ebuild 1589 BLAKE2B 6ced473010522b1edd37d2bf9c16125a4cb6a54bfe006f35d18a3331ebf7acbf02a278b61359d4d75cb18b6eb7804858547f64937a2fa50ec86963cbef0a8bf0 SHA512 e9b59268de457144eaf7a06a738dfc3b5345977099d7bab0d00396ba28cafa4bfb615b6132bbdb34fc2335eb3c93087e86498f147a35d4e77f3dac8103ab4809
+EBUILD xmlada-2017.ebuild 2005 BLAKE2B ef14d181496c26de1ebe71cf496830ea75015c816ee6b28fcb8d60c40cb8c8cc78ba6ae446f79ab8ff16abb47801ce4830142af0b603f53e0fd365161c0e9d99 SHA512 81a6efd7a7959958f496e8d3e5a73bdcce62c995f2bdbeb11d6b95c424421317492feb6f028355336e991052366074e609550184882da73bc98b4d812cf69ff4
 MISC metadata.xml 1125 BLAKE2B 83c42db46eee7113a19c4cabb92e2f2b4607609e3ee4b624a5cf680c9a5d0b8394f31f9f99b973cd563b04a268aaab2f74f4bc2c1209179235f9f4814363087d SHA512 ab8a13a6e09513797895a7966adf026a21aa5f738853b039ec15d7091e32a8dd747c1c179ef92a24f2eb83f0a381c819f891bf35e6b4a90e1085aced8606f14d
diff --git a/dev-ada/xmlada/xmlada-2016.ebuild b/dev-ada/xmlada/xmlada-2016.ebuild
deleted file mode 100644
index 585a5492bb7d..000000000000
--- a/dev-ada/xmlada/xmlada-2016.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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/57399978c7a447658e0affc0 ->
-	${MYP}-src.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+gnat_2016 gnat_2017 +shared static static-pic"
-REQUIRED_USE="|| ( shared static static-pic )
-	^^ ( gnat_2016 gnat_2017 )"
-
-RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
-	gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2016=,gnat_2017=]"
-
-S="${WORKDIR}"/${MYP}-src
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_configure () {
-	econf --prefix="${D}"/usr
-}
-
-src_compile () {
-	for kind in shared static static-pic; do
-		if use ${kind}; then
-			emake PROCESSORS=$(makeopts_jobs) ${kind}
-		fi
-	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
-			emake PROCESSORS=$(makeopts_jobs) DESTDIR="${D}" install-${kind}
-		fi
-	done
-	einstalldocs
-	dodoc features-* known-problems-* xmlada-roadmap.txt
-	rm "${D}"/usr/share/doc/${PN}/.buildinfo || die
-}
diff --git a/dev-ada/xmlada/xmlada-2017.ebuild b/dev-ada/xmlada/xmlada-2017.ebuild
index b80b4c4237f5..04b53bcdf500 100644
--- a/dev-ada/xmlada/xmlada-2017.ebuild
+++ b/dev-ada/xmlada/xmlada-2017.ebuild
@@ -33,16 +33,17 @@ src_configure () {
 }
 
 src_compile () {
-	if use shared; then
-		gprbuild -j$(makeopts_jobs) -m -p -v -XLIBRARY_TYPE=relocatable \
+	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
 	for kind in static static-pic; do
 		if use ${kind}; then
-			gprbuild -j$(makeopts_jobs) -m -p -v -XLIBRARY_TYPE=${kind} \
-				-XBUILD=Production -XPROCESSORS=$(makeopts_jobs) xmlada.gpr \
-				-cargs ${ADAFLAGS} || die "gprbuild failed"
+			build ${kind}
 		fi
 	done
 }
@@ -53,11 +54,33 @@ src_test() {
 }
 
 src_install () {
+	local includedir=/usr/include/${PN}
+
+	fix_install () {
+		mv "${D}"${includedir}/$1.$2/* "${D}"${includedir}/$1/ || die
+		for file in "${D}"${includedir}/$1/*; do
+			dosym ../$1/$(basename ${file}) \
+				${includedir}/$1.$2/$(basename ${file})
+		done
+	}
+
 	for kind in shared static static-pic; do
 		if use ${kind}; then
 			emake PROCESSORS=$(makeopts_jobs) install-${kind}
 		fi
 	done
+	rm "${D}"/usr/lib/libxmlada_* || die
+	for dir in xmlada_{dom,input,sax,schema,unicode}; do
+		dodir /usr/include/${PN}/${dir}
+		if use shared; then
+			fix_install ${dir} relocatable
+		fi
+		for kind in static static-pic; do
+			if use ${kind}; then
+				fix_install ${dir} ${kind}
+			fi
+		done
+	done
 	einstalldocs
 	dodoc xmlada-roadmap.txt
 	rm "${D}"/usr/share/doc/${PN}/.buildinfo || die