[gentoo-commits] repo/gentoo:master commit in: dev-ada/libgpr/files/, dev-ada/libgpr/

["Alfredo Tupone" <tupone@gentoo.org>]

commit:     f36547f29d93befea05b73efaf2e05272a249539
Author:     Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  5 18:21:17 2019 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Thu Dec  5 18:21:17 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f36547f2

dev-ada/libgpr: forget patch

Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>

 ...libgpr-2018-gentoo.patch => libgpr-2019-gentoo.patch} | 16 ++++++++--------
 dev-ada/libgpr/libgpr-2019-r1.ebuild                     |  2 ++
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/dev-ada/libgpr/files/libgpr-2018-gentoo.patch b/dev-ada/libgpr/files/libgpr-2019-gentoo.patch
similarity index 59%
rename from dev-ada/libgpr/files/libgpr-2018-gentoo.patch
rename to dev-ada/libgpr/files/libgpr-2019-gentoo.patch
index 013a56b92e7..b7b9a2d3c87 100644
--- a/dev-ada/libgpr/files/libgpr-2018-gentoo.patch
+++ b/dev-ada/libgpr/files/libgpr-2019-gentoo.patch
@@ -1,5 +1,5 @@
---- gprbuild-gpl-2016-src/gpr/src/gpr-env.adb.old	2017-11-13 22:16:53.349083426 +0100
-+++ gprbuild-gpl-2016-src/gpr/src/gpr-env.adb	2017-11-13 22:17:22.692590351 +0100
+--- a/gpr/src/gpr-env.adb	2017-11-13 22:16:53.349083426 +0100
++++ b/gpr/src/gpr-env.adb	2017-11-13 22:17:22.692590351 +0100
 @@ -1948,6 +1948,8 @@
  
        end if;
@@ -9,8 +9,8 @@
        if Gpr_Prj_Path.all /= "" then
           Add_Directories (Self, Gpr_Prj_Path.all);
        end if;
---- gprbuild-gpl-2017-src/gpr/src/gpr-names.ads.old	2017-11-19 13:09:18.947527738 +0100
-+++ gprbuild-gpl-2017-src/gpr/src/gpr-names.ads	2017-11-19 13:10:08.125654595 +0100
+--- a/gpr/src/gpr-names.ads	2017-11-19 13:09:18.947527738 +0100
++++ b/gpr/src/gpr-names.ads	2017-11-19 13:10:08.125654595 +0100
 @@ -27,6 +27,8 @@
     Name_Buffer : String (1 .. 1_000_000);
     Name_Len    : Natural := 0;
@@ -20,8 +20,8 @@
     procedure Get_Name_String (Id : Name_Id);
     procedure Get_Name_String (Id : Unit_Name_Type);
     procedure Get_Name_String (Id : File_Name_Type);
---- gprbuild-gpl-2017-src/gpr/src/gpr-names.adb.old	2017-11-19 13:10:27.674316703 +0100
-+++ gprbuild-gpl-2017-src/gpr/src/gpr-names.adb	2017-11-19 13:14:38.360963627 +0100
+--- a/gpr/src/gpr-names.adb	2017-11-19 13:10:27.674316703 +0100
++++ b/gpr/src/gpr-names.adb	2017-11-19 13:14:38.360963627 +0100
 @@ -354,6 +354,8 @@
  
        Name_Chars.Append (ASCII.NUL);
@@ -40,8 +40,8 @@
        return Name_Entries.Last;
     end Name_Find;
  
---- gprbuild-gpl-2017-src/gpr/src/gpr-snames.adb.old	2017-11-19 13:12:41.592995718 +0100
-+++ gprbuild-gpl-2017-src/gpr/src/gpr-snames.adb	2017-11-19 13:16:31.980979696 +0100
+--- a/gpr/src/gpr-snames.adb	2017-11-19 13:12:41.592995718 +0100
++++ b/gpr/src/gpr-snames.adb	2017-11-19 13:16:31.980979696 +0100
 @@ -53,6 +53,10 @@
           return;
        end if;

diff --git a/dev-ada/libgpr/libgpr-2019-r1.ebuild b/dev-ada/libgpr/libgpr-2019-r1.ebuild
index 08adbdbfde3..7906a8d27d4 100644
--- a/dev-ada/libgpr/libgpr-2019-r1.ebuild
+++ b/dev-ada/libgpr/libgpr-2019-r1.ebuild
@@ -25,6 +25,8 @@ REQUIRED_USE="${ADA_REQUIRED_USE}"
 
 S="${WORKDIR}"/${MYP}-src
 
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
 src_configure() {
 	emake prefix="${D}"/usr setup
 }