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

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

commit:     9670f34afab1041f619dec6fee99865f9a0cfe1b
Author:     Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 12 07:01:13 2018 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Fri Oct 12 07:01:13 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9670f34a

dev-ada/gprbuild: Remove duplicate file

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

 dev-ada/gprbuild/files/gprbuild-2018.xml | 85 --------------------------------
 dev-ada/gprbuild/gprbuild-2018.ebuild    |  4 +-
 2 files changed, 2 insertions(+), 87 deletions(-)

diff --git a/dev-ada/gprbuild/files/gprbuild-2018.xml b/dev-ada/gprbuild/files/gprbuild-2018.xml
deleted file mode 100644
index 9e1e47b512e..00000000000
--- a/dev-ada/gprbuild/files/gprbuild-2018.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" ?>
-<gprconfig>
-  <compiler_description>
-    <name>GNAT-@VER@</name>
-    <executable prefix="1">gnatls-@VER@</executable>
-    <version>
-      <external>${PREFIX}gnatls-@VER@ -v --version</external>
-      <grep regexp="^GNATLS.+?(\d+(\.\d+)?)" group="1"></grep>
-    </version>
-    <languages>Ada</languages>
-    <variable name="gcc_version">
-      <external>${PREFIX}gcc-@VER@ -v</external>
-      <grep regexp="^[-\w]*gcc \S+ (\S+)" group="1"></grep>
-    </variable>
-    <runtimes default="default,kernel,native">
-       <directory group="default" >\.\./lib/gcc(-lib)?/$TARGET/$gcc_version/adalib/</directory>
-       <directory group="default" contents="^rts-">\.\./lib/gcc(-lib)?/$TARGET/$gcc_version/ada_object_path</directory>
-       <directory group="2" >\.\./lib/gcc(-lib)?/$TARGET/$gcc_version/rts-(.*)/adalib/</directory>
-       <directory group="1" >\.\./$TARGET/lib/gnat/(.*)/adalib/</directory>
-    </runtimes>
-    <target>
-      <external>${PREFIX}gcc-@VER@ -dumpmachine</external>
-      <grep regexp="[^\r\n]+"></grep>
-    </target>
-  </compiler_description>
-
-  <configuration>
-    <compilers>
-      <compiler name="GNAT-@VER@" />
-    </compilers>
-   <config>
-   package Compiler is
-      for Driver                   ("Ada") use "${PATH(ada)}${PREFIX(ada)}gcc-@VER@";
-      for Language_Kind            ("Ada") use "unit_based";
-      for Dependency_Kind          ("Ada") use "ALI_File";
-      for Leading_Required_Switches        ("Ada") use
-	  ("-c", "-x", "ada", "-gnatA")
-             &amp; Compiler'Leading_Required_Switches ("Ada");
-      for Mapping_File_Switches    ("Ada") use ("-gnatem=");
-      for Mapping_Spec_Suffix      ("Ada") use "%s";
-      for Mapping_Body_Suffix      ("Ada") use "%b";
-      for Config_File_Switches     ("Ada") use ("-gnatec=");
-      for Include_Path_File     ("Ada") use "ADA_PRJ_INCLUDE_FILE";
-      for Multi_Unit_Switches ("Ada") use ("-gnateI");
-      for Multi_Unit_Object_Separator ("Ada") use "~";
-      for Config_Body_File_Name ("Ada") use
-           "pragma Source_File_Name_Project (%u, Body_File_Name => ""%f"");";
-      for Config_Spec_File_Name ("Ada") use
-           "pragma Source_File_Name_Project (%u, Spec_File_Name => ""%f"");";
-      for Config_Body_File_Name_Index ("Ada") use
-           "pragma Source_File_Name_Project (%u, Body_File_Name => ""%f"", Index => %i);";
-      for Config_Spec_File_Name_Index ("Ada") use
-           "pragma Source_File_Name_Project (%u, Spec_File_Name => ""%f"", Index => %i);";
-      for Config_Body_File_Name_Pattern ("Ada") use
-           "pragma Source_File_Name_Project " &amp;
-           "  (Body_File_Name  => ""*%b""," &amp;
-           "   Casing          => %c," &amp;
-           "   Dot_Replacement => ""%d"");";
-      for Config_Spec_File_Name_Pattern ("Ada") use
-           "pragma Source_File_Name_Project " &amp;
-           "  (Spec_File_Name  => ""*%s""," &amp;
-           "   Casing          => %c," &amp;
-           "   Dot_Replacement => ""%d"");";
-      for Config_File_Unique    ("Ada") use "False";
-      for PIC_Option      ("Ada") use ("-fPIC");
-      for Leading_Required_Switches ("Ada") use
-        Compiler'Leading_Required_Switches ("Ada") &amp; ("--RTS=${RUNTIME_DIR(ada)}");
-   end Compiler;
-
-   package Binder is
-      for Objects_Path_File     ("Ada") use "ADA_PRJ_OBJECTS_FILE";
-      for Driver         ("Ada") use
-          "${GPRCONFIG_PREFIX}libexec/gprbuild/gprbind";
-      for Switches ("Ada") use ("--gnatbind_path=gnatbind-@VER@");
-      for Required_Switches ("Ada") use
-        Binder'Required_Switches ("Ada") &amp; ("--RTS=${RUNTIME_DIR(ada)}");
-   end Binder;
-
-   for Toolchain_Version ("Ada") use "GNAT ${VERSION(ada)}";
-
-for Runtime_Dir       ("Ada") use "${RUNTIME_DIR(ada)}";
-   for Library_Encapsulated_Supported use "true";
-   </config>
-  </configuration>
-</gprconfig>

diff --git a/dev-ada/gprbuild/gprbuild-2018.ebuild b/dev-ada/gprbuild/gprbuild-2018.ebuild
index 95d0bdafd85..3d3b6f41c7d 100644
--- a/dev-ada/gprbuild/gprbuild-2018.ebuild
+++ b/dev-ada/gprbuild/gprbuild-2018.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -37,7 +37,7 @@ src_prepare() {
 	else
 		GCC_PV=7.3.1
 	fi
-	sed -e "s:@VER@:${GCC_PV}:g" "${FILESDIR}"/${P}.xml > gnat-${GCC_PV}.xml
+	sed -e "s:@VER@:${GCC_PV}:g" "${FILESDIR}"/${PN}-2017.xml > gnat-${GCC_PV}.xml
 	default
 	sed -i \
 		-e "s:@GNATBIND@:gnatbind-${GCC_PV}:g" \