From 73e2e0d1f99847b89f50f016da7d58b34c155585 Mon Sep 17 00:00:00 2001 From: Alfredo Tupone Date: Thu, 2 Feb 2023 09:09:32 +0100 Subject: dev-ada/gprconfig_kb: drop 22.0.0-r1 Signed-off-by: Alfredo Tupone --- dev-ada/gprconfig_kb/Manifest | 1 - .../files/gprconfig_kb-22.0.0-gentoo.patch | 143 --------------------- dev-ada/gprconfig_kb/gprconfig_kb-22.0.0-r1.ebuild | 42 ------ 3 files changed, 186 deletions(-) delete mode 100644 dev-ada/gprconfig_kb/files/gprconfig_kb-22.0.0-gentoo.patch delete mode 100644 dev-ada/gprconfig_kb/gprconfig_kb-22.0.0-r1.ebuild (limited to 'dev-ada') diff --git a/dev-ada/gprconfig_kb/Manifest b/dev-ada/gprconfig_kb/Manifest index 19eab18841be..a8bcf4bc60e1 100644 --- a/dev-ada/gprconfig_kb/Manifest +++ b/dev-ada/gprconfig_kb/Manifest @@ -1,2 +1 @@ -DIST gprconfig_kb-22.0.0.tar.gz 40598 BLAKE2B c0b18078ac3384de9bb503f78a1bb39a486b5ae899ad1ab135fa05da414eb6a55b5b7156bb4fc60a34c0d085b33af13ef2e0ec46840ad43ca63c387863ae6eac SHA512 69f8490af56b0e07afbfef51c12cd6361a00327af774cd0deacf8260ccc4782e1e8465a074e8a025024570ce43ba1b4b3adfbde9ae4ea372e487d342da6994d4 DIST gprconfig_kb-23.0.0.tar.gz 42132 BLAKE2B ed39c8f199e0cd31dbd3b587bcf589d62befc29ab907c54d9bcbc08887239a5ce12bc22428631e32d8c69c0c6bdd01e4591d050f480ea461f4d8af0f1cc05288 SHA512 505b632ff744c8fbb75b72d0f406a88a2c675d5afead9f0f8ca282ae79ca4e38c174dfe424c4c4a55835a9ebdbc6d0a2f329592bd6dfb87d5493e8473a0b2376 diff --git a/dev-ada/gprconfig_kb/files/gprconfig_kb-22.0.0-gentoo.patch b/dev-ada/gprconfig_kb/files/gprconfig_kb-22.0.0-gentoo.patch deleted file mode 100644 index ab3d0f9367f7..000000000000 --- a/dev-ada/gprconfig_kb/files/gprconfig_kb-22.0.0-gentoo.patch +++ /dev/null @@ -1,143 +0,0 @@ ---- a/db/compilers.xml 2019-06-01 21:29:57.611722804 +0200 -+++ b/db/compilers.xml 2019-06-01 21:42:56.000608601 +0200 -@@ -20,15 +20,15 @@ - - - GCC -- (.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-generic-linux-gnu-|.*mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|aarch64-linux-gnu-)?gcc -+ (.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-generic-linux-gnu-|.*mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|aarch64-linux-gnu-|.*pc-linux-gnu-)?gcc-@VER@ - -- ${PREFIX}gcc -v -+ ${EXEC} -v - - - - C - -- ${PREFIX}gcc -dumpmachine -+ ${EXEC} -dumpmachine - - - -@@ -185,14 +185,14 @@ - --> - - GNAT -- (.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-generic-linux-gnu-|.*mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|aarch64-linux-gnu-|.*-qnx.*|.*-rtems.*)?gnatls -+ (.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-generic-linux-gnu-|.*mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|aarch64-linux-gnu-|.*-qnx.*|.*-rtems.*|.*pc-linux-gnu-)?gnatls-@VER@ - -- ${PREFIX}gnatls -v --version -+ ${EXEC} -v --version - - - Ada - -- ${PREFIX}gcc -v -+ ${PREFIX}gcc-@VER@ -v - - - -@@ -202,7 +202,7 @@ - \.\./$TARGET/lib/gnat/(.*)/adalib/ - - -- ${PREFIX}gcc -dumpmachine -+ ${PREFIX}gcc-@VER@ -dumpmachine - - - -@@ -254,7 +254,7 @@ - - - C_LLVM -- clang -+ fake-clang - - clang --version - -@@ -424,7 +424,7 @@ - - - LLVM -- clang -+ fake-clang - - clang -v - ---- a/db/gnat.xml 2019-06-01 21:53:53.383281607 +0200 -+++ b/db/gnat.xml 2019-06-01 21:57:08.414196529 +0200 -@@ -60,7 +60,7 @@ - &filter_gnat; - - package Compiler is -- for Driver ("Ada") use "${PATH(ada)}${PREFIX(ada)}gcc"; -+ 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 -@@ -77,6 +77,9 @@ - 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=${PREFIX(ada)}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)}"; ---- a/db/c.xml 2019-06-01 21:57:36.244755708 +0200 -+++ b/db/c.xml 2019-06-01 21:59:14.919191663 +0200 -@@ -14,7 +14,7 @@ - - - package Compiler is -- for Driver ("C") use "${PATH(c)}${PREFIX(c)}gcc"; -+ for Driver ("C") use "${PATH(c)}${PREFIX(c)}gcc-@VER@"; - end Compiler; - - ---- a/db/linker.xml 2021-12-21 22:36:01.054738486 +0100 -+++ b/db/linker.xml 2021-12-21 22:36:59.973738600 +0100 -@@ -128,9 +128,13 @@ - - - -- for Object_Lister use ("nm", "-g"); -+ NM := External("NM", "nm"); -+ for Object_Lister use (NM, "-g"); - for Object_Lister_Matcher use " [TDRB] (.*)"; - -+ LDFLAGS := External_As_List ("LDFLAGS", " "); -+ for Leading_Library_Options use LDFLAGS; -+ - package Linker is - for Export_File_Format use "GNU"; - for Export_File_Switch use "-Wl,--version-script="; -@@ -877,7 +877,8 @@ - - - -- for Archive_Builder use ("ar", "cr"); -+ AR := External("AR", "ar"); -+ for Archive_Builder use (AR, "cr"); - for Archive_Builder_Append_Option use ("q"); - for Archive_Indexer use ("ranlib"); - for Archive_Suffix use ".a"; -@@ -1211,7 +1211,7 @@ - - - for Library_Partial_Linker use -- ("${PATH(ada)}${PREFIX(ada)}gcc", "-nostdlib") -+ ("${PATH(ada)}${PREFIX(ada)}gcc-@VER@", "-nostdlib") - & GCC_No_Pie - & ("-Wl,-r", "-o"); - -@@ -1232,7 +1232,7 @@ - - - for Library_Partial_Linker use -- ("${PATH(c)}${PREFIX(c)}gcc", "-nostdlib") -+ ("${PATH(c)}${PREFIX(c)}gcc-@VER@", "-nostdlib") - & GCC_No_Pie - & ("-Wl,-r", "-o"); - diff --git a/dev-ada/gprconfig_kb/gprconfig_kb-22.0.0-r1.ebuild b/dev-ada/gprconfig_kb/gprconfig_kb-22.0.0-r1.ebuild deleted file mode 100644 index 5b32df495830..000000000000 --- a/dev-ada/gprconfig_kb/gprconfig_kb-22.0.0-r1.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ADA_COMPAT=( gnat_2021 gcc_12_2_0 ) - -inherit ada - -DESCRIPTION="GPR configuration knowledge base" -HOMEPAGE="https://www.adacore.com/" -SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz - -> ${P}.tar.gz" -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -RDEPEND="!=dev-ada/gprbuild-2021*" - -REQUIRED_USE="${ADA_REQUIRED_USE}" -PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) - -src_prepare() { - default - - sed -i \ - -e "s:@VER@:${GCC_PV}:g" \ - -e "s:\$gcc_version:${GCC_PV}:g" \ - db/compilers.xml \ - db/gnat.xml \ - db/c.xml \ - db/linker.xml \ - || die -} - -src_install() { - insinto /usr/share/gprconfig - doins db/*.xml - doins db/*.ent - einstalldocs -} -- cgit v1.2.3-65-gdbad