* [gentoo-commits] repo/gentoo:master commit in: dev-ada/aunit/, dev-ada/aunit/files/
@ 2017-11-29 19:23 Alfredo Tupone
0 siblings, 0 replies; 2+ messages in thread
From: Alfredo Tupone @ 2017-11-29 19:23 UTC (permalink / raw
To: gentoo-commits
commit: 8fa5f46d3e688767c34d4fcaf3701dadb8564882
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 29 19:23:33 2017 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Wed Nov 29 19:23:33 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fa5f46d
dev-ada/aunit: Removing duplicated file
Package-Manager: Portage-2.3.13, Repoman-2.3.3
dev-ada/aunit/Manifest | 4 ++--
dev-ada/aunit/aunit-2016.ebuild | 4 +++-
dev-ada/aunit/aunit-2017.ebuild | 6 ++++--
dev-ada/aunit/files/aunit-2017-gentoo.patch | 11 -----------
4 files changed, 9 insertions(+), 16 deletions(-)
diff --git a/dev-ada/aunit/Manifest b/dev-ada/aunit/Manifest
index ad38d9a6f6e..28fc3536432 100644
--- a/dev-ada/aunit/Manifest
+++ b/dev-ada/aunit/Manifest
@@ -1,2 +1,2 @@
-DIST aunit-gpl-2016-src.tar.gz 393489 SHA256 ba1b86b853daef98190a7dfc9858aedcd4cc85219b310356c02348f32dcc77cf SHA512 94721f04ff721bbb572ede3fe7b8b61f9682ecaec8076eec3a0a27a41d9bab86248921671b7e63656f473f8d4ddb3a44ecdfb19f479073cf2ae378d62dc68190 WHIRLPOOL fae3579197384972872966b16022e0248d23d207a55af63c6e9daf94ba152a403fa2164a7d9b81fb3ba1214583f2b5506acd87708ffb16f7ef4c66d1f14a3e13
-DIST aunit-gpl-2017-src.tar.gz 638311 SHA256 c9a574d5a4a16648b1a9294b0d18deb571841b3bbd3ea3cd3ede4a6896faa0f7 SHA512 8aad7acc472af127d7c140fb80bd8f1e26866daba2817a436851704bb9048c8347284c5cf2dd05c0c65590cf05ff01d035c3612a698d19607347e961174b3ab4 WHIRLPOOL 4639eb970ca297121b28272d589d3d436c11496d33539a2e336f307888ca63ee96f4d386de870ee3dabeaee1d40e5535b7a78c834c0ab74af4d235f5aae1079c
+DIST aunit-gpl-2016-src.tar.gz 393489 BLAKE2B 188c42d20d287d00553a9c35828b2389a480ed1dbc2f4066de352ee3821fa3dc7db3a5600bca47a3b6b047ac43b0991c961dc4569b790adc2be2a62fec1097fc SHA512 94721f04ff721bbb572ede3fe7b8b61f9682ecaec8076eec3a0a27a41d9bab86248921671b7e63656f473f8d4ddb3a44ecdfb19f479073cf2ae378d62dc68190
+DIST aunit-gpl-2017-src.tar.gz 638311 BLAKE2B aa551202677983451d1c8c9f248d85d58f6de442797ee5a3c14d418de1cd8e9a58a82ee7b8bb5b64da924265ef26c64b5d69e86f0103f0721b2c6e007896f6bb SHA512 8aad7acc472af127d7c140fb80bd8f1e26866daba2817a436851704bb9048c8347284c5cf2dd05c0c65590cf05ff01d035c3612a698d19607347e961174b3ab4
diff --git a/dev-ada/aunit/aunit-2016.ebuild b/dev-ada/aunit/aunit-2016.ebuild
index 931da83606a..452fa5ca584 100644
--- a/dev-ada/aunit/aunit-2016.ebuild
+++ b/dev-ada/aunit/aunit-2016.ebuild
@@ -14,13 +14,15 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/573990c6c7a447658d00e1cb -> ${MYP}.t
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64"
-IUSE="gnat_2016 gnat_2017"
+IUSE="+gnat_2016 gnat_2017"
RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )"
DEPEND="${RDEPEND}
dev-ada/gprbuild[gnat_2016=,gnat_2017=]"
+REQUIRED_USE="^^ ( gnat_2016 gnat_2017 )"
+
S="${WORKDIR}"/${MYP}
PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
diff --git a/dev-ada/aunit/aunit-2017.ebuild b/dev-ada/aunit/aunit-2017.ebuild
index 5ddb2617c4e..e5f793ed48a 100644
--- a/dev-ada/aunit/aunit-2017.ebuild
+++ b/dev-ada/aunit/aunit-2017.ebuild
@@ -15,16 +15,18 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed000
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64"
-IUSE="gnat_2016 gnat_2017"
+IUSE="gnat_2016 +gnat_2017"
RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )"
DEPEND="${RDEPEND}
dev-ada/gprbuild[gnat_2016=,gnat_2017=]"
+REQUIRED_USE="^^ ( gnat_2016 gnat_2017 )"
+
S="${WORKDIR}"/${MYP}
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+PATCHES=( "${FILESDIR}"/${PN}-2016-gentoo.patch )
src_compile() {
emake GPRBUILD="gprbuild -j$(makeopts_jobs)"
diff --git a/dev-ada/aunit/files/aunit-2017-gentoo.patch b/dev-ada/aunit/files/aunit-2017-gentoo.patch
deleted file mode 100644
index eeace666b45..00000000000
--- a/dev-ada/aunit/files/aunit-2017-gentoo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- aunit-3.8.0w-src/Makefile.old 2017-01-04 18:13:29.634899987 +0100
-+++ aunit-3.8.0w-src/Makefile 2017-01-04 18:15:59.013219503 +0100
-@@ -29,7 +29,7 @@
- .PHONY: all clean targets install_clean install
-
- all:
-- $(GPRBUILD) -p $(GPROPTS) lib/gnat/aunit.gpr
-+ $(GPRBUILD) -p $(GPROPTS) lib/gnat/aunit.gpr -cargs $(ADAFLAGS)
-
- clean-lib:
- $(RM) -fr lib/aunit lib/aunit-obj
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ada/aunit/, dev-ada/aunit/files/
@ 2023-03-21 7:25 Alfredo Tupone
0 siblings, 0 replies; 2+ messages in thread
From: Alfredo Tupone @ 2023-03-21 7:25 UTC (permalink / raw
To: gentoo-commits
commit: 7b9f7212cb7c6c278c8676a87f403d4041b447c7
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 21 07:15:53 2023 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Tue Mar 21 07:15:53 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b9f7212
dev-ada/aunit: gcc_12, EAPI8, stabilize all
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
dev-ada/aunit/Manifest | 1 -
dev-ada/aunit/aunit-22.0.0.ebuild | 44 ----------------------
...{aunit-23.0.0.ebuild => aunit-23.0.0-r1.ebuild} | 8 ++--
dev-ada/aunit/files/aunit-2016-gentoo.patch | 11 ------
dev-ada/aunit/files/aunit-22.0.0-redundant.patch | 28 --------------
5 files changed, 4 insertions(+), 88 deletions(-)
diff --git a/dev-ada/aunit/Manifest b/dev-ada/aunit/Manifest
index d4e8c8683c6d..0ab33f84dca9 100644
--- a/dev-ada/aunit/Manifest
+++ b/dev-ada/aunit/Manifest
@@ -1,2 +1 @@
-DIST aunit-22.0.0.tar.gz 131442 BLAKE2B 6ddc2f37ea06cfd5c7ad4d145b8889e171169108b90252feacf600a00acbd4740e638e7d478e4ac474953f9f3dcb118a4c5486a1cca6380b054661cf4b5f7e18 SHA512 5380fcb18ede7422507aff566f97521760fcc8a713d0e90195128189807784fec828c2e2c538aa0ac897cbdeb15fa2120e67b9e998875aac0ade2636dbea4e96
DIST aunit-23.0.0.tar.gz 131699 BLAKE2B 04ff77214ab6f4f5d59ea0609fffbc6fcfb4695d2fbbed45efa14e2b745c33868e1c134e5d00a7c3d8f11b1a8d15c6212110c78a53df4230b5862fb9b912a434 SHA512 450caa79e4808188107cd065665ca9cab599934e3934d18406b08d3ccebe26c1e95cd0c712ea3403d6082c7c5e8fd9ecf09ae3b63d231b80ad575048b3d61943
diff --git a/dev-ada/aunit/aunit-22.0.0.ebuild b/dev-ada/aunit/aunit-22.0.0.ebuild
deleted file mode 100644
index f98ad1ae55ba..000000000000
--- a/dev-ada/aunit/aunit-22.0.0.ebuild
+++ /dev/null
@@ -1,44 +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 multiprocessing
-
-DESCRIPTION="Ada unit testing framework"
-HOMEPAGE="http://libre.adacore.com/tools/aunit/"
-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="${ADA_DEPS}"
-DEPEND="${RDEPEND}
- dev-ada/gprbuild[${ADA_USEDEP}]"
-
-REQUIRED_USE="${ADA_REQUIRED_USE}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2016-gentoo.patch
- "${FILESDIR}"/${P}-redundant.patch
-)
-
-src_compile() {
- emake GPRBUILD="gprbuild -j$(makeopts_jobs) -v"
-}
-
-src_install() {
- emake INSTALL="${D}"/usr install
- einstalldocs
- mv "${D}"/usr/share/examples/${PN} "${D}"/usr/share/doc/${PF}/examples || die
- rmdir "${D}"/usr/share/examples || die
- rm -r "${D}"/usr/share/gpr/manifests || die
-}
-
-src_test() {
- emake PROJECT_PATH_ARG="ADA_PROJECT_PATH=$(pwd)/lib/gnat" -C test
-}
diff --git a/dev-ada/aunit/aunit-23.0.0.ebuild b/dev-ada/aunit/aunit-23.0.0-r1.ebuild
similarity index 88%
rename from dev-ada/aunit/aunit-23.0.0.ebuild
rename to dev-ada/aunit/aunit-23.0.0-r1.ebuild
index af510a7829ab..48724f61815c 100644
--- a/dev-ada/aunit/aunit-23.0.0.ebuild
+++ b/dev-ada/aunit/aunit-23.0.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-ADA_COMPAT=( gnat_2021 gcc_12_2_0 )
+ADA_COMPAT=( gnat_2021 gcc_12_2_0 gcc_12 )
inherit ada multiprocessing
DESCRIPTION="Ada unit testing framework"
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND="${ADA_DEPS}"
diff --git a/dev-ada/aunit/files/aunit-2016-gentoo.patch b/dev-ada/aunit/files/aunit-2016-gentoo.patch
deleted file mode 100644
index eeace666b45e..000000000000
--- a/dev-ada/aunit/files/aunit-2016-gentoo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- aunit-3.8.0w-src/Makefile.old 2017-01-04 18:13:29.634899987 +0100
-+++ aunit-3.8.0w-src/Makefile 2017-01-04 18:15:59.013219503 +0100
-@@ -29,7 +29,7 @@
- .PHONY: all clean targets install_clean install
-
- all:
-- $(GPRBUILD) -p $(GPROPTS) lib/gnat/aunit.gpr
-+ $(GPRBUILD) -p $(GPROPTS) lib/gnat/aunit.gpr -cargs $(ADAFLAGS)
-
- clean-lib:
- $(RM) -fr lib/aunit lib/aunit-obj
diff --git a/dev-ada/aunit/files/aunit-22.0.0-redundant.patch b/dev-ada/aunit/files/aunit-22.0.0-redundant.patch
deleted file mode 100644
index d22bb4a572ec..000000000000
--- a/dev-ada/aunit/files/aunit-22.0.0-redundant.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 7372e83edf47cf26dc64a49850b6fd80aaea5495 Mon Sep 17 00:00:00 2001
-From: Vasiliy Fofanov <fofanov@adacore.com>
-Date: Mon, 13 Dec 2021 18:54:17 +0100
-Subject: [PATCH] Remove redundant "with" of parent unit
-
-This fixes a warning raised by recent GNAT toolchains.
-
-TN: UC13-054
----
- test/src/aunit-test_suites-tests.ads | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/test/src/aunit-test_suites-tests.ads b/test/src/aunit-test_suites-tests.ads
-index 0d3ea33..377c0c3 100644
---- a/test/src/aunit-test_suites-tests.ads
-+++ b/test/src/aunit-test_suites-tests.ads
-@@ -1,10 +1,9 @@
- --
---- Copyright (C) 2009-2010, AdaCore
-+-- Copyright (C) 2009-2021, AdaCore
- --
-
- with AUnit.Test_Fixtures;
- with AUnit.Test_Results;
--with AUnit.Test_Suites;
-
- package AUnit.Test_Suites.Tests is
-
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-03-21 7:25 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-11-29 19:23 [gentoo-commits] repo/gentoo:master commit in: dev-ada/aunit/, dev-ada/aunit/files/ Alfredo Tupone
-- strict thread matches above, loose matches on Subject: below --
2023-03-21 7:25 Alfredo Tupone
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox