From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3419B139084 for ; Sat, 25 Nov 2017 17:43:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A1627E0C5C; Sat, 25 Nov 2017 17:43:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6FA6CE0C5C for ; Sat, 25 Nov 2017 17:43:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 71AFD33BEAC for ; Sat, 25 Nov 2017 17:43:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1A5D4A746 for ; Sat, 25 Nov 2017 17:43:31 +0000 (UTC) From: "Alfredo Tupone" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alfredo Tupone" Message-ID: <1511631800.f30c0458b4db445c583e89f50f284742f6298148.tupone@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ada/gps/files/, dev-ada/gps/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ada/gps/files/gps-2017-gentoo.patch dev-ada/gps/gps-2017.ebuild X-VCS-Directories: dev-ada/gps/ dev-ada/gps/files/ X-VCS-Committer: tupone X-VCS-Committer-Name: Alfredo Tupone X-VCS-Revision: f30c0458b4db445c583e89f50f284742f6298148 X-VCS-Branch: master Date: Sat, 25 Nov 2017 17:43:31 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: ef4e4af9-39f1-41ad-8a5b-6d88c9971ab1 X-Archives-Hash: 82b6fc132cd59ae746ef77d9d88af293 commit: f30c0458b4db445c583e89f50f284742f6298148 Author: Tupone Alfredo gentoo org> AuthorDate: Sat Nov 25 17:43:20 2017 +0000 Commit: Alfredo Tupone gentoo org> CommitDate: Sat Nov 25 17:43:20 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f30c0458 dev-ada/gps: Fix names for gnat/gnatls/gnatmake Package-Manager: Portage-2.3.13, Repoman-2.3.3 dev-ada/gps/files/gps-2017-gentoo.patch | 131 ++++++++++++++++++++++++++++++++ dev-ada/gps/gps-2017.ebuild | 6 ++ 2 files changed, 137 insertions(+) diff --git a/dev-ada/gps/files/gps-2017-gentoo.patch b/dev-ada/gps/files/gps-2017-gentoo.patch index 4fe39ea239f..e6ff1453189 100644 --- a/dev-ada/gps/files/gps-2017-gentoo.patch +++ b/dev-ada/gps/files/gps-2017-gentoo.patch @@ -163,3 +163,134 @@ docdir = $(prefix)/share/doc/gps sharedir = $(prefix)/share/gps +--- gps-gpl-2017-src/share/support/core/gnat_help_menus.py.old 2017-11-23 21:41:11.897912345 +0100 ++++ gps-gpl-2017-src/share/support/core/gnat_help_menus.py 2017-11-23 21:44:53.019038030 +0100 +@@ -25,7 +25,7 @@ + # GPRbuild + 'gprbuild': {"GPR Tools User's Guide": + ('gprbuild/html/gprbuild_ug.html', 'GPR/')}, +- 'gnatls': { ++ '@GNATLS@': { + # Ada RMs + "Ada 2005 Reference Manual": ('gnat/html/arm05.html', 'Ada/'), + "Ada 2012 Reference Manual": ('gnat/html/arm12.html', 'Ada/'), +@@ -86,8 +86,8 @@ + + for exec_name in _DOC_ENTRIES.keys(): + executable = exec_name +- if exec_name == 'gnatls' and GPS.get_target(): +- executable = '{}-gnatls'.format(GPS.get_target()) ++ if exec_name == '@GNATLS@' and GPS.get_target(): ++ executable = '{}-@GNATLS@'.format(GPS.get_target()) + ex = os_utils.locate_exec_on_path(executable) + if ex: + for descr, tup in _DOC_ENTRIES[exec_name].iteritems(): +--- gps-gpl-2017-src/share/support/core/toolchains.py.old 2017-11-23 21:46:11.969652447 +0100 ++++ gps-gpl-2017-src/share/support/core/toolchains.py 2017-11-23 21:47:21.723427305 +0100 +@@ -16,11 +16,11 @@ + nullified by using an empty value in the corresponding tag + --> + +- gnat +- gnatls ++ @GNAT@ ++ @GNATLS@ + gdb + c++filt +- gnatmake ++ @GNATMAKE@ + gcc + g++ + gcc +--- gps-gpl-2017-src/share/support/core/projects.py.old 2017-11-23 21:49:13.477462632 +0100 ++++ gps-gpl-2017-src/share/support/core/projects.py 2017-11-23 21:51:53.774640693 +0100 +@@ -143,7 +143,7 @@ + + + +- gnatmake ++ @GNATMAKE@ + + + +@@ -163,7 +163,7 @@ + description="The gnatls command used to find where the Ada run time files are installed (including optional arguments, e.g. gnatls --RTS=sjlj)." + hide_in="all" + label="Gnatls"> +- gnatls ++ @GNATLS@ + + + +@@ -175,7 +175,7 @@ + description="The gnat driver used to run the various commands associated with the GNAT toolchain." + hide_in="all" + label="Gnat"> +- gnat ++ @GNAT@ + + + +--- gps-gpl-2017-src/cli/src/gps-cli_utils.adb.old 2017-11-23 22:00:22.716652753 +0100 ++++ gps-gpl-2017-src/cli/src/gps-cli_utils.adb 2017-11-23 22:01:19.885640611 +0100 +@@ -166,7 +166,7 @@ + + -- Set GNAT version + Kernel.Registry.Environment.Set_Path_From_Gnatls +- ("gnatls", GNAT_Version); ++ ("@GNATLS@", GNAT_Version); + end Create_Kernel_Context; + + ---------------------------- +--- gps-gpl-2017-src/toolchains_editor/core/src/toolchains.adb.old 2017-11-23 22:02:52.819994229 +0100 ++++ gps-gpl-2017-src/toolchains_editor/core/src/toolchains.adb 2017-11-23 22:07:20.326248295 +0100 +@@ -309,12 +309,12 @@ + else + Set_Command + (Tc, GNAT_Driver, +- To_String (Full_Path) & "gnat", ++ To_String (Full_Path) & "@GNAT@", + From_Default, + Is_Default_Path); + Set_Command + (Tc, GNAT_List, +- To_String (Full_Path) & "gnatls", ++ To_String (Full_Path) & "@GNATLS@", + From_Default, + Is_Default_Path); + Set_Command +@@ -728,10 +728,10 @@ + begin + case Name is + when GNAT_List => +- return "gnatls"; ++ return "@GNATLS@"; + + when GNAT_Driver => +- return "gnat"; ++ return "@GNAT@"; + + when Debugger => + return "gdb"; +@@ -2000,15 +2000,18 @@ + Manager => Toolchain_Manager (Manager), + Refs => 0); + +- Set_Command (Native_Toolchain, GNAT_Driver, "gnat", From_Default, True); +- Set_Command (Native_Toolchain, GNAT_List, "gnatls", From_Default, True); ++ Set_Command (Native_Toolchain, GNAT_Driver, "@GNAT@", From_Default, ++ True); ++ Set_Command (Native_Toolchain, GNAT_List, "@GNATLS@", From_Default, ++ True); + Set_Command (Native_Toolchain, Debugger, "gdb", From_Default, True); + Set_Command (Native_Toolchain, CPP_Filt, "c++filt", From_Default, True); + + Compute_Predefined_Paths (Native_Toolchain); + + if Get_Compiler (Native_Toolchain, "Ada") = No_Compiler then +- Add_Compiler (Native_Toolchain, "Ada", "gnatmake", From_Default); ++ Add_Compiler (Native_Toolchain, "Ada", "@GNATMAKE@", ++ From_Default); + end if; + + if Get_Compiler (Native_Toolchain, "C") = No_Compiler then diff --git a/dev-ada/gps/gps-2017.ebuild b/dev-ada/gps/gps-2017.ebuild index 8741b915152..b346b351549 100644 --- a/dev-ada/gps/gps-2017.ebuild +++ b/dev-ada/gps/gps-2017.ebuild @@ -43,7 +43,13 @@ src_prepare() { sed -i \ -e "s:@GNATMAKE@:gnatmake-${GCC_PV}:g" \ -e "s:@GNAT@:gnat-${GCC_PV}:g" \ + -e "s:@GNATLS@:gnatls-${GCC_PV}:g" \ aclocal.m4 \ + share/support/core/gnat_help_menus.py \ + share/support/core/toolchains.py \ + share/support/core/projects.py \ + cli/src/gps-cli_utils.adb \ + toolchains_editor/core/src/toolchains.adb \ || die eautoreconf }