From 5a1e5a6812ca9c9555657cce48fe09d2ffa44401 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 2 Dec 2022 08:55:38 +0000 Subject: gentoo auto-resync : 02:12:2022 - 08:55:37 --- dev-ada/Manifest.gz | Bin 3736 -> 3739 bytes dev-ada/gprconfig_kb/Manifest | 4 +- .../files/gprconfig_kb-22.0.0-gentoo.patch | 160 +++------------------ dev-ada/gprconfig_kb/gprconfig_kb-22.0.0-r1.ebuild | 42 ++++++ dev-ada/gprconfig_kb/gprconfig_kb-22.0.0.ebuild | 42 ------ 5 files changed, 65 insertions(+), 183 deletions(-) create mode 100644 dev-ada/gprconfig_kb/gprconfig_kb-22.0.0-r1.ebuild delete mode 100644 dev-ada/gprconfig_kb/gprconfig_kb-22.0.0.ebuild (limited to 'dev-ada') diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz index 02826c71bded..1fb8d9ca193d 100644 Binary files a/dev-ada/Manifest.gz and b/dev-ada/Manifest.gz differ diff --git a/dev-ada/gprconfig_kb/Manifest b/dev-ada/gprconfig_kb/Manifest index 6c2ea921370c..a1554033af19 100644 --- a/dev-ada/gprconfig_kb/Manifest +++ b/dev-ada/gprconfig_kb/Manifest @@ -1,4 +1,4 @@ -AUX gprconfig_kb-22.0.0-gentoo.patch 10025 BLAKE2B 50e25068df717bee13ba59d76c4f92b722d0cb449340cafc4d00bc45bb5211123b0e2ac97462ce02d9c45eb5966d58e7656f79cf84f3b59febfa529a8103fe71 SHA512 af6fb8c72b8fadeef19ef505270349156c75d602bd6b6035b97ef569b5daffb65b70a3d05570a5d609abfa5b201ee8e58c270b6c15784697ffb66c60d29e50e6 +AUX gprconfig_kb-22.0.0-gentoo.patch 6246 BLAKE2B c5e4d4135548ac45094c5886f997d7e28a0e5501bd52db488ed9d01f4638d69c47be85389282e5b26a9be61a368da3cbb551c9142852d32f116ce37be03a5487 SHA512 0d9c80767c22aee445b255a023488942f121933327ee749685304c54942da51730c5fec2482d6bd7706b14e62c1c6c55dfc11ee6dbffeb5ca958270b5db35a53 DIST gprconfig_kb-22.0.0.tar.gz 40598 BLAKE2B c0b18078ac3384de9bb503f78a1bb39a486b5ae899ad1ab135fa05da414eb6a55b5b7156bb4fc60a34c0d085b33af13ef2e0ec46840ad43ca63c387863ae6eac SHA512 69f8490af56b0e07afbfef51c12cd6361a00327af774cd0deacf8260ccc4782e1e8465a074e8a025024570ce43ba1b4b3adfbde9ae4ea372e487d342da6994d4 -EBUILD gprconfig_kb-22.0.0.ebuild 786 BLAKE2B 2450822f707a94a23130b2ce02ef5aade2eb38282f2b4cf159523670f0547a6e8563c7480db1aacef260413604045a797c1518720bd0423fb986efced5e82c98 SHA512 874277de320443dd4a1100b2a2e2b01a93c4a802f397ab26da4cf586b3762c5566e31b2633ad85f7e03599c4aa1f0ba0fad8a17fda483c82eaa489f75b20ebcc +EBUILD gprconfig_kb-22.0.0-r1.ebuild 786 BLAKE2B 2450822f707a94a23130b2ce02ef5aade2eb38282f2b4cf159523670f0547a6e8563c7480db1aacef260413604045a797c1518720bd0423fb986efced5e82c98 SHA512 874277de320443dd4a1100b2a2e2b01a93c4a802f397ab26da4cf586b3762c5566e31b2633ad85f7e03599c4aa1f0ba0fad8a17fda483c82eaa489f75b20ebcc MISC metadata.xml 892 BLAKE2B 0c323b949a393a634485d849b25e56ba6a9f9922538c0c09690671810c6ce97842a52021bd2448408747d18210bc8363c94b03697884ad29090f7d7a2ca92a30 SHA512 a1a9312eb03f1e5d0194c21d365650348b2fff626875e075a94dece326a3a6c589133f75998d58d1e2f7053b39fa3fa9ae31074cc0484352024ed336843e819c 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 index 7dfa8e0e9cd4..ab3d0f9367f7 100644 --- 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 @@ -5,17 +5,17 @@ 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-)?gcc-@VER@ ++ (.*-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 -+ ${PREFIX}gcc-@VER@ -v ++ ${EXEC} -v C - ${PREFIX}gcc -dumpmachine -+ ${PREFIX}gcc-@VER@ -dumpmachine ++ ${EXEC} -dumpmachine @@ -24,10 +24,10 @@ 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.*)?gnatls-@VER@ ++ (.*-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 -+ ${PREFIX}gnatls-@VER@ -v --version ++ ${EXEC} -v --version Ada @@ -37,7 +37,7 @@ -@@ -202,68 +202,11 @@ +@@ -202,7 +202,7 @@ \.\./$TARGET/lib/gnat/(.*)/adalib/ @@ -46,142 +46,24 @@ - -- -- -- -- GNAT_CODEPEER -- (.*gnsa-|.*codepeer-)gnatls -- -- ${PREFIX}gnatls -v -- -- -- Ada,C,C++ -- -- ${PREFIX}gcc -v -- -- -- -- \.\./lib/gcc/.*/$gcc_version/adalib/ -- \.\./lib/gnat/(.*)/adalib/ -- \.\./lib/gcc/.*/$gcc_version/rts-(.*)/adalib/ -- -- codepeer -- -- -- -- -- -- GNAT_LLVM -- (llvm-)gnatls -- -- ${PREFIX}gnatls -v -- -- -- Ada -- -- ${PREFIX}gcc -v -- -- -- -- \.\./lib/rts-native/adalib/ -- \.\./lib/rts-(.*)/adalib/ -- -- llvm -- -- -- -- -- C_LLVM -- clang -- -- clang --version -- -- -- -- -- C -- llvm -- -- - - - C++_LLVM -@@ -221,28 +221,6 @@ - llvm - - -- -- -- -- GNAT_C -- (c-)gnatls -- -- ${PREFIX}gnatls -v -- -- -- Ada -- -- ${PREFIX}gcc -v -- -- -- -- \.\./libexec/gnat_ccg/lib/gcc/.*/$gcc_version/adalib/ -- \.\./libexec/gnat_ccg/lib/gcc/.*/$gcc_version/rts-(.*)/adalib/ -- \.\./lib/gnat/(.*)/adalib/ -- -- c -- -- - - +@@ -254,7 +254,7 @@ + -@@ -286,23 +264,6 @@ - - - -- -- -- -- GNAT_DOTNET -- (.*dotnet-)gnatls -- -- ${PREFIX}gnatls -v -- -- -- Ada -- -- \.\./lib/dotgnat/adalib/ -- \.\./lib/dotgnat/rts-(.*)/adalib/ -- -- dotnet -- -- - + C_LLVM +- clang ++ fake-clang + + clang --version +@@ -424,7 +424,7 @@ + -@@ -421,21 +326,6 @@ - - - -- -- -- LLVM + LLVM - clang -- -- clang -v -- -- -- C,C++ -- -- clang -dumpmachine -- -- -- -- - - - WINDRES ++ 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 @@ @@ -197,7 +79,7 @@ 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 Switches ("Ada") use ("--gnatbind_path=${PREFIX(ada)}gnatbind-@VER@"); + for Required_Switches ("Ada") use + Binder'Required_Switches ("Ada") & ("--RTS=${RUNTIME_DIR(ada)}"); end Binder; 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 new file mode 100644 index 000000000000..8dde8339ac1e --- /dev/null +++ b/dev-ada/gprconfig_kb/gprconfig_kb-22.0.0-r1.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2022 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 +} diff --git a/dev-ada/gprconfig_kb/gprconfig_kb-22.0.0.ebuild b/dev-ada/gprconfig_kb/gprconfig_kb-22.0.0.ebuild deleted file mode 100644 index 8dde8339ac1e..000000000000 --- a/dev-ada/gprconfig_kb/gprconfig_kb-22.0.0.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2022 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