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 A44A9139694 for ; Thu, 22 Jun 2017 20:00:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E0D7B234015; Thu, 22 Jun 2017 20:00:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AE25B234015 for ; Thu, 22 Jun 2017 20:00:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 B67DB34071C for ; Thu, 22 Jun 2017 20:00:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 668F92FA for ; Thu, 22 Jun 2017 20:00:00 +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: <1498161581.27440b1aa409e5471622a0ad0bbebbf97e7f79c8.tupone@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/gnat-gpl/files/, dev-lang/gnat-gpl/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/gnat-gpl/files/gnat-gpl.xml dev-lang/gnat-gpl/gnat-gpl-2016.ebuild dev-lang/gnat-gpl/gnat-gpl-2017.ebuild X-VCS-Directories: dev-lang/gnat-gpl/files/ dev-lang/gnat-gpl/ X-VCS-Committer: tupone X-VCS-Committer-Name: Alfredo Tupone X-VCS-Revision: 27440b1aa409e5471622a0ad0bbebbf97e7f79c8 X-VCS-Branch: master Date: Thu, 22 Jun 2017 20:00:00 +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: 0957cbe8-19c2-41da-962a-be0fe61c2a93 X-Archives-Hash: 76984528a5b5581d554994f02c6a46a9 commit: 27440b1aa409e5471622a0ad0bbebbf97e7f79c8 Author: Tupone Alfredo gentoo org> AuthorDate: Thu Jun 22 19:59:41 2017 +0000 Commit: Alfredo Tupone gentoo org> CommitDate: Thu Jun 22 19:59:41 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27440b1a dev-lang/gnat-gpl: Remove tool description file (to be put on gprbuild) Package-Manager: Portage-2.3.5, Repoman-2.3.1 dev-lang/gnat-gpl/files/gnat-gpl.xml | 94 ---------------------------------- dev-lang/gnat-gpl/gnat-gpl-2016.ebuild | 4 -- dev-lang/gnat-gpl/gnat-gpl-2017.ebuild | 4 -- 3 files changed, 102 deletions(-) diff --git a/dev-lang/gnat-gpl/files/gnat-gpl.xml b/dev-lang/gnat-gpl/files/gnat-gpl.xml deleted file mode 100644 index 7d321e03b6a..00000000000 --- a/dev-lang/gnat-gpl/files/gnat-gpl.xml +++ /dev/null @@ -1,94 +0,0 @@ - - - - GNAT-@VER@ - gnatmake-@VER@ - - ${PREFIX}gnatls-@VER@ -v --version - - - Ada - - ${PREFIX}gcc-@VER@ -v - - - - \.\./lib/gcc(-lib)?/$TARGET/$gcc_version/adalib/ - \.\./lib/gcc(-lib)?/$TARGET/$gcc_version/ada_object_path - \.\./lib/gcc(-lib)?/$TARGET/$gcc_version/rts-(.*)/adalib/ - \.\./$TARGET/lib/gnat/(.*)/adalib/ - - - ${PREFIX}gcc-@VER@ -dumpmachine - - - - - - - - - - package Naming is - for Spec_Suffix ("Ada") use ".ads"; - for Body_Suffix ("Ada") use ".adb"; - for Casing use "lowercase"; - for Dot_Replacement use "-"; - end Naming; - - 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") - & 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 " & - " (Body_File_Name => ""*%b""," & - " Casing => %c," & - " Dot_Replacement => ""%d"");"; - for Config_Spec_File_Name_Pattern ("Ada") use - "pragma Source_File_Name_Project " & - " (Spec_File_Name => ""*%s""," & - " Casing => %c," & - " Dot_Replacement => ""%d"");"; - for Config_File_Unique ("Ada") use "False"; - for PIC_Option ("Ada") use ("-fPIC"); - 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@"); - end Binder; - - package Clean is - for Source_Artifact_Extensions ("Ada") - use (".dg", ".rep", ".stdout", ".stderr"); - for Object_Artifact_Extensions ("Ada") use (".s", ".ci", ".gcno"); - end Clean; - - for Toolchain_Version ("Ada") use "GNAT ${VERSION(ada)}"; - for Runtime_Library_Dir ("Ada") use "${RUNTIME_DIR(ada)}/adalib/"; - for Runtime_Source_Dirs ("Ada") use ("${RUNTIME_DIR(ada)}/adainclude/"); - for Library_Encapsulated_Supported use "true"; - - - diff --git a/dev-lang/gnat-gpl/gnat-gpl-2016.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2016.ebuild index 5f8e52f2347..8ad45cb76a1 100644 --- a/dev-lang/gnat-gpl/gnat-gpl-2016.ebuild +++ b/dev-lang/gnat-gpl/gnat-gpl-2016.ebuild @@ -94,8 +94,6 @@ src_unpack() { } src_prepare() { - sed -e "s:@VER@:${TOOLCHAIN_GCC_PV}:g" "${FILESDIR}"/${PN}.xml > ${P}.xml - mv ../gnat-gpl-${PV}-src/src/ada gcc/ || die mv ../gcc-interface-${REL}-gpl-${PV}-src gcc/ada/gcc-interface || die @@ -153,8 +151,6 @@ src_compile() { } src_install() { - insinto /usr/share/gprconfig - doins ${P}.xml toolchain_src_install cd "${D}"${BINPATH} for x in gnat*; do diff --git a/dev-lang/gnat-gpl/gnat-gpl-2017.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2017.ebuild index 2dc7360a8d3..a050c6bba30 100644 --- a/dev-lang/gnat-gpl/gnat-gpl-2017.ebuild +++ b/dev-lang/gnat-gpl/gnat-gpl-2017.ebuild @@ -82,8 +82,6 @@ src_unpack() { } src_prepare() { - sed -e "s:@VER@:${TOOLCHAIN_GCC_PV}:g" "${FILESDIR}"/${PN}.xml > ${P}.xml - CC=${GCC} CXX="${gnatbase/gcc/g++}" GNATBIND="${gnatbase/gcc/gnatbind}" @@ -138,8 +136,6 @@ src_compile() { } src_install() { - insinto /usr/share/gprconfig - doins ${P}.xml toolchain_src_install cd "${D}"${BINPATH} for x in gnat*; do