commit: 0d6284afad40a4f03c378a0ecfb9cd029b174dfa
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 18 21:08:54 2025 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sat Jan 18 21:09:18 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d6284af
dev-ada/gpr: drop 23.0.0 add 25.0.0
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
dev-ada/gpr/Manifest | 2 +-
dev-ada/gpr/gpr-23.0.0-r6.ebuild | 121 ---------------------
dev-ada/gpr/gpr-24.0.0-r1.ebuild | 4 +-
.../{gpr-24.0.0-r1.ebuild => gpr-25.0.0.ebuild} | 46 ++++++--
4 files changed, 40 insertions(+), 133 deletions(-)
diff --git a/dev-ada/gpr/Manifest b/dev-ada/gpr/Manifest
index 426813aba4d8..de96638cdfc9 100644
--- a/dev-ada/gpr/Manifest
+++ b/dev-ada/gpr/Manifest
@@ -1,2 +1,2 @@
-DIST gpr-23.0.0.tar.gz 1005298 BLAKE2B
475ac5ad89a4d038dc8cdb953826f46e0f8f2bbf09a858366a634b5bacfc4b0282db4206cf5d113900dffd3c2ad9423b6c6e56de8058215a7946020c30dacc8b
SHA512
f1cfd2c2162ffa984c62238a472438919c22a83b61e03c9234f6bc601c1d1e50981f52d024106ad5196dd83ee7686e864c8728c56d451be06baf96161afd8bcc
+DIST gpr2-with-gprconfig_kb-25.0.tgz 1772855 BLAKE2B
f4bcde7f2ad951d00b7b03b2d49120c301836a2bc676de0c0f7c493573a03b15bc20a6fd7f8d3034a063f6227b47f54468efe14260de1bb52a1da6bc4d5b87d6
SHA512
70fe0fcf541f6d3d90a34cab1638bbc0283dcd765c000406e0cfb73bae1817b30ddfe73f3672247a97c6b6bfc41900bc96a4440ca0c660f9c2f7b9d3cc8f8dcf
DIST gpr2-with-lkparser-24.0.tgz 2030278 BLAKE2B
ae42fd876a08a654db2db919e6d777ba603d54d6db618e8b8dbdfcfd9313decad092e0a9feae09ca46ec324cd860eaffbb6fa670290d454414677ad7e4a61dc7
SHA512
eda3c693393763da31312733e2bc06e852b867a32b42da6afdddd623051a1d29f7243aabaef3ae50052b22686dce6db62d9823652ce516d79822e4215f4d87b1
diff --git a/dev-ada/gpr/gpr-23.0.0-r6.ebuild b/dev-ada/gpr/gpr-23.0.0-r6.ebuild
deleted file mode 100644
index d103fba9e4f2..000000000000
--- a/dev-ada/gpr/gpr-23.0.0-r6.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ADA_COMPAT=( gnat_2021 gcc_12 gcc_13 )
-PYTHON_COMPAT=( python3_{9,10,11} )
-
-inherit python-any-r1 ada multiprocessing
-
-DESCRIPTION="LibGPR2 - Parser for GPR Project files"
-HOMEPAGE="https://github.com/AdaCore/gpr";
-SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
- -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+shared static-libs static-pic"
-REQUIRED_USE="|| ( shared static-libs static-pic )
- ${ADA_REQUIRED_USE}"
-
-RDEPEND="${ADA_DEPS}
- dev-ada/xmlada[${ADA_USEDEP},shared?,static-libs?,static-pic?]
- dev-ada/gnatcoll-core[${ADA_USEDEP},shared?,static-libs?,static-pic?]
-
dev-ada/gnatcoll-bindings[${ADA_USEDEP},shared?,static-libs?,static-pic?,iconv,gmp]
-"
-
-DEPEND="${RDEPEND}
- dev-ada/gprconfig_kb[${ADA_USEDEP}]
- dev-ada/gprbuild[${ADA_USEDEP}]"
-
-BDEPEND="${PYTHON_DEPS}
- $(python_gen_any_dep '
- dev-ada/langkit[${PYTHON_USEDEP}]
- ')
- dev-ada/libadalang
-"
-
-python_check_deps() {
- python_has_version "dev-ada/langkit[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
- ada_pkg_setup
- python-any-r1_pkg_setup
-}
-
-src_configure() {
- emake ENABLE_SHARED=$(usex shared) setup
-}
-
-src_compile() {
- build () {
- gprbuild -j$(makeopts_jobs) -m -p -v -XLIBRARY_TYPE=$1 \
- -XGPR2_BUILD=release -XXMLADA_BUILD=$1 gpr2.gpr \
- -largs ${LDFLAGS} \
- -cargs ${ADAFLAGS} || die "gprbuild failed"
- }
- mkdir -p .build/kb || die
- gprbuild -p -v -P src/kb/collect_kb.gpr -XKB_BUILD_DIR=.build/kb \
- --relocate-build-tree -largs ${LDFLAGS} -cargs ${ADAFLAGS} ||
die
- .build/kb/collect_kb -o .build/kb/config.kb /usr/share/gprconfig || die
- emake -C langkit setup DEST="${S}/.build/lkparser" PYTHONEXE=${PYTHON}
- if use shared; then
- build relocatable
- fi
- if use static-libs; then
- build static
- fi
- if use static-pic; then
- build static-pic
- fi
- if use static-libs; then
- libtype='static'
- elif use static-pic; then
- libtype='static-pic'
- elif use shared; then
- libtype='relocatable'
- fi
-
- gprbuild -p -m -v -j$(makeopts_jobs) -XGPR2_BUILD=release \
- -XLIBRARY_TYPE=${libtype} -XXMLADA_BUILD=${libtype}
gpr2-tools.gpr \
- -largs ${LDFLAGS} -cargs ${ADAFLAGS} || die
- gprbuild -p -m -v -j$(makeopts_jobs) -XGPR2_BUILD=release \
- -XLIBRARY_TYPE=${libtype} -XXMLADA_BUILD=${libtype} \
- -XLANGKIT_SUPPORT_BUILD=${libtype} gpr2-name.gpr \
- -largs ${LDFLAGS} -cargs ${ADAFLAGS} || die
-}
-
-src_install() {
- build () {
- gprinstall -XLIBRARY_TYPE=$1 -f -p -v -XGPR2_BUILD=release \
- --prefix="${D}/usr" -XXMLADA_BUILD=$1 \
- --build-name=$1 --build-var=LIBRARY_TYPE \
- --build-var=GPR2_LIBRARY_TYPE gpr2.gpr || die
- }
- if use shared; then
- build relocatable
- fi
- if use static-libs; then
- build static
- fi
- if use static-pic; then
- build static-pic
- fi
- gprinstall -p -f -v -XGPR2_BUILD=release --prefix="${D}/usr" \
- -XLIBRARY_TYPE=${libtype} -XXMLADA_BUILD=${libtype} \
- --build-name=${libtype} --mode=usage gpr2-tools.gpr || die
- gprinstall -p -f -v -XGPR2_BUILD=release --prefix='${D}/usr' \
- -XLIBRARY_TYPE=${libtype} -XXMLADA_BUILD=${libtype} \
- -XLANGKIT_SUPPORT_BUILD=${libtype} --build-name=${libtype} \
- --mode=usage gpr2-name.gpr || die
-
- einstalldocs
-
- rm "${D}"/usr/bin/gprclean || die
- rm "${D}"/usr/bin/gprconfig || die
- rm "${D}"/usr/bin/gprinstall || die
- rm "${D}"/usr/bin/gprls || die
-}
diff --git a/dev-ada/gpr/gpr-24.0.0-r1.ebuild b/dev-ada/gpr/gpr-24.0.0-r1.ebuild
index a79a69b27ec9..07b25b79493f 100644
--- a/dev-ada/gpr/gpr-24.0.0-r1.ebuild
+++ b/dev-ada/gpr/gpr-24.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 Gentoo Authors
+# Copyright 2022-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -23,7 +23,7 @@ REQUIRED_USE="|| ( shared static-libs static-pic )
RDEPEND="${ADA_DEPS}
dev-ada/xmlada[${ADA_USEDEP},shared?,static-libs?,static-pic?]
dev-ada/gnatcoll-core[${ADA_USEDEP},shared?,static-libs?,static-pic?]
-
dev-ada/gnatcoll-bindings[${ADA_USEDEP},shared?,static-libs?,static-pic?,iconv,gmp]
+
dev-ada/gnatcoll-bindings[${ADA_USEDEP},shared?,static-libs?,static-pic?,iconv(+),gmp]
"
DEPEND="${RDEPEND}
diff --git a/dev-ada/gpr/gpr-24.0.0-r1.ebuild b/dev-ada/gpr/gpr-25.0.0.ebuild
similarity index 59%
copy from dev-ada/gpr/gpr-24.0.0-r1.ebuild
copy to dev-ada/gpr/gpr-25.0.0.ebuild
index a79a69b27ec9..fbdb3d5afb5d 100644
--- a/dev-ada/gpr/gpr-24.0.0-r1.ebuild
+++ b/dev-ada/gpr/gpr-25.0.0.ebuild
@@ -1,35 +1,60 @@
-# Copyright 2022-2024 Gentoo Authors
+# Copyright 2022-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-ADA_COMPAT=( gnat_2021 gcc_12 gcc_13 gcc_14 )
+ADA_COMPAT=( gcc_14 )
inherit ada multiprocessing
DESCRIPTION="LibGPR2 - Parser for GPR Project files"
HOMEPAGE="https://github.com/AdaCore/gpr";
-SRC_URI="https://github.com/AdaCore/${PN}/releases/download/v${PV}/gpr2-with-lkparser-$(ver_cut
1-2).tgz"
+SRC_URI="https://github.com/AdaCore/${PN}/releases/download/v${PV}/gpr2-with-gprconfig_kb-$(ver_cut
1-2).tgz"
S="${WORKDIR}"/${PN}
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
IUSE="+shared static-libs static-pic"
REQUIRED_USE="|| ( shared static-libs static-pic )
${ADA_REQUIRED_USE}"
RDEPEND="${ADA_DEPS}
dev-ada/xmlada[${ADA_USEDEP},shared?,static-libs?,static-pic?]
- dev-ada/gnatcoll-core[${ADA_USEDEP},shared?,static-libs?,static-pic?]
-
dev-ada/gnatcoll-bindings[${ADA_USEDEP},shared?,static-libs?,static-pic?,iconv,gmp]
+
>=dev-ada/gnatcoll-core-25[${ADA_USEDEP},shared?,static-libs?,static-pic?]
+
dev-ada/gnatcoll-bindings[${ADA_USEDEP},shared?,static-libs?,static-pic?,iconv(+),gmp]
"
DEPEND="${RDEPEND}
dev-ada/gprconfig_kb[${ADA_USEDEP}]
dev-ada/gprbuild[${ADA_USEDEP}]"
+src_prepare() {
+ default
+ cd testsuite/tests
+ rm -r callgraph-install c-closure check-has-value
check-shared-lib-import \
+ configuration-file-error-handling custom_attr_no_pack \
+ disable_warnings display-version extending-add-body \
+ extending-interface-in-extended-project \
+ externals-in-configuration-project installed_asm_object \
+ invalid-project-2 kb-validation invalid-trace-file
library-interfaces \
+ multi-unit-3 nested-case nested-externals
no-naming-package-in-config \
+ parent-var-visible runtime-user-project self-project-attribute \
+ source_subdirs subdirs types-import unknown-var-config \
+ tooling/source_dirs || die
+ rm -r ali_parser/dependencies || die
+ cd tools
+ rm -r gprls/closure/base || die
+ rm -r gprls/closure/sal || dir
+ rm -r gprls/closure/short-subunit-names || die
+ rm -r gprls/closure/subunits || die
+ rm -r gprclean/remove-empty-build-directories || die
+ rm -r gprclean/no_build_dir_recursive || die
+ rm -r gprclean/output-dir-not-found-warnings-not-printed || die
+ rm -r gprinspect/text || die
+}
+
src_compile() {
build () {
gprbuild -j$(makeopts_jobs) -m -p -v -XLIBRARY_TYPE=$1 \
@@ -59,6 +84,11 @@ src_compile() {
-largs ${LDFLAGS} -cargs ${ADAFLAGS} || die
}
+src_test() {
+ cd testsuite
+ ./testsuite.py |& grep -w FAIL && die
+}
+
src_install() {
build () {
gprinstall -XLIBRARY_TYPE=$1 -f -p -v -XGPR2_BUILD=release \
@@ -81,8 +111,6 @@ src_install() {
einstalldocs
- rm "${D}"/usr/bin/gprclean || die
rm "${D}"/usr/bin/gprconfig || die
- rm "${D}"/usr/bin/gprinstall || die
- rm "${D}"/usr/bin/gprls || die
+ rm -r "${D}"/usr/share/gpr/manifests
}
