commit: f90c9a885acd4387e96a3ccdc784530ec81e101e
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Thu May 1 20:34:41 2025 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Thu May 1 21:18:36 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f90c9a88
dev-ada/gprconfig_kb: drop 24.0.0-r2
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
dev-ada/gprconfig_kb/Manifest | 1 -
.../files/gprconfig_kb-24.0.0-gentoo.patch | 129 ---------------------
dev-ada/gprconfig_kb/gprconfig_kb-24.0.0-r2.ebuild | 38 ------
3 files changed, 168 deletions(-)
diff --git a/dev-ada/gprconfig_kb/Manifest b/dev-ada/gprconfig_kb/Manifest
index 983450cc1dff..204f6a98c1b3 100644
--- a/dev-ada/gprconfig_kb/Manifest
+++ b/dev-ada/gprconfig_kb/Manifest
@@ -1,2 +1 @@
-DIST gprconfig_kb-24.0.0.tar.gz 43010 BLAKE2B
af246be2c5683655bf023e07b08539647d8a351f8f5d8eace77665980fca80855262028667a94b5d9ed9ebf2af16d061968822ef923505c7a4de6497baefa3d7
SHA512
1bd28b7eba57a8952635f3fb61e06278935c31ed196182e19e9e8c2ffa3edbccea5a9b97b3f5a3c820e7c3f5b6878d87f7b42d66a7f57e083d0b56cb91a6eb84
DIST gprconfig_kb-25.0.0.tar.gz 44165 BLAKE2B
e026f7f644dfd8ba4665fd22ef6cb5abcdb1013779a8119e1be3dc3313cca37af138e1a351f2fc8dd10780009d0d98e0ab60e73293ea508acbe4cd5a836bdb16
SHA512
afc1754efdf6e3cbff9752a182cd063f83965c6a13e53930a14f806a46e3cbfb0afed8f8e11b098986227f27a1a67b45d22369adaa39a5dc1f2a8cc494f789e8
diff --git a/dev-ada/gprconfig_kb/files/gprconfig_kb-24.0.0-gentoo.patch
b/dev-ada/gprconfig_kb/files/gprconfig_kb-24.0.0-gentoo.patch
deleted file mode 100644
index 989ed3138ae5..000000000000
--- a/dev-ada/gprconfig_kb/files/gprconfig_kb-24.0.0-gentoo.patch
+++ /dev/null
@@ -1,129 +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,7 +20,7 @@
- <!-- GCC 3.x & 4.x (not for GNAT Pro)-->
- <compiler_description>
- <name>GCC</name>
-- <executable
prefix="1">(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-linux-gnu-|.*mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-)?gcc(-\d+)?</executable>
-+ <executable
prefix="1">(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-linux-gnu-|.*mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-)?gcc-@VER@</executable>
- <version>
- <external>$EXEC -v</external>
- <nogrep regexp="for GNAT Pro"></nogrep>
-@@ -189,18 +189,18 @@
- -->
- <compiler_description>
- <name>GNAT</name>
-- <executable
prefix="1">(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-linux-gnu-|.*mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|.*-fastos.*|.*-qnx.*|.*-rtems.*)?gnatls</executable>
-+ <executable
prefix="1">(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-linux-gnu-|.*mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|.*-fastos.*|.*-qnx.*|.*-rtems.*)?gnatls-@VER@</executable>
- <version>
-- <external>${PREFIX}gnatls -v --version</external>
-+ <external>${EXEC} -v --version</external>
- <grep regexp="^GNATLS.+?(\d+(\.\d+)?)" group="1"></grep>
- </version>
- <languages>Ada</languages>
- <variable name="gcc_version">
-- <external>${PREFIX}gcc -v</external>
-+ <external>${PREFIX}gcc-@VER@ -v</external>
- <grep regexp="^[-\w]*gcc \S+ (\S+)" group="1"></grep>
- </variable>
- <variable name="gcc_version_major">
-- <external>${PREFIX}gcc -v</external>
-+ <external>${PREFIX}gcc-@VER@ -v</external>
- <grep regexp="^[-\w]*gcc \S+ (\d+)\.\d+\.\d+" group="1"></grep>
- </variable>
- <runtimes default="default,kernel,native">
-@@ -210,7 +210,7 @@
- <directory group="2"
>\.\./$TARGET/lib(32|64)?/gnat/(.*)/adalib/</directory>
- </runtimes>
- <target>
-- <external>${PREFIX}gcc -dumpmachine</external>
-+ <external>${PREFIX}gcc-@VER@ -dumpmachine</external>
- <grep regexp="[^\r\n]+"></grep>
- </target>
- </compiler_description>
-@@ -302,7 +302,7 @@
- <!-- Generic C compiler for LLVM -->
- <compiler_description>
- <name>C_LLVM</name>
-- <executable>clang</executable>
-+ <executable>fake-clang</executable>
- <version>
- <external>clang --version</external>
-
---- a/db/gnat.xml 2019-06-01 21:53:53.383281607 +0200
-+++ b/db/gnat.xml 2019-06-01 21:57:08.414196529 +0200
-@@ -10,7 +10,7 @@
- &filter_gnat;
- <config>
- 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
-@@ -27,6 +27,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
-@@ -25,7 +25,7 @@
- </compilers>
- <config>
- package Compiler is
-- for Driver ("C") use "${PATH(c)}${PREFIX(c)}gcc";
-+ for Driver ("C") use "${PATH(c)}${PREFIX(c)}gcc-@VER@";
- end Compiler;
- </config>
- </configuration>
---- 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 @@
- <host name="^i686.*-linux.*$" />
- </hosts>
- <config>
-- 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=";
-@@ -917,7 +921,8 @@
- <host name="^x86_64-.*linux.*" />
- </hosts>
- <config>
-- 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";
-@@ -1274,7 +1279,7 @@
- </targets>
- <config>
- for Library_Partial_Linker use
-- ("${PATH(ada)}${PREFIX(ada)}gcc", "-nostdlib")
-+ ("${PATH(ada)}${PREFIX(ada)}gcc-@VER@", "-nostdlib")
- & GCC_No_Pie
- & ("-Wl,-r", "-o");
- </config>
-@@ -1295,7 +1300,7 @@
- </targets>
- <config>
- for Library_Partial_Linker use
-- ("${PATH(c)}${PREFIX(c)}gcc", "-nostdlib")
-+ ("${PATH(c)}${PREFIX(c)}gcc-@VER@", "-nostdlib")
- & GCC_No_Pie
- & ("-Wl,-r", "-o");
- </config>
diff --git a/dev-ada/gprconfig_kb/gprconfig_kb-24.0.0-r2.ebuild
b/dev-ada/gprconfig_kb/gprconfig_kb-24.0.0-r2.ebuild
deleted file mode 100644
index a40f529179e4..000000000000
--- a/dev-ada/gprconfig_kb/gprconfig_kb-24.0.0-r2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ADA_COMPAT=( gcc_12 gcc_13 gcc_14 )
-
-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"
-
-REQUIRED_USE="${ADA_REQUIRED_USE}"
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_prepare() {
- default
-
- sed -i \
- -e "s:@VER@:${GCCPV}: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
-}
