commit: 7a7f23ac779030145a23fa786c43f0b0790f5879
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 7 19:53:26 2018 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Wed Nov 7 19:53:26 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a7f23ac
dev-ada/gprbuild: Stabilize and remove old
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
dev-ada/gprbuild/files/gprbuild-2017.xml | 85 --------------------------------
dev-ada/gprbuild/gprbuild-2017-r1.ebuild | 2 +-
dev-ada/gprbuild/gprbuild-2017.ebuild | 81 ------------------------------
dev-ada/gprbuild/gprbuild-2018-r3.ebuild | 2 +-
4 files changed, 2 insertions(+), 168 deletions(-)
diff --git a/dev-ada/gprbuild/files/gprbuild-2017.xml
b/dev-ada/gprbuild/files/gprbuild-2017.xml
deleted file mode 100644
index 9e1e47b512e..00000000000
--- a/dev-ada/gprbuild/files/gprbuild-2017.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")
- & 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");
- for Leading_Required_Switches ("Ada") use
- Compiler'Leading_Required_Switches ("Ada") &
("--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") & ("--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-2017-r1.ebuild
b/dev-ada/gprbuild/gprbuild-2017-r1.ebuild
index 1f443284e87..df5101ac4bf 100644
--- a/dev-ada/gprbuild/gprbuild-2017-r1.ebuild
+++ b/dev-ada/gprbuild/gprbuild-2017-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
-> xmlada-gpl-${PV}-src.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="gnat_2016 +gnat_2017 gnat_2018"
DEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
diff --git a/dev-ada/gprbuild/gprbuild-2017.ebuild
b/dev-ada/gprbuild/gprbuild-2017.ebuild
deleted file mode 100644
index a8b5614d423..00000000000
--- a/dev-ada/gprbuild/gprbuild-2017.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs multiprocessing
-
-MYP=${PN}-gpl-${PV}
-
-DESCRIPTION="Multi-Language Management"
-HOMEPAGE="http://libre.adacore.com/";
-SRC_URI="
- http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deecff7
- -> ${MYP}-src.tar.gz
- http://mirrors.cdn.adacore.com/art/591aeb88c7a4473fcbb154f8
- -> xmlada-gpl-${PV}-src.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gnat_2016 +gnat_2017"
-
-DEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
- gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MYP}-src
-
-REQUIRED_USE="^^ ( gnat_2016 gnat_2017 )"
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_prepare() {
- if use gnat_2016; then
- GCC_PV=4.9.4
- else
- GCC_PV=6.3.0
- fi
- sed -e "s:@VER@:${GCC_PV}:g" "${FILESDIR}"/${P}.xml > gnat-${GCC_PV}.xml
- default
- sed -i \
- -e "s:@GNATBIND@:gnatbind-${GCC_PV}:g" \
- src/gprlib.adb \
- || die
-}
-
-src_configure() {
- emake prefix="${D}"usr setup
-}
-
-bin_progs="gprbuild gprconfig gprclean gprinstall gprname gprls"
-lib_progs="gprlib gprbind"
-
-src_compile() {
- GCC=${CHOST}-gcc-${GCC_PV}
- GNATMAKE=${CHOST}-gnatmake-${GCC_PV}
- local xmlada_src="../xmlada-gpl-${PV}-src"
- incflags="-Isrc -Igpr/src -I${xmlada_src}/sax -I${xmlada_src}/dom \
- -I${xmlada_src}/schema -I${xmlada_src}/unicode \
- -I${xmlada_src}/input_sources"
- ${GCC} -c ${CFLAGS} gpr/src/gpr_imports.c -o gpr_imports.o || die
- for bin in ${bin_progs}; do
- ${GNATMAKE} -j$(makeopts_jobs) ${incflags} $ADAFLAGS
${bin}-main \
- -o ${bin} -largs gpr_imports.o || die
- done
- for lib in $lib_progs; do
- ${GNATMAKE} -j$(makeopts_jobs) ${incflags} ${lib} $ADAFLAGS \
- -largs gpr_imports.o || die
- done
-}
-
-src_install() {
- dobin ${bin_progs}
- exeinto /usr/libexec/gprbuild
- doexe ${lib_progs}
- insinto /usr/share/gprconfig
- doins share/gprconfig/*
- insinto /usr/share/gpr
- doins share/_default.gpr
- insinto /usr/share/gprconfig
- doins gnat-${GCC_PV}.xml
- einstalldocs
-}
diff --git a/dev-ada/gprbuild/gprbuild-2018-r3.ebuild
b/dev-ada/gprbuild/gprbuild-2018-r3.ebuild
index 91e3da95792..719ce8ae472 100644
--- a/dev-ada/gprbuild/gprbuild-2018-r3.ebuild
+++ b/dev-ada/gprbuild/gprbuild-2018-r3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
-> xmlada-gpl-${PV}-src.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="gnat_2016 gnat_2017 +gnat_2018"
DEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
