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
