gentoo resync : 24.12.2018

4 files changed, 73 insertions, 5 deletions

diff --git a/dev-ada/gnatcoll/Manifest b/dev-ada/gnatcoll/Manifest
index 11bd5f56b0ce..8e9585c2dcda 100644
--- a/dev-ada/gnatcoll/Manifest
+++ b/dev-ada/gnatcoll/Manifest
@@ -1,4 +1,4 @@
-AUX gnatcoll-2017-gentoo.patch 5731 BLAKE2B 392f9cd7f76b835c03646a52eb651bad4094f7ebb51f36a1168ce36b5ab9ff29f287437aa9fd9f2f1a5351f4ee04dbd3a21ea096f0e918d1c61b5822c14c552c SHA512 d15a05823419e763e96cc8d8c8202cac30511d555413fa9b45a79275b5325dda53271b7dbb2cc3a7d1583269b32738a82f3adcb0282bdee4588247c9e8b32e12
+AUX gnatcoll-2017-gentoo.patch 7843 BLAKE2B 1a7a7cc1bb1ad94f65fced28888c37acc3cc3711b0c488413313357551f3109e818f25eeba5fe25448f8362256ed5e8bccb6c5b67fe8195492d0e3b1e271f78b SHA512 d2eef0a5d4fecba7f081b97fc7c78efdb6dad76b492b1711e5c5d47b88ae621ca6826497668c9363ee16e36aaeb0e4978cc978c8688d3b346c3dd08b96a8537c
 DIST gnatcoll-gpl-2017-src.tar.gz 5785988 BLAKE2B 828aff797f7d992bf3f5dda7f8ce8a79e97ecd98253a657fb6e79a2fd08aac97e19cb421f47010f8c1f26442a013b9126ab3a95353d9ce0f29d071601e9dfe2f SHA512 e8b7f2c00816597f33496168bf8928841a2037e517908810761849e23633b2c229d47e4bfaa808e5a619da52bc165f17b8aefa5dee39ecf1a6773b3b1db80363
-EBUILD gnatcoll-2017.ebuild 3176 BLAKE2B b271efb01c404f10f97b247300d1157fc873ac60cd6abe335fb68c84de60bc16cf433da1b73a21cb1462d2219b550acf0e1e1282e749f4f3e6f7171f63fa0d44 SHA512 8a4a005d7bb43b15873744a2de1b19dbb6e318d257fab99429e36f181337b3bf9ab73f0e0b29d331a099549d50fc9e38f7192ecbd9338f85cc0af7230f1947da
-MISC metadata.xml 1362 BLAKE2B 0660675cc1821ffb20a9a80bce768db18252bf049f6f52cf3389a7681cc4a31b040350008e6477a2259c8faba5689525586cd35cdf4bcb9df298941021c5a0bd SHA512 64620ff6da6c812968ac057a3724b9733d4d14e1cacd654bf750efe33f64910ae74da07bbca0d6996f58405c083636e574f1b93958d0fe4447e1896ded2b3940
+EBUILD gnatcoll-2017.ebuild 3250 BLAKE2B d19995ce79c3a0ba473a5e05ca7b9693c5069bc4bad9c291678792e5db5905946adf465e25156c8d6428333c5c6f8d0794e541fa6da6f48f9129e45ee65b60f2 SHA512 6aaabb4e81fedbaa892c0e1c2ac03dbf16a43e2498fcd994b7d953463157df4562d5ef2ccae852edcc2576e46f23300bb0ec84ee10e5576bcfc04679a4a55246
+MISC metadata.xml 1438 BLAKE2B 29ae4896a6c86b1e7e507d4c9a91a553ae363633221762dae9e4e46e5c604e1b1c93ac663975c659e1f316a8affafad25c7c789dd0b528add09d1bfb40e623fb SHA512 919a5c34fcf3a0b55a5d90f8749f7983e7ef4b75ecf25fad33ceb8d335ebd799d203eb126ad99296bc5a838f3d117e48a41299d245ce88a35a1f602cbc81ebed
diff --git a/dev-ada/gnatcoll/files/gnatcoll-2017-gentoo.patch b/dev-ada/gnatcoll/files/gnatcoll-2017-gentoo.patch
index 36da82626f4c..f0ec53f368ea 100644
--- a/dev-ada/gnatcoll/files/gnatcoll-2017-gentoo.patch
+++ b/dev-ada/gnatcoll/files/gnatcoll-2017-gentoo.patch
@@ -142,3 +142,65 @@
           GNAT_Version => GNAT_Version,
           Errors       => Local_On_Error'Unrestricted_Access);
        Free (GNAT_Version);
+--- a/src/gnatcoll-projects.adb	2018-11-14 18:47:27.760365233 +0100
++++ b/src/gnatcoll-projects.adb	2018-11-14 19:10:43.961337201 +0100
+@@ -3273,9 +3273,9 @@
+       Status                   : out Status_Type;
+       Result                   : out GNATCOLL.VFS.File_Array_Access)
+    is
+-      Mains_Str_List : String_List_Access;
++      Mains_Str_List : String_Vectors.Vector;
+       Closure_Status : GPR.Util.Status_Type;
+-      Closures_List  : String_List_Access;
++      Closures_List  : String_Vectors.Vector;
+    begin
+       Trace (Me, "Get_Closures");
+ 
+@@ -3287,25 +3287,18 @@
+          return;
+       end if;
+ 
+-      Mains_Str_List := new String_List (Mains'First .. Mains'Last);
+       for I in Mains'Range loop
+-         Mains_Str_List (I) := new String'(Mains (I).Display_Base_Name);
++         Mains_Str_List.Append (Mains (I).Display_Base_Name);
+       end loop;
+ 
+       GPR.Util.Get_Closures
+         (Project.Get_View, Project.Tree_View,
+-         Mains                    => Mains_Str_List.all,
++         Mains                    => Mains_Str_List,
+          All_Projects             => All_Projects,
+          Include_Externally_Built => Include_Externally_Built,
+          Status                   => Closure_Status,
+          Result                   => Closures_List);
+ 
+-      --  Freeing temporary list of mains.
+-      for I in Mains_Str_List'Range loop
+-         Free (Mains_Str_List (I));
+-      end loop;
+-      Free (Mains_Str_List);
+-
+       case Closure_Status is
+          when Success =>
+             Status := Success;
+@@ -3321,17 +3314,10 @@
+       end case;
+ 
+       if Closure_Status in Success | Incomplete_Closure then
+-         for I in Closures_List'Range loop
+-            Append (Result, Create (+Closures_List (I).all));
++         for Closure of Closures_List loop
++            Append (Result, Create (+Closure));
+          end loop;
+       end if;
+-
+-      --  Freeing temporary list of closures.
+-      for I in Closures_List'Range loop
+-         Free (Closures_List (I));
+-      end loop;
+-      Free (Closures_List);
+-
+    end Get_Closures;
+ 
+    ----------------
diff --git a/dev-ada/gnatcoll/gnatcoll-2017.ebuild b/dev-ada/gnatcoll/gnatcoll-2017.ebuild
index 8790026af64c..f43af38da683 100644
--- a/dev-ada/gnatcoll/gnatcoll-2017.ebuild
+++ b/dev-ada/gnatcoll/gnatcoll-2017.ebuild
@@ -35,9 +35,12 @@ RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
 	postgres? ( dev-db/postgresql:* )
 	sqlite? ( dev-db/sqlite )
 	projects? (
-		~dev-ada/libgpr-2017[gnat_2016=,gnat_2017=,shared?,static-libs?]
+		~dev-ada/libgpr-2018[gnat_2016=,gnat_2017=,shared?,static-libs?]
 		dev-ada/xmlada[shared?,static-libs?]
-	)"
+	)
+	!dev-ada/gnatcoll-core
+	!dev-ada/gnatcoll-bindings
+	!dev-ada/gnatcoll-db"
 DEPEND="${RDEPEND}
 	dev-ada/gprbuild[gnat_2016=,gnat_2017=]"
 
diff --git a/dev-ada/gnatcoll/metadata.xml b/dev-ada/gnatcoll/metadata.xml
index df4d11fa0b3a..7ba8da900cc2 100644
--- a/dev-ada/gnatcoll/metadata.xml
+++ b/dev-ada/gnatcoll/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="project">
+		<email>ada@gentoo.org</email>
+	</maintainer>
 	<maintainer type="person">
 		<email>tupone@gentoo.org</email>
 		<name>Tupone Alfredo</name>