gentoo resync : 26.11.2017

3 files changed, 41 insertions, 19 deletions

diff --git a/dev-ada/gnatcoll/Manifest b/dev-ada/gnatcoll/Manifest
index b11552018ad0..e5b59f8e61c4 100644
--- a/dev-ada/gnatcoll/Manifest
+++ b/dev-ada/gnatcoll/Manifest
@@ -1,7 +1,7 @@
-AUX gnatcoll-2016-gentoo.patch 14137 SHA256 3d23eaca78f1a5c0ea4d63572d8649264dec0de5a906cf708df8c5f53b0fceb8 SHA512 641da348023eedb141e555148056e591af09ef31954178c128a4627bff80777e3e274663bdc4ea712afc10cd902efb186a0bba9b03b7f67f6655944af83ff8d0 WHIRLPOOL 52d1c1c3ba809c06f804e1fd77b7c1c28b42e747530295d7f00885d70dff7d543c669901b1d45318ff3d6fbeb2609708a0378f9561b9615644ca69c3b9326107
-AUX gnatcoll-2017-gentoo.patch 9485 SHA256 78dd92e685a430b6e5e12e2a833c7d22fefde25804ca19c13d252d55b3686910 SHA512 76a18ca8fb8fb61c5bd5ef4626428ed29b493d86638a278f2ddf673bc27793cf4b3778faf892f530ab1ea67915362802660640309a315166854aac67e7c243b4 WHIRLPOOL 277667b15a019d7552e315d3485ff713b562a98c7818de3d930f9f2c469349301a9135a9a2c0b9e1b6d1676b781dd40666d057fd7f368aed8449212879d4aacb
-DIST gnatcoll-gpl-2016-src.tar.gz 5687584 SHA256 8cc7cc01db548447a78e3d6d35a35867514beb625009abbcd3be124c1e259b3b SHA512 8cf06e7c5d58d3b159855534791e7969882e04856ba9d03982a63dcfc630f5b5910c6cad57fec9b00c3d04008b0cb0a1fb238e349766348fa4548868238ede8a WHIRLPOOL d37c12bb6242d92104e89b7c1d9a9cd94d802137ee32faa58687700a822db69e2739372376d12032228843c2a5356f8085d6072715b8bc1bda411039d20b55f5
-DIST gnatcoll-gpl-2017-src.tar.gz 5785988 SHA256 66168ee795a67dde3b8a8d0fe6663a776d1bdf50091e6cdd47f3837d89afd434 SHA512 e8b7f2c00816597f33496168bf8928841a2037e517908810761849e23633b2c229d47e4bfaa808e5a619da52bc165f17b8aefa5dee39ecf1a6773b3b1db80363 WHIRLPOOL a0fbda792b282ecb184057efa98332f0b790c9412ba6fec541fbcb8c57cab48f64df6ff81017c283e599cda858d668f5f8fcf5b7bd771c23f34a84a6d16f4c79
-EBUILD gnatcoll-2016.ebuild 2959 SHA256 b5604dd3eec5a40186b48a7d82e6d1346e01d8ab7729ab1860d7911b283ef739 SHA512 2ef7e10aa95aa7a5496af2c758ebd8073e6a13713789b0420a39f5a0cb4a72bdd5ec1f7ff51e63d42ff283ea928796d6185a448801e7afad09ea21a13380f6c7 WHIRLPOOL 642bb23492ddfadc6f1b45fc879c2a9c6a34214889c5b8d29c8c8b59ac997eb26b5ff92d2a2c9bce6b9920f1e3f83750ea96fd5f9ae2f3db1e9da4fc57bbaa32
-EBUILD gnatcoll-2017.ebuild 3101 SHA256 df3479f391b8894e0e08f463bee318974ee2c8094814eaa42aa14e758ffd46d6 SHA512 b52ba1385ca6aaa11661c12934b2c92907d32bc905437199d1150c3878a200f1d7a36fb974ad45c0cfaba820122ed930ceb6d42fd1984d9db35dd9069a892e57 WHIRLPOOL d15dcb2c09ab7a7917caf2567a1aaf5f2a1f395f333fd2b4ca2e02e4f3c06955d56459974b713d987a3eb3c7c1aecdf84ae4b464dd23ca33fad605ec18a13ea4
-MISC metadata.xml 1473 SHA256 896d6ea1ef7786244d3388b9ef64e98ce4b3590fb5897b2b7e6efa0e16809060 SHA512 43c44b85940e585406e90e856f83af23a605d69c3e52af16b17e22eb49de170422a4981c366f19f7554c68a67d4633da117c19eceb8824fa33a7f8e21316ddaa WHIRLPOOL fff7e879571f1770164bf6a8764c5d359d5bcb1293267fa4a2a29089b989ba1e521c618e16cab5683e082f785d654fac6617237be76b523969868b6110fa8b6d
+AUX gnatcoll-2016-gentoo.patch 14137 BLAKE2B 9e3c7086a4ecce79dbb7d2c21f5d97b46bf30c7665b416c0266ed59610886192b2931dde20b3ed605bdcfd5587125755acc229a1739ace97e1a6138a9a30710c SHA512 641da348023eedb141e555148056e591af09ef31954178c128a4627bff80777e3e274663bdc4ea712afc10cd902efb186a0bba9b03b7f67f6655944af83ff8d0
+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 2959 BLAKE2B 879163b9525d76c83e29bd6fb5077f9fc2bb296e9acd6a9390dee6da460be8ff821bfb617cbbb190590bf6a96db72d74aa523f012e4b990d252496753b63d09e SHA512 2ef7e10aa95aa7a5496af2c758ebd8073e6a13713789b0420a39f5a0cb4a72bdd5ec1f7ff51e63d42ff283ea928796d6185a448801e7afad09ea21a13380f6c7
+EBUILD gnatcoll-2017.ebuild 3056 BLAKE2B b1f3ea0230c59c1e568685cc5a3e24efffc9fd0854b95fcc97daf24fbafce1f7816bb633f28cc7222419aa8a97b804a175adea55cbf6018d0ac9ea4d03427abd SHA512 541c6bc787d5e68b017f74be394255e6c5a57bbd6fa2094b9a35e761e787ee3373e2d05e43888bc14690dfdc209add2d35be94ab46d68303d1b799de93f1e00f
+MISC metadata.xml 1473 BLAKE2B dbcae7c0fcf02880fec66bc055d318274499b05714b8065a792f5ff56bd2e4dacc59b77bf7d909495c58f9d667d6703fe8e7594b13993eb0808167ca8bc60d21 SHA512 43c44b85940e585406e90e856f83af23a605d69c3e52af16b17e22eb49de170422a4981c366f19f7554c68a67d4633da117c19eceb8824fa33a7f8e21316ddaa
diff --git a/dev-ada/gnatcoll/files/gnatcoll-2017-gentoo.patch b/dev-ada/gnatcoll/files/gnatcoll-2017-gentoo.patch
index 2c3efd2c29f0..ecec0b784589 100644
--- a/dev-ada/gnatcoll/files/gnatcoll-2017-gentoo.patch
+++ b/dev-ada/gnatcoll/files/gnatcoll-2017-gentoo.patch
@@ -222,3 +222,26 @@
     end Compiler;
  
     package Linker is
+--- gnatcoll-gpl-2017-src/src/gnatcoll-projects.ads.old	2017-11-25 14:50:06.919939453 +0100
++++ gnatcoll-gpl-2017-src/src/gnatcoll-projects.ads	2017-11-25 14:50:38.932387204 +0100
+@@ -1917,7 +1917,8 @@
+       Predefined_Source_Files : GNATCOLL.VFS.File_Array_Access;
+       --  The list of source files in Predefined_Source_Path
+ 
+-      Default_Gnatls : GNAT.Strings.String_Access := new String'("gnatls");
++      Default_Gnatls : GNAT.Strings.String_Access :=
++         new String'("@GNATLS@");
+       --  The default gnatls command to run.
+ 
+       Xrefs_Subdir : GNAT.Strings.String_Access;
+--- gnatcoll-gpl-2017-src/src/tools/gnatinspect.adb.old	2017-11-25 14:52:47.282170250 +0100
++++ gnatcoll-gpl-2017-src/src/tools/gnatinspect.adb	2017-11-25 14:52:57.691990254 +0100
+@@ -642,7 +642,7 @@
+       GNAT_Version : GNAT.Strings.String_Access;
+    begin
+       Env.Set_Path_From_Gnatls
+-        (Gnatls       => "gnatls",
++        (Gnatls       => "@GNATLS@",
+          GNAT_Version => GNAT_Version,
+          Errors       => Local_On_Error'Unrestricted_Access);
+       Free (GNAT_Version);
diff --git a/dev-ada/gnatcoll/gnatcoll-2017.ebuild b/dev-ada/gnatcoll/gnatcoll-2017.ebuild
index 1be618293414..2064ea175d36 100644
--- a/dev-ada/gnatcoll/gnatcoll-2017.ebuild
+++ b/dev-ada/gnatcoll/gnatcoll-2017.ebuild
@@ -18,12 +18,11 @@ KEYWORDS="~amd64"
 IUSE="gmp gnat_2016 gnat_2017 gtk iconv postgresql pygobject projects readline
 	+shared sqlite static syslog tools"
 
-RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
-	gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )
+RDEPEND="dev-lang/gnat-gpl:6.3.0
 	${PYTHON_DEPS}
 	gmp? ( dev-libs/gmp:* )
 	gtk? (
-		dev-ada/gtkada[gnat_2016=,gnat_2017=,shared?,static?]
+		dev-ada/gtkada[gnat_2017,shared?,static?]
 		dev-libs/atk
 		dev-libs/glib
 		x11-libs/cairo
@@ -35,31 +34,31 @@ RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
 	postgresql? ( dev-db/postgresql:* )
 	sqlite? ( dev-db/sqlite )
 	projects? (
-		>=dev-ada/gprbuild-2017[gnat_2016=,gnat_2017=,shared?,static?]
+		>=dev-ada/gprbuild-2017[gnat_2017,shared?,static?]
 	)"
 DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2016=,gnat_2017=]"
+	dev-ada/gprbuild[gnat_2017]"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	pygobject? ( gtk )
-	!gnat_2016 gnat_2017"
+	pygobject? ( gtk )"
 
 S="${WORKDIR}"/${MYP}-src
 
 PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
 
 src_prepare() {
+	GCC_PV=6.3.0
 	default
 	mv configure.{in,ac} || die
+	sed -i \
+		-e "s:@GNATLS@:gnatls-${GCC_PV}:g" \
+		src/gnatcoll-projects.ads \
+		src/tools/gnatinspect.adb \
+		|| die
 	eautoreconf
 }
 
 src_configure() {
-	if use gnat_2016; then
-		GCC_PV=4.9.4
-	else
-		GCC_PV=6.3.0
-	fi
 	GCC=${CHOST}-gcc-${GCC_PV}
 	GNATMAKE=${CHOST}-gnatmake-${GCC_PV}
 	GNATCHOP=${CHOST}-gnatchop-${GCC_PV}