gentoo resync : 12.01.2019

3 files changed, 23 insertions, 9 deletions

diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index c180c5604f8f..f49ca23ffff1 100644
--- a/dev-ada/Manifest.gz
+++ b/dev-ada/Manifest.gz
diff --git a/dev-ada/gps/Manifest b/dev-ada/gps/Manifest
index d511ac3da4c3..8c265092ca37 100644
--- a/dev-ada/gps/Manifest
+++ b/dev-ada/gps/Manifest
@@ -3,8 +3,8 @@ AUX gps-2018-gentoo.patch 2976 BLAKE2B dd72c2c4c8dc8f971b819eb76b4433dd78c587d79
 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
 DIST gps-gpl-2018-src.tar.gz 40541905 BLAKE2B abe38dd23d9afede27b4ec8294e3245c12d52d60491b6e7c1b2d120a6f1e5d808fdcfb648e72da31376e2de176f7a039c5493341ad295db33b6a1ce44bb64096 SHA512 da0eaa85eb753f215354c9765272d85378f36ebe207314bab9211642f9d9b505a3d05cdec9de6964ae9139c4f8942a29e06c72db32b2aeb053a694e9c982e470
-DIST gpsLib.tar.gz 11017404 BLAKE2B b84219322950d5c3a7b202e4b5e423fcb95c528d4e0810f25674e8cfd0e9ca91a155fff500e4d25959cdba42492794fba8cb725e6955bcea8908a8043a387ca1 SHA512 e852285c8b67e5787396dfaa95feaff31e73bd4cd3a731e20c6970c2ade3ef6290ef98d9a6b7553d4daf6f2ae722ca5ff74add3fd4285ce259a1443e6b06a5a1
+DIST gtk+-3.14.15-src.tar.gz 32009863 BLAKE2B 93c6897c431fa8e1c19ea758378bc7e365d486d1decccefbba64876d8c51a488e6bcf932481daa11e7e43a960a328c3db746e41a845e574c6b6070ab71e23188 SHA512 add4607a1758319a938d2be0bbd0dd140c4099accffa9301e3049bc460bf94f395c5a092368214e8b28d53bc25335d1b8329b50c7eb80a1e9a65b2e154135b84
 DIST libadalang-tools-gpl-2018-src.tar.gz 19938182 BLAKE2B 34104f3bc43c165a9b74ba8c0c03ee2f34686bcd06b5ced730f70f654d8b808e129a85566e081830b4f20304c793eefe0af81b56984cf06190302ad2f6a419be SHA512 a1176575944cd88b9da5f4e9f03caa1a4d09358df71e6a91300d0b35c2a843d0ea1a77fbd93e7b7f16cef1b978022ee20991f5c2ff74f7d05878c3de1220f2b5
 EBUILD gps-2017.ebuild 2120 BLAKE2B a78b670ff9915bef812bb51b8a45e26feb1ec109b5cafcc1dbfbe3628aa33a02d32585829424e9660cb3759d464d7aca413c038aa5db2d24f0513ba86d2bfbf9 SHA512 f50681981837153b0df3080992c57c17315afbcc90848fe803b03d504284eb6f4f0a8c24cc2caa6aef2e4b5f29fb70af3b06b3c684e5b37844d350e1fa1150a0
-EBUILD gps-2018.ebuild 2561 BLAKE2B f5d771871c70710743fe85e644f9513e32c43cadd8b63be4fd95a8f9d499d75ea68f887d243c4192d93e80748f087cdd56c601d8d374df7d47e15324a78ceaf6 SHA512 f3a4cb6f0176fa786f2bdd52900c5481c98768321596e829309a56fee37183d8541797a7587a3c44a175978b11607a5735c9c81d7364e90af5e98efad98341c4
+EBUILD gps-2018-r1.ebuild 3118 BLAKE2B 24faa9b9cdc133350048cf32b41bf5b6a81d3b4cc11080d1cc8653fbd813d25c7303c61349018f9b63e5c07d574c7fa372d26011b5bec10ac8988bf06215bc83 SHA512 42bff264dbc3b35818b556247e4c7f16ece78023fe7e338db3b73f6a44342cd988330f44c7f6c10337117aa3f576b701e6476dade4d89c5004f1dfe7866cc0f2
 MISC metadata.xml 657 BLAKE2B c97ff9ab3140c87cb2066f25c639c3a5053c0775abfe23937b92f912ff71299bf136de797de6fd1010d576ba44f4e1b1f6e7dae4d1e076682382b33482240606 SHA512 498222549bd8c7e48575bdc0250cc810540928b19819759ba8a4f9b3aea39ad1b7b579b988a26b1bcf109774b356c7635e11e5e42a41dc76af8d9230a63f9d91
diff --git a/dev-ada/gps/gps-2018.ebuild b/dev-ada/gps/gps-2018-r1.ebuild
index 290f5bf27219..b8cd9b2a7584 100644
--- a/dev-ada/gps/gps-2018.ebuild
+++ b/dev-ada/gps/gps-2018-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 PYTHON_COMPAT=( python2_7 )
-inherit python-single-r1 autotools desktop llvm
+inherit python-single-r1 autotools desktop llvm multilib
 
 MYP=${PN}-gpl-${PV}-src
 
@@ -13,7 +13,8 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/5b0cf627c7a4475261f97ceb
 	-> ${MYP}.tar.gz
 	http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a59 ->
 		libadalang-tools-gpl-2018-src.tar.gz
-	https://dev.gentoo.org/~tupone/distfiles/gpsLib.tar.gz"
+	http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a61 ->
+		gtk+-3.14.15-src.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -75,8 +76,13 @@ src_prepare() {
 		|| die
 	mv "${WORKDIR}"/libadalang-tools-src laltools
 	echo "#!/bin/bash" > gps.sh
-	echo "export LD_LIBRARY_PATH=/opt/lib/gps" >> gps.sh
+	echo "export LD_LIBRARY_PATH=/usr/$(get_libdir)/gps" >> gps.sh
 	echo 'exec /usr/bin/gps_exe "$@"' >> gps.sh
+	cd ../gtk+-3.14.15-src
+	sed -i \
+		-e "/^libadd/s:=.*$:= \\\:" \
+		-e "/^deps/s:=.*$:= \\\:" \
+		../gtk+-3.14.15-src/gtk/Makefile.in
 }
 
 src_configure() {
@@ -84,6 +90,8 @@ src_configure() {
 		GNATMAKE=/usr/bin/${GNATMAKE} \
 		GNATDRV=/usr/bin/${GNATDRV} \
 		--with-clang=$(llvm-config --libdir)
+	cd ../gtk+-3.14.15-src
+	econf --disable-cups
 }
 
 src_compile() {
@@ -92,13 +100,19 @@ src_compile() {
 		Build=Production
 	gprbuild -v -p -Pcli/cli.gpr ${MAKEOPTS} -XLIBRARY_TYPE=relocatable \
 		-XGPR_BUILD=relocatable -cargs:Ada ${ADAFLAGS} || die
+	cd ../gtk+-3.14.15-src
+	emake -C gtk/inspector
+	emake -C gtk gtk.gresource.xml gtkdbusgenerated.c gtkdbusgenerated.h
+	emake -C gtk libgtk-3.la
 }
 
 src_install() {
 	default
 	make_desktop_entry "${PN}" "GPS" "${EPREFIX}/usr/share/gps/icons/hicolor/32x32/apps/gps_32.png" "Development;IDE;"
-	insinto /opt/lib
-	doins -r ../lib/gps
 	mv "${D}"/usr/bin/gps{,_exe}
-	newbin	gps.sh gps
+	newbin gps.sh gps
+	cd ../gtk+-3.14.15-src
+	emake -C gtk DESTDIR="${D}" install-libLTLIBRARIES
+	rm "${D}"/usr/$(get_libdir)/libgtk-3.{la,so,so.0} || die
+	dosym "${D}"/usr/$(get_libdir)/libgtk-3.so.0.* /usr/$(get_libdir)/gps/libgtk-3.so.0
 }