diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-12-24 14:11:38 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-12-24 14:11:38 +0000 |
| commit | de49812990871e1705b64051c35161d5e6400269 (patch) | |
| tree | 5e1e8fcb0ff4579dbd22a1bfee28a6b97dc8aaeb /dev-ada | |
| parent | 536c3711867ec947c1738f2c4b96f22e4863322d (diff) | |
gentoo resync : 24.12.2018
Diffstat (limited to 'dev-ada')
48 files changed, 295 insertions, 655 deletions
diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz Binary files differindex e36070b0f13f..6e6ddf987794 100644 --- a/dev-ada/Manifest.gz +++ b/dev-ada/Manifest.gz diff --git a/dev-ada/asis/Manifest b/dev-ada/asis/Manifest index 5e0d709659a6..dc8171935958 100644 --- a/dev-ada/asis/Manifest +++ b/dev-ada/asis/Manifest @@ -1,9 +1,7 @@ AUX asis-2016-gentoo.patch 1487 BLAKE2B 859aebba0bfe56ab846f82f2f75cb04c6b5edf25cd25175272f6da5e65356a8f82b205940e43b64832e25789c71a19ac0861d20fc44106bb06f1e05ec8d63f95 SHA512 93142623810c5a31e3d4d792144c2f352b4238a6fa96eec71489453bf6e9cfa084c0e3ec4d4e6bf37df09229f2f8045c82a4797a11555ef378774d0d2748a540 AUX asis-2017-gentoo.patch 2030 BLAKE2B 261d2e32b818f17ea4ea51047cf71b73f89d918094397702d6b7f9eaa9e2edb39d754d12beb23b2b6b0a55012773767915c2dc3bd69db850558c8c3afbe44dd5 SHA512 9697264392827254fc23993979ddb1cef8276e8f699f776f85a4ce09fcaf2e87b68e4187622fc16c809d71e7e360626c72f5d5f7be33c72a9544996cbf1321f9 DIST asis-gpl-2016-src.tar.gz 5240554 BLAKE2B b95be816f5f52ac2b29814c09166774884dc166df6e08b26769c9502443f9797c42a1f9b6168336636add6515b748b3ef4b38c6a1dc6f49c1afb9ecec8e50c50 SHA512 439195d4cb5d58328dcc8c815cb6a32c5f8ed1d6581246dfa5dcca7c212ffad38dd63df25e490c4ac628eaf8c8e6d286f8ea036b7f39499704565b60c1bba8ee -DIST asis-gpl-2017-src.tar.gz 5909758 BLAKE2B 93b2f87c6945b27cff90cb3e227d6e6ae061dc6fc693ee8960cd9b4abf68cc398f6b6d7dba864399c8e007aee2a91789614b7d2bf146645a5d983f20c1ccbc64 SHA512 dee6b8e0851a4b3181d50256697865f7a6a613eef7b59e43cb1a0b066e794d927db9f60df33f7e1af343d41801a6b66feb1f7a963523b2442c85ca506d7e112f DIST asis-gpl-2018-src.tar.gz 5983604 BLAKE2B d91e3ff5cb95ec5b69121ed09e73f7bff234147b809353577315cd25cae0069ec5ebfc221a9798341b2a33bde316d74c4ce47c7ace580fe4d867e47032e207f2 SHA512 e00750adf17df8d534f0e561d129002d8b3c9efd6ba9c8d6768840d1399933271d748bafb7358a45d0a520620a335e669a6c2770ed89660bb319b609961a433a -EBUILD asis-2016.ebuild 1253 BLAKE2B 63b307cfa6f24c397538b3a2d9f301e922fcd2062a705f9fa00cb9be8e7f96a54d0a620438da7e15ce6b8acdb9fcfe98fc3477b6df39bfab0724765a1977d875 SHA512 b0ab62fda3dcdaba5d0c87893fedf8659d64c1a441a52e5859b3686a05beaa1a50de1916e3529f92ac0b301e83e85f10256ee42295b6d8823061d3ec31d89f7d -EBUILD asis-2017.ebuild 1066 BLAKE2B dcca612165bfaa48d636e34606fb4f03eac1cf6fa5651458af91a923317090e5101911af771b82756eb6b0baf0bd6258b0d0c1a212f050f8294eaa8c92b61395 SHA512 6e1c71b2cbefa467fe434dbad8b600244adf6cda2f7cd40ab8497d093e483684591bdf571e6ad03019b90bc40494b7c7ec0b96b2540dc3f23dd3af8a69daeeef -EBUILD asis-2018.ebuild 1094 BLAKE2B 8f7ad8347e9587d430565d39e6764bc4f1f8a4ca17df6278d9b1e2e798e30220b6b8446a76263d76f17ad64d0193459c63c646c70f0e9e23a92777bd44663a96 SHA512 4815766b0b98af239be713dfb3a97a4c2ece83a5e66ca50ce2c66d1ca9732e26ae112b514c660d268b6b1c641fe9a2f4cfabb322a8290e4cbd6c6a0fb8e067e9 +EBUILD asis-2016.ebuild 1220 BLAKE2B 3d31f42030ea2cf19b2c98159018528cfe423cdb4fbabb0bfe116cd5f153c2c2f4a80f357381cc8dbacb25134234f4529b36214596bdfd6f03af03423ed71e03 SHA512 77c3f1f87a1cfbbb96080e37a1ebf5d3a3407eda5e31e8fba02f2e155207e07cc3ec5c47917a0b4ae11293ae053e5c0602a2b46d5655bbe817a5a1a0d0010111 +EBUILD asis-2018.ebuild 1297 BLAKE2B e8fd884ce0b058dd198aadc4c0937ccac24585ec37dfe40e34f44f65e756df2ddf6b84d366a200f018aa60887c8564cc552966118cf8be2ce81a9cf803e355fd SHA512 6f4ced4d984e41c98bce656dc82c266f04287728660d80720595c4382c799b1382522eb7f4df6e6f8b81b34ee5fb7865ecccf40dee3f4e86982470fce602d395 MISC metadata.xml 758 BLAKE2B aebcdb7e9be0cccf7350d68082d2461ec6a28c94df18dd936f689a3cf02a0139b96c0208fb7e8ff677ff0cb977199f8b4ef097faf6b3376624c4bf220845f216 SHA512 b673b7f404971e44cd09f746338dc2cd655b4b5cd0ced7a742e6986a8d454b4c2738a7576dd5b1ebe5fbea4ff073de60a1fbaf8dddac90e54981159affa0fb07 diff --git a/dev-ada/asis/asis-2016.ebuild b/dev-ada/asis/asis-2016.ebuild index 70735545b32d..74f0b0bdfadc 100644 --- a/dev-ada/asis/asis-2016.ebuild +++ b/dev-ada/asis/asis-2016.ebuild @@ -14,16 +14,17 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/57399029c7a447658e0aff71 LICENSE="GPL-3" SLOT="0" KEYWORDS="amd64 x86" -IUSE="+gnat_2016 gnat_2017" - -DEPEND="dev-ada/gnat_util[gnat_2016=,gnat_2017=] - dev-ada/gnatcoll[gnat_2016=,gnat_2017=,projects,shared] - dev-ada/gprbuild[gnat_2016=,gnat_2017=] - dev-ada/xmlada[gnat_2016=,gnat_2017=] - gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) - gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )" -RDEPEND="${RDEPEND}" -REQUIRED_USE="^^ ( gnat_2016 gnat_2017 )" +IUSE="+gnat_2016 gnat_2017 gnat_2018" + +RDEPEND="dev-ada/gnat_util[gnat_2016=,gnat_2017=] + || ( + dev-ada/gnatcoll[gnat_2016=,gnat_2017=,projects,shared] + dev-ada/gnatcoll-core[gnat_2016=,gnat_2017=,shared] + )" +DEPEND="${RDEPEND} + dev-ada/gprbuild[gnat_2016=,gnat_2017=]" + +REQUIRED_USE="^^ ( gnat_2016 gnat_2017 ) !gnat_2018" S="${WORKDIR}"/${MYP} diff --git a/dev-ada/asis/asis-2017.ebuild b/dev-ada/asis/asis-2017.ebuild deleted file mode 100644 index 0f150265f63a..000000000000 --- a/dev-ada/asis/asis-2017.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit multiprocessing -MYP=${PN}-gpl-${PV}-src - -DESCRIPTION="To develop tools for Ada software" -HOMEPAGE="http://libre.adacore.com/" -SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deecffb - -> ${MYP}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="gnat_2016 +gnat_2017" - -DEPEND="dev-ada/gnat_util[gnat_2017] - dev-ada/gnatcoll[gnat_2017,projects,shared] - dev-ada/gprbuild[gnat_2017] - dev-ada/xmlada[gnat_2017] - dev-lang/gnat-gpl:6.3.0" -RDEPEND="${RDEPEND}" -REQUIRED_USE="!gnat_2016 gnat_2017" - -S="${WORKDIR}"/${MYP} - -PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) - -src_compile() { - emake PROCESSORS=$(makeopts_jobs) - emake tools PROCESSORS=$(makeopts_jobs) \ - GPRBUILD_FLAGS="-vl \ - -XLIBRARY_TYPE=relocatable \ - -XXMLADA_BUILD=relocatable" -} - -src_install() { - emake prefix="${D}"/usr install - emake prefix="${D}"/usr install-tools \ - GPRINSTALL="gprinstall \ - -XLIBRARY_TYPE=relocatable \ - -XXMLADA_BUILD=relocatable" -} diff --git a/dev-ada/asis/asis-2018.ebuild b/dev-ada/asis/asis-2018.ebuild index 88b9ba97d07e..503e02383473 100644 --- a/dev-ada/asis/asis-2018.ebuild +++ b/dev-ada/asis/asis-2018.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -13,21 +13,29 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/5b0819e0c7a447df26c27ab8 LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="gnat_2016 gnat_2017 +gnat_2018" - -RDEPEND="dev-ada/gnatcoll-core[gnat_2016=,gnat_2017=,gnat_2018=,shared]" +KEYWORDS="amd64 x86" +IUSE="gnat_2017 +gnat_2018" + +RDEPEND="dev-ada/gnat_util[gnat_2017(-)?,gnat_2018(-)?] + || ( + dev-ada/gnatcoll-core[gnat_2017=,gnat_2018=,shared] + dev-ada/gnatcoll[gnat_2017=,gnat_2018=,projects,shared] + )" DEPEND="${RDEPEND} - dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018=]" + dev-ada/gprbuild[gnat_2017=,gnat_2018=]" + +REQUIRED_USE="|| ( gnat_2017 gnat_2018 )" S="${WORKDIR}"/${MYP} PATCHES=( "${FILESDIR}"/${PN}-2017-gentoo.patch ) src_compile() { - emake PROCESSORS=$(makeopts_jobs) + emake PROCESSORS=$(makeopts_jobs) \ + GPRBUILD_FLAGS="-vl" emake tools PROCESSORS=$(makeopts_jobs) \ GPRBUILD_FLAGS="-vl \ + -XGPR_BUILD=relocatable \ -XLIBRARY_TYPE=relocatable \ -XXMLADA_BUILD=relocatable" } @@ -36,6 +44,7 @@ src_install() { emake prefix="${D}"/usr install emake prefix="${D}"/usr install-tools \ GPRINSTALL="gprinstall \ + -XGPR_BUILD=relocatable \ -XLIBRARY_TYPE=relocatable \ -XXMLADA_BUILD=relocatable" rm -r "${D}"/usr/share/gpr/manifests || die diff --git a/dev-ada/aws/Manifest b/dev-ada/aws/Manifest index dad8163cca98..7421132835d2 100644 --- a/dev-ada/aws/Manifest +++ b/dev-ada/aws/Manifest @@ -2,5 +2,5 @@ AUX aws-2016-gentoo.patch 1255 BLAKE2B a2b2d944a131d83b789fe91a1b31b062f039b2f6b DIST aws-gpl-2017-src.tar.gz 12298806 BLAKE2B 9c45d77dd44da11efe99c6e3128fc5920b39eaaf620e266b2dab394866c2d6a3cd1abe4eb01d9024960ef9046662c0df690f72c687fbe0a64b1021ed9c383828 SHA512 a7ddd332cbf3e699fdb7f734fba7dfabed2a92745bbc7fbd4ae5ea5da6a5e98c5434d7a9a3d7071d57b8294cc5c0c2a3802ded607e9402a1cf5e5bed8f5a8c35 DIST aws-gpl-2018-src.tar.gz 4193276 BLAKE2B 31fa99fc3324f2514799a33cbd282f68a26d133da14ee2a70d3f5091c3670e82a7b77f9f941e593e914a755dd54d5a1e352d201a9dc097991b7bd50aa9f54b3b SHA512 62b85f70dd722148bbf3ad85bfd6cde2d0ab1d8029f673eb7ee42b0890c3dbf0f023c321e96eca99ccd2f0b235347ab577cfb558e7d81993d166683ec815dbe4 EBUILD aws-2017.ebuild 1025 BLAKE2B f7b86bf4a470b5376061b4ce47263889f66d68cde383136312d979959d9c1f59e96d8367d242e44ec750bf6e006d7144f1fb337bbdcac6f95f2a42b82b3e0756 SHA512 23a477b56590afe16de4fc6707fc776daf431a0f576d002bbf0ab5305694b2d0f701bb5d4c85ca622bb4b13f3f3c7c7760820457688b5ee6bb78984558a68df5 -EBUILD aws-2018.ebuild 1000 BLAKE2B a98819d89f3a2c0c55fa5c812f62e15b269a81aa3e5398ce6a7fc8547b8b45adc4d8944f178cbebbfa9f52c22367acd24c2b819a7cd4c5a21ce4081f4300eb39 SHA512 fc3786e85ffb6748cae332ca9411a04f7c1a24649d91f37444af18be2de8378783f89994cebacf035e903e33a1b607f51f0080d521fc2137884f0289bf8a00ff +EBUILD aws-2018.ebuild 998 BLAKE2B 965b47d7df98215f94177dcf663075ad56f83365591289a15501b26b1d3db5ca17412956a80a3f1d727ede8713aaf3bd28623e1f84c2d4f2bff39da0f2aac481 SHA512 21ef1dca5d430bf12cfd643343bcd99c020cb4a215e66dc86e497a8ee21b4f6903c5082947be8dffd07cfd82387590b46525b4d522232746aafee2d507667f39 MISC metadata.xml 910 BLAKE2B 32c65b10f1286c68aaf8c4eb5d5078dca8b09a451ec02d1a845282124b71cac7363e8f068910fe6908befcf49d9e476f30f53b78bd66d6269cb7cb38f5d69597 SHA512 e3b9b10331c66b3e3ce4bb0b74a1c426656d33ffb37936a433fad3f7fc2e64de233c7d18158c5eea409d406ebe1edcf77135e7b490bec40387adc8b0928cad5a diff --git a/dev-ada/aws/aws-2018.ebuild b/dev-ada/aws/aws-2018.ebuild index f18391af4105..a9c134543f61 100644 --- a/dev-ada/aws/aws-2018.ebuild +++ b/dev-ada/aws/aws-2018.ebuild @@ -14,7 +14,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/5b0819e0c7a447df26c27abd LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="gnat_2016 gnat_2017 +gnat_2018" RDEPEND="dev-ada/xmlada[gnat_2016=,gnat_2017=,gnat_2018(-)=] diff --git a/dev-ada/gnat_util/Manifest b/dev-ada/gnat_util/Manifest index a794df771b59..74a2a70a53a9 100644 --- a/dev-ada/gnat_util/Manifest +++ b/dev-ada/gnat_util/Manifest @@ -1,9 +1,6 @@ -AUX gnat_util-2016-gentoo.patch 3197 BLAKE2B e5a15c5becd1882fa7649c7b18d628dd38c7c7c621e34152110b20b658464ca98fcdffaa9ee90224f7d828f7e935d090f47cb446ceb6f898fac76cac6ce19cf4 SHA512 599d3c2cb1d22513c9ef2200d100a80b55d2efe8d8bf7b541cfb845da2a40d1a8d24234208b92a3fcfeba305cb0157b01576d16129e3979e8869ab4b098bb9f7 -AUX gnat_util-2017-gentoo.patch 2840 BLAKE2B 95e39f8c054cefb2ddc879e44b9e11e49fa91bb3e521440e25ca050e276d3ff067f0d407be29826f550d960cc729f3adabb7d81134906af39c1fb0ce668edec3 SHA512 6fb7c9fd3ac282fd0571aec55acfcafc5a72e8814dd9c158751f36f6bab29d682da9b6e89eca774f424831c2985776b07f6749c97bff4ee1baa423a9ed142846 -DIST gnat_util-gpl-2016-src.tar.gz 1126296 BLAKE2B e1e7c2628b6a012ca3ad5809d4ea785a9fa68ed5e7f67a80475ece80161f53d611eb9a383591167d30f2a1125de48299123cc0c0b4807b6bcb4bca197bda78ed SHA512 1edb67e762637e9e951356c7be402d7b2b903a05abdc93eadaf5ba98bc7bfa936b4fa2a2ae7eb986200dec755020e53d312d42769512fba2e290099f6030bbd0 +AUX gnat_util-2017-gentoo.patch 2419 BLAKE2B e8085e6a6cb65c5ffe6054aa360e90042a0dbba2280ecee060a690f8c06104a7224192045bf4b43d2028cb25d9b336e085968169b3d79d10767ce0694ec8b042 SHA512 b1ba5dbbfa86c943143e570a3ac871935e1e6f6104883abc56d1f8b9395d0e2b5e6317356b309497c6fa942e30f25f2f2f1b8cfd7cf801f40b5b1b64b036154b DIST gnat_util-gpl-2017-src.tar.gz 868496 BLAKE2B d105a59f0533428a4d57b3c81c0818f4d1bd457b113d775fe97f35f7352e03b602ac0e6d7b970e408fb3dd6d30f0d4e60feffccf42dbdc0723a76855b0164ee0 SHA512 d5e48c6fafc870f36094d2dfd5f45f2d5b5729c97596afff7475b7838c1c7c029ef57395ca1011ee74d8a4195597ea1f502732e654a02561a7abc72c8a7d3a6a DIST gnat_util-gpl-2018-src.tar.gz 883945 BLAKE2B e30ee379f4ea9525337b0794d4fc91c80458b3b1dd3d10cbc455c6f566d4d073b6753c171ffbbabd85995717de249cdee7c094b7ba00d752a13e18d0f54da192 SHA512 490b0fa944f4b9fee2a4e78c1181658eb8f95262314455c41beb3ebe9db5dd540090d1f9840357572969721966fa11085dc680f3498dc539631ef3f4dbf56426 -EBUILD gnat_util-2016.ebuild 1477 BLAKE2B 2b9e5cc94fee078cf11c870198668ef563507bfbeecc8da8553967e2a261685fa8affa89a56ba85a9522c894c263040eacfce0790fb5e11a89b4a3c9a70cf683 SHA512 b314664a35c77809172a8ac8fb6d07e565d98877ce9847b082d5386aff279cd87527b199881e84795254e68cde6fcd06f69ace8a3dcb016bc614def523f60957 -EBUILD gnat_util-2017.ebuild 1404 BLAKE2B 7f66ffa00fd9cfc9d4af3e0bafc945582f720d134b9b56ac2939cd9e05423dd944103d1004b7b7bab93a499d40ae7922cd93084f531ab79f5bedd39407b8fac4 SHA512 4c056592777aeaab9f908ee39c6d1f27be12900b73626db628225b4ca6575c3821d51239f75ee15f931dc41a1c55ccef4a772c58a3c96022a4fdd196fcf57c6c -EBUILD gnat_util-2018.ebuild 1383 BLAKE2B 4d0dc5cf21c7c4505197f7fb564b51adcf06f852b79119ba363483e7561dc8fe75b53385ca3a4f4bafc4e1f9693bac140ace09b567e5454a1c58f86d8a759417 SHA512 d83632a99afb02d389d80da648dcd56bf78b40dafa35e0583ae2ef57024d60fafca94fd31a1da549db2ed15db5022d6c33dabe09cbc5339f4a9840bb9685dd4f +EBUILD gnat_util-2017.ebuild 1422 BLAKE2B b69c22ede488f993d0efeb7e66846c33f20f15e10b5344ff02252fb6d037910fc4bc24fd0421a08504164796bc50481bae6109e2d3ebd21a4425ff6d969fc918 SHA512 d3a1ebb59b8a31162349bc40027f5cb36f8e7ed4de8190fc336f4ad930792b8263bd0c47909d909245c348823a57d05bfe26fabce0938c4e292c7b7f70154cd4 +EBUILD gnat_util-2018.ebuild 1326 BLAKE2B 336432396b5b98f7d59704f30a7063873651c296eb8a63700025c5c37cda497baf1caac3d4097ed95b99cfb1aee9e8402a1e75293560b7db1e12bb40b1a5aaf6 SHA512 8014d612eb4e2fcd1599aa6262f6afc131ca5dea70b40f096aa22c95a94bcb0ecc38a94c705254085b84c56e89fb21a034f082a5606885f58231dfe37738b247 MISC metadata.xml 1157 BLAKE2B e747ed9b4c63bd802debbc784ca3aed291382259989a1ca3c5622a8058e407df3133d05635ba7442038dd78d5627bb37a9f16af278aa9bb490244884532a00c2 SHA512 b7dad53debfedd16f6192d7632557b4a65580bae8a47bef0d6138958b91ac329c96e629713c3274707a70846f332834081755fbb77c12842e75da966a39ec6ad diff --git a/dev-ada/gnat_util/files/gnat_util-2016-gentoo.patch b/dev-ada/gnat_util/files/gnat_util-2016-gentoo.patch deleted file mode 100644 index 7559894c6d00..000000000000 --- a/dev-ada/gnat_util/files/gnat_util-2016-gentoo.patch +++ /dev/null @@ -1,100 +0,0 @@ ---- gnat_util-gpl-2014-src/Makefile.old 2016-12-28 09:56:49.378950217 +0100 -+++ gnat_util-gpl-2014-src/Makefile 2016-12-28 09:57:12.301562519 +0100 -@@ -19,17 +19,26 @@ - MKDIR=mkdir -p - SRC=gen_src - --.PHONY: all --all: generate_sources -+build-static: - ${BUILDER} -m -XOS=$(OS_TYPE) -XBUILD=$(BUILD_TYPE) \ -- -XLIBRARY_TYPE=static -Pgnat_util -p -+ -XLIBRARY_TYPE=static -Pgnat_util -p \ -+ -cargs:ada $(ADAFLAGS) -cargs:C $(CFLAGS) --ifeq ($(ENABLE_SHARED), yes) -+build-shared: - ${BUILDER} -m -XOS=$(OS_TYPE) -XBUILD=$(BUILD_TYPE) \ -- -XLIBRARY_TYPE=relocatable -Pgnat_util -p -+ -XLIBRARY_TYPE=relocatable -Pgnat_util -p \ -+ -cargs:ada $(ADAFLAGS) -cargs:C $(CFLAGS) --endif --ifeq ($(ENABLE_PIC), yes) -+build-static-pic: - ${BUILDER} -m -XOS=$(OS_TYPE) -XBUILD=$(BUILD_TYPE) \ -- -XLIBRARY_TYPE=static-pic -Pgnat_util -p -+ -XLIBRARY_TYPE=static-pic -Pgnat_util -p \ -+ -cargs:ada $(ADAFLAGS) -cargs:C $(CFLAGS) -+.PHONY: all -+all: generate_sources -+ $(MAKE) build-static -+ifeq ($(ENABLE_SHARED), yes) -+ $(MAKE) build-shared -+endif -+ifeq ($(ENABLE_PIC), yes) -+ $(MAKE) build-static-pic - endif - - .PHONY: generate_sources -@@ -48,7 +48,7 @@ - $(MKDIR) $(SRC) - $(CP) xsnamest.adb xutil.* snames.adb-tmpl snames.ads-tmpl snames.h-tmpl $(SRC) - (cd $(SRC) && \ -- gnatmake -gnatf -gnatwae -gnatyg -gnatyS xsnamest && \ -+ ${GNATMAKE} -gnatf -gnatwae -gnatyg -gnatyS xsnamest && \ - ./xsnamest && mv snames.ns snames.ads && mv snames.nb snames.adb) - $(CP) sdefault_adb.gnat_util $(SRC)/sdefault.adb - -@@ -58,8 +58,7 @@ - --prefix=$(prefix) --project-subdir=lib/gnat gnat_util - endif - --.PHONY: install --install: install-clean -+install-static: - ${INSTALLER} -p -f -m -XOS=$(OS_TYPE) -XBUILD=$(BUILD_TYPE) \ - -XLIBRARY_TYPE=static \ - --prefix=$(prefix) \ -@@ -67,7 +66,7 @@ - --lib-subdir=lib/gnat_util/static \ - --project-subdir=lib/gnat \ - --build-var=LIBRARY_TYPE --build-name=static -Pgnat_util --ifeq ($(ENABLE_SHARED), yes) -+install-shared: - ${INSTALLER} -p -f -m -XOS=$(OS_TYPE) -XBUILD=$(BUILD_TYPE) \ - -XLIBRARY_TYPE=relocatable \ - --prefix=$(prefix) \ -@@ -75,8 +74,7 @@ - --lib-subdir=lib/gnat_util/relocatable \ - --project-subdir=lib/gnat \ - --build-var=LIBRARY_TYPE --build-name=relocatable -Pgnat_util --endif --ifeq ($(ENABLE_PIC), yes) -+install-static-pic: - ${INSTALLER} -p -f -m -XOS=$(OS_TYPE) -XBUILD=$(BUILD_TYPE) \ - -XLIBRARY_TYPE=static-pic \ - --prefix=$(prefix) \ -@@ -84,6 +82,14 @@ - --lib-subdir=lib/gnat_util/static-pic \ - --project-subdir=lib/gnat \ - --build-var=LIBRARY_TYPE --build-name=static-pic -Pgnat_util -+.PHONY: install -+install: install-clean -+ $(MAKE) install-static -+ifeq ($(ENABLE_SHARED), yes) -+ $(MAKE) install-shared -+endif -+ifeq ($(ENABLE_PIC), yes) -+ $(MAKE) install-static-pic - endif - - .PHONY: clean ---- gnat_util-gpl-2016-src/gnat_util.gpr.old 2017-02-09 22:15:27.153827164 +0100 -+++ gnat_util-gpl-2016-src/gnat_util.gpr 2017-02-09 22:15:38.307627480 +0100 -@@ -31,6 +31,7 @@ - for Default_Switches ("Ada") use ("-O0", "-gnato", "-g", "-gnata"); - for Default_Switches ("C") use ("-g"); - end case; -+ for Driver ("C") use External ("CC", "gcc"); - end Compiler; - - package Builder is diff --git a/dev-ada/gnat_util/files/gnat_util-2017-gentoo.patch b/dev-ada/gnat_util/files/gnat_util-2017-gentoo.patch index 50f74d3a1381..59cb7cf66467 100644 --- a/dev-ada/gnat_util/files/gnat_util-2017-gentoo.patch +++ b/dev-ada/gnat_util/files/gnat_util-2017-gentoo.patch @@ -68,13 +68,3 @@ ${INSTALLER} -p -f -m -XOS=$(OS_TYPE) -XBUILD=$(BUILD_TYPE) \ -XLIBRARY_TYPE=static-pic \ --prefix=$(prefix) \ ---- gnat_util-gpl-2016-src/gnat_util.gpr.old 2017-02-09 22:15:27.153827164 +0100 -+++ gnat_util-gpl-2016-src/gnat_util.gpr 2017-02-09 22:15:38.307627480 +0100 -@@ -31,6 +31,7 @@ - for Default_Switches ("Ada") use ("-O0", "-gnato", "-g", "-gnata"); - for Default_Switches ("C") use ("-g"); - end case; -+ for Driver ("C") use External ("CC", "gcc"); - end Compiler; - - package Builder is diff --git a/dev-ada/gnat_util/gnat_util-2016.ebuild b/dev-ada/gnat_util/gnat_util-2016.ebuild deleted file mode 100644 index e9a5d9effb9d..000000000000 --- a/dev-ada/gnat_util/gnat_util-2016.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs multiprocessing - -MYP=${PN}-gpl-${PV} - -DESCRIPTION="Provides access to GNAT compiler internals for AdaCore utilities" -HOMEPAGE="http://libre.adacore.com" -SRC_URI="http://mirrors.cdn.adacore.com/art/57399637c7a447658e0affa6 - -> ${MYP}-src.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="+gnat_2016 gnat_2017 +shared static-libs static-pic" - -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}-src - -PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) - -src_compile() { - if use gnat_2016; then - GCC_PV=4.9.4 - else - GCC_PV=6.3.0 - fi - GCC=${CHOST}-gcc-${GCC_PV} - GNATMAKE=${CHOST}-gnatmake-${GCC_PV} - emake GNATMAKE="${GNATMAKE} ${ADAFLAGS}" \ - BUILDER="gprbuild -j$(makeopts_jobs)" generate_sources - if use static-libs; then - emake CC="${GCC}" BUILDER="gprbuild -v -j$(makeopts_jobs)" build-static - fi - for kind in shared static-pic; do - if use ${kind}; then - emake CC="${GCC}" BUILDER="gprbuild -v -j$(makeopts_jobs)" \ - build-${kind} - fi - done -} - -src_install() { - if use static-libs; then - emake prefix="${D}"/usr install-static - fi - for kind in shared static-pic; do - if use ${kind}; then - emake prefix="${D}"/usr install-${kind} - fi - done - einstalldocs -} diff --git a/dev-ada/gnat_util/gnat_util-2017.ebuild b/dev-ada/gnat_util/gnat_util-2017.ebuild index 28c0e6ebb868..de225724a4e8 100644 --- a/dev-ada/gnat_util/gnat_util-2017.ebuild +++ b/dev-ada/gnat_util/gnat_util-2017.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -17,10 +17,11 @@ SLOT="0" KEYWORDS="amd64 x86" IUSE="gnat_2016 +gnat_2017 +shared static-libs static-pic" -RDEPEND="dev-lang/gnat-gpl:6.3.0" +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_2017]" -REQUIRED_USE="!gnat_2016 gnat_2017" + dev-ada/gprbuild[gnat_2016=,gnat_2017=]" +REQUIRED_USE="^^ ( gnat_2016 gnat_2017 )" S="${WORKDIR}"/${MYP}-src @@ -32,16 +33,15 @@ src_compile() { else GCC_PV=6.3.0 fi - GCC=${CHOST}-gcc-${GCC_PV} GNATMAKE=${CHOST}-gnatmake-${GCC_PV} emake GNATMAKE="${GNATMAKE} ${ADAFLAGS}" \ BUILDER="gprbuild -j$(makeopts_jobs)" generate_sources if use static-libs; then - emake CC="${GCC}" BUILDER="gprbuild -v -j$(makeopts_jobs)" build-static + emake BUILDER="gprbuild -v -j$(makeopts_jobs)" build-static fi for kind in shared static-pic; do if use ${kind}; then - emake CC="${GCC}" BUILDER="gprbuild -v -j$(makeopts_jobs)" \ + emake BUILDER="gprbuild -v -j$(makeopts_jobs)" \ build-${kind} fi done diff --git a/dev-ada/gnat_util/gnat_util-2018.ebuild b/dev-ada/gnat_util/gnat_util-2018.ebuild index a60bab1f3254..c7b5206b2a5d 100644 --- a/dev-ada/gnat_util/gnat_util-2018.ebuild +++ b/dev-ada/gnat_util/gnat_util-2018.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -14,7 +14,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a6b LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="gnat_2016 gnat_2017 +gnat_2018 +shared static-libs static-pic" RDEPEND="dev-lang/gnat-gpl:7.3.1" @@ -28,16 +28,15 @@ PATCHES=( "${FILESDIR}"/${PN}-2017-gentoo.patch ) src_compile() { GCC_PV=7.3.1 - GCC=${CHOST}-gcc-${GCC_PV} GNATMAKE=${CHOST}-gnatmake-${GCC_PV} emake GNATMAKE="${GNATMAKE} ${ADAFLAGS}" \ BUILDER="gprbuild -j$(makeopts_jobs)" generate_sources if use static-libs; then - emake CC="${GCC}" BUILDER="gprbuild -v -j$(makeopts_jobs)" build-static + emake BUILDER="gprbuild -v -j$(makeopts_jobs)" build-static fi for kind in shared static-pic; do if use ${kind}; then - emake CC="${GCC}" BUILDER="gprbuild -v -j$(makeopts_jobs)" \ + emake BUILDER="gprbuild -v -j$(makeopts_jobs)" \ build-${kind} fi done diff --git a/dev-ada/gnatcoll-bindings/Manifest b/dev-ada/gnatcoll-bindings/Manifest index 2a3623f00c8b..23c48f2c62dc 100644 --- a/dev-ada/gnatcoll-bindings/Manifest +++ b/dev-ada/gnatcoll-bindings/Manifest @@ -1,4 +1,3 @@ -AUX gnatcoll-bindings-2018-gentoo.patch 1231 BLAKE2B 412d5de713267535d000b6a73a78030a9c1323c8548d4725fe487186c6f4bffd0835e05ebdf9e03a672848096b46065b5deb66d1cb5945fc7ad710a631c9a6c5 SHA512 f0a59191e29353657ddd7f1624512d4eef5e40911275928179d51f08f1466b356bc3702369d48ab7a2d42a8348df65d95392dbfd3b87cde1a66df376b2aa1245 DIST gnatcoll-bindings-gpl-2018-src.tar.gz 100068 BLAKE2B 7e5fe106d421d853135ddaea04b7bf2b306e7d0f054379b4c66b58844ac73270d7c82de549e9440f4ecc672ed7e9df6e2b3c1fea55b67403aaa33b09c124bb9b SHA512 2d42e904ab7324d958b34b103ceb2cf7d9bf620f324578b8d3537c18bcc2b4ba73d553bbec773cde5d57979c3e68bc9eef69f97dd55a3b21e43d464881676295 -EBUILD gnatcoll-bindings-2018.ebuild 2207 BLAKE2B 0eb1b8cdf92c3d37db3bd5d6a9587319530389f2eb6f9abbf4f0a4b42009f7a180d043a401fefc355ccd32d798fb83db7ce74c5ad40f13e70ed46f7b7f54f5dc SHA512 3dfaa068b84de81873cbfa4232bae4070d020c42aa9863785b5630ee3e618cbcbcd1083e668f0a967d6b2cc3d3f7ebe65dbaa6fef478beeea8cd593fb7a96308 +EBUILD gnatcoll-bindings-2018.ebuild 2142 BLAKE2B 8ee5521ae2b74c65a8adff85ae19459c5dfb993184c436d05813236cc8c2bad0b7df87f46e9c1c7efb614020d51cae95f717d0be60fab88229cbfe65d9dc88e9 SHA512 16a17b64f31fbb362c58325efa18da979193befbc642270b240e0b6b36bfe243c1aef67e3b91efba097cb55097ee0b1dadc61bf8faf153d5431a6ceff1d22118 MISC metadata.xml 1317 BLAKE2B 99ea5cb11a8d16c2cde5c902f68f515b2a337d2753453405f2747c72e1d15ba597991ed2bc8d842d1ff127be653d9e59c9e18eec8e034bd5a3bb3726a8ed35a2 SHA512 833bd43bb77645561af5df8ebe904e1b2354ca4be7915aa0fdbe6f6986b116cb8850d91d36bfb1bfd520e037ce93eb206b86488939840e2f64e714f5c1daa083 diff --git a/dev-ada/gnatcoll-bindings/files/gnatcoll-bindings-2018-gentoo.patch b/dev-ada/gnatcoll-bindings/files/gnatcoll-bindings-2018-gentoo.patch deleted file mode 100644 index 79729c228420..000000000000 --- a/dev-ada/gnatcoll-bindings/files/gnatcoll-bindings-2018-gentoo.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- a/gmp/gnatcoll_gmp.gpr 2018-06-18 21:48:15.289991113 +0200 -+++ b/gmp/gnatcoll_gmp.gpr 2018-06-18 21:48:46.869507399 +0200 -@@ -65,7 +65,7 @@ - for Switches ("Ada") use ("-O2", "-gnatn", "-gnatwaCJ"); - for Switches ("C") use ("-O2", "-Wunreachable-code"); - end case; -- -+ for Driver ("C") use External ("GCC", "gcc"); - end Compiler; - - package Binder is ---- a/iconv/gnatcoll_iconv.gpr 2018-10-10 08:24:48.654714484 +0200 -+++ b/iconv/gnatcoll_iconv.gpr 2018-10-10 08:24:16.926237733 +0200 -@@ -70,7 +70,7 @@ - for Switches ("Ada") use ("-O2", "-gnatn", "-gnatwaCJ"); - for Switches ("C") use ("-O2", "-Wunreachable-code"); - end case; -- -+ for Driver ("C") use External ("GCC", "gcc"); - end Compiler; - - package Binder is ---- a/python/gnatcoll_python.gpr 2018-10-10 08:28:04.700481915 +0200 -+++ b/python/gnatcoll_python.gpr 2018-10-10 08:27:33.880990030 +0200 -@@ -75,6 +75,7 @@ - for Switches ("Ada") use ("-O2", "-gnatn", "-gnatwaCJ"); - for Switches ("C") use ("-O2", "-Wunreachable-code") & Split(Python_CFLAGS, " "); - end case; -+ for Driver ("C") use External ("GCC", "gcc"); - end Compiler; - - package Binder is diff --git a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2018.ebuild b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2018.ebuild index 8c6d81608c04..5d7f13c2235f 100644 --- a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2018.ebuild +++ b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2018.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -15,7 +15,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/5b0ce9cfc7a4475261f97ca5 LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="gnat_2016 gnat_2017 +gnat_2018 gmp iconv python readline +shared static-libs static-pic syslog" @@ -26,20 +26,14 @@ RDEPEND="python? ( ${PYTHON_DEPS} ) DEPEND="${RDEPEND} dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018=]" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) !gnat_2016" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" S="${WORKDIR}"/${MYP}-src -PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) - src_compile() { - if use gnat_2017; then - GCC_VER=6.3.0 - else - GCC_VER=7.3.1 - fi build () { - GCC=${CHOST}-gcc-${GCC_VER} gprbuild -j$(makeopts_jobs) -m -p -v \ + gprbuild -j$(makeopts_jobs) -m -p -v \ + -XGPR_BUILD=$2 -XGNATCOLL_CORE_BUILD=$2 \ -XLIBRARY_TYPE=$2 -P $1/gnatcoll_$1.gpr -XBUILD="PROD" \ -XGNATCOLL_ICONV_OPT= -XGNATCOLL_PYTHON_CFLAGS="-I$(python_get_includedir)" \ -XGNATCOLL_PYTHON_LIBS=$(python_get_library_path) \ @@ -61,6 +55,7 @@ src_compile() { src_install() { build () { gprinstall -p -f -XBUILD=PROD --prefix="${D}"/usr -XLIBRARY_TYPE=$2 \ + -XGPR_BUILD=$2 -XGNATCOLL_CORE_BUILD=$2 \ -XGNATCOLL_ICONV_OPT= -P $1/gnatcoll_$1.gpr --build-name=$2 } for kind in shared static-libs static-pic ; do diff --git a/dev-ada/gnatcoll-core/Manifest b/dev-ada/gnatcoll-core/Manifest index 66dea9241c31..8cb80024c715 100644 --- a/dev-ada/gnatcoll-core/Manifest +++ b/dev-ada/gnatcoll-core/Manifest @@ -1,4 +1,4 @@ -AUX gnatcoll-core-2018-gentoo.patch 861 BLAKE2B 3bf6c4310fb02c20b780d7382fd8465774354c6132a0cc413d683fa2a2bdc8b0cc3dde2e7ca99dac8d00a231b002345d3be01e68da5c876f5d34c2f601ffc5c5 SHA512 4f211b71d5da88983d0c111aafc48c12c9486dec854e903f4ad352d61a48c097994aaf5679c42fb8f74a35c35d73ef6c33e814bf6ea391538ab4e3b5d1253368 +AUX gnatcoll-core-2018-gentoo.patch 555 BLAKE2B d0913c845f4f7d96afbcec5d400599535417ee1c7b0d9f3c1e0c8766218c6a2556ff2de3e39febc1882b31e947876ca0849fad1564970f422530e58a8966c638 SHA512 90ef785337cb85aa7e2e2b5d0a24efc963512aa19780b215a96a1db6d980e55ff3b1409939e6d77913bf6416d158402ca900fd3ccc4cfb5362ee7440dfb42b64 DIST gnatcoll-core-gpl-2018-src.tar.gz 1657129 BLAKE2B 616aef931fb542f4a022c63db53acb0f8b4323e3b948eb7b8b5688c36817b3f52b5f517b969b0560b6492d51a3e59c8350449cbbe7246b5294c45caeead4d9d6 SHA512 bf6082573dc537836ea8506a2c9a75dc7837440c35c5b02a52add52e38290d99e90a9706690591f8899b8b4935824b195f230b3aa1c4da10911e3caf954c04ac -EBUILD gnatcoll-core-2018.ebuild 1675 BLAKE2B 913974fecd9ede02d75193a2fe577a078ad771d53cf04f987ef4b6d036f79d9296e382b44bab0ae8d546b78996a16b4c75d3f42a04516babc2c1b7f5ddc7776a SHA512 422c0ceff9792bf92af4746b108e40f39427bc2904ffcda4df3449a6aa5bffd2e049fb7d84666f68716824566a87e3b990a74233e330bc378fac44ddebd25ba6 +EBUILD gnatcoll-core-2018.ebuild 1657 BLAKE2B 65f2a5a2f354b4582607e90d278099cdc17f9dfa416639e39c095f991b531d01c45256d059b30a9f26c41393c52f6f84d9e91cf8e073b3f6d314f7585334bc1f SHA512 17303963480f1335c29d4af93e2038f128a676a2a62ced9a77cf4434892b1bc94356992f55af24f3dee18f4cc9f5b65c10a799298bcee691a1d84a891cf46881 MISC metadata.xml 1331 BLAKE2B 0227dacfedf39550b497596c95191f5c8524b9aaaaa19dbab296f4e34fe3ff3ea32f4f92a40c16194204661229986ad90a527131d4bb97decf1b6bd59b911884 SHA512 008d3836de7baa71b8d3655e3e7834d68a7ec304345bfda8a715416e46fa5255185336f84f6b75dbf7a85d24afebd0fdb85131b52ce7c655635e09b42bc1907e diff --git a/dev-ada/gnatcoll-core/files/gnatcoll-core-2018-gentoo.patch b/dev-ada/gnatcoll-core/files/gnatcoll-core-2018-gentoo.patch index cedf710c0363..dcbe89df7837 100644 --- a/dev-ada/gnatcoll-core/files/gnatcoll-core-2018-gentoo.patch +++ b/dev-ada/gnatcoll-core/files/gnatcoll-core-2018-gentoo.patch @@ -1,13 +1,3 @@ ---- a/gnatcoll.gpr 2018-06-12 21:37:42.664733336 +0200 -+++ b/gnatcoll.gpr 2018-06-12 21:38:07.965360000 +0200 -@@ -115,6 +115,7 @@ - - for Switches ("gnatcoll_support.c") use - Compiler'Switches ("C") & Extra_Switches; -+ for Driver ("C") use External ("GCC", "gcc"); - - end Compiler; - --- a/src/gnatcoll-projects.ads.old 2017-11-25 14:50:06.919939453 +0100 +++ b/src/gnatcoll-projects.ads 2017-11-25 14:50:38.932387204 +0100 @@ -1917,7 +1917,8 @@ diff --git a/dev-ada/gnatcoll-core/gnatcoll-core-2018.ebuild b/dev-ada/gnatcoll-core/gnatcoll-core-2018.ebuild index 88fa2a1f45ac..37d1058f21c9 100644 --- a/dev-ada/gnatcoll-core/gnatcoll-core-2018.ebuild +++ b/dev-ada/gnatcoll-core/gnatcoll-core-2018.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -13,7 +13,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a99 LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="gnat_2016 gnat_2017 +gnat_2018 +shared static-libs static-pic" RDEPEND=" @@ -23,14 +23,14 @@ RDEPEND=" DEPEND="${RDEPEND} dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018=]" -REQUIRED_USE="!gnat_2016" - S="${WORKDIR}"/${MYP}-src PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) src_prepare() { - if use gnat_2017; then + if use gnat_2016; then + GCC_PV=4.9.4 + elif use gnat_2017; then GCC_PV=6.3.0 else GCC_PV=7.3.1 @@ -48,7 +48,7 @@ src_configure() { src_compile() { build () { - GCC=${CHOST}-gcc-${GCC_PV} gprbuild -p -m -j$(makeopts_jobs) \ + gprbuild -p -m -j$(makeopts_jobs) \ -XBUILD=PROD -v -XGNATCOLL_VERSION=${PV} \ -XLIBRARY_TYPE=$1 -XXMLADA_BUILD=$* -XGPR_BUILD=$1 \ gnatcoll.gpr -cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} || die diff --git a/dev-ada/gnatcoll-db/Manifest b/dev-ada/gnatcoll-db/Manifest index b52ff447e90e..fb72a19daba7 100644 --- a/dev-ada/gnatcoll-db/Manifest +++ b/dev-ada/gnatcoll-db/Manifest @@ -1,4 +1,4 @@ -AUX gnatcoll-db-2018-gentoo.patch 785 BLAKE2B 9136909b36568f624271e3244847702df3b53a86675e819989f32da258ace77d6b96e4a11cd8881a04f4348c44ec287274256909af8e94be3a0d9d95bffa4b9f SHA512 036434974dd482f6945beb23ab857961d6a92feb37b91bbe6f0cad74a1ebec81332cd7df872050720c52c784d6d0cbf9f0d856b832d940e156327093bdacba4d +AUX gnatcoll-db-2018-gentoo.patch 361 BLAKE2B c7b15cb7433a5bb0f9fee68df4594a390d8d77ccd027e583dd14037a7a1319e727c99fbf4dc81de97ff457f1e0f6b237d1436f6b336668aca956fc5c083cbab6 SHA512 4d90c530bfa6948282c61c6df92a32aa8e03fa794768568ce10dda9a43cd3b56970761a0bd30913ae51f0a2605f2bc0ecc2124561982c7951985c35a974264e7 DIST gnatcoll-db-gpl-2018-src.tar.gz 2375712 BLAKE2B d5678bdc0993b67d93bdd4cb33ee3ecba15f7cdeead173caaaa08312103505d97099037215a3b0699296aadfa0ef68327f28e01c6229db1fefc5b7d7ebf93187 SHA512 02c967b5951ef0e17e58874e03c9a6252f9c4b28100c9530fb88212e91bc692545f3acc8623477942db220bd54d56b494150b088d05c40f6a24aad8cf6a8f8de -EBUILD gnatcoll-db-2018.ebuild 2693 BLAKE2B fef5d254fa6c2a9825c4bc80e0de292b6129b2b9bca38ec80860236f2d4976df8ebf39210606b3b694cd74facbf0c1768667fe535983a1bed917c2c708ee8d74 SHA512 bfa5011db3a17d292fe4c0f5867c8066c52762d8d89fdcad1c35429d848271a1348308c0bbdb1399b4a7bf64c605d00ded547cca72b2f20e55ff213d5bda4f2d +EBUILD gnatcoll-db-2018.ebuild 2633 BLAKE2B 87dd5f392ab6986ba13268ca70c7c873486471c9dd4e62f8160666a149a386249693506c244b02b455f47f033c28325da27c7ca893ca93a7cae4a39a1fa9e8d8 SHA512 5e0885514dc75800d83b444f53d5487b1c0ea3faf04581335f876cd64b2631ba541f76fc5bb1b704190f20c13ba9421e0bd7ac7d0e336654de3e3f16f7de2280 MISC metadata.xml 1519 BLAKE2B 93aa938ca272fb984d08a0471ff339204d0afc854f9fddc4c1f0e060650263c36166e1de91453bdfd52bc0d53844c7042c6f5b14d955b72ab042e6dffadaf4f4 SHA512 27cf0aa52080186fd7970dc02f31eb861ee20edc08366926ea29ec0a826d10c92d80eea840a403fe9be1ccf0be33aaf866f94fe66d351926ffb30104ce143e88 diff --git a/dev-ada/gnatcoll-db/files/gnatcoll-db-2018-gentoo.patch b/dev-ada/gnatcoll-db/files/gnatcoll-db-2018-gentoo.patch index e6d5119aed4e..9d95a9bfc1c4 100644 --- a/dev-ada/gnatcoll-db/files/gnatcoll-db-2018-gentoo.patch +++ b/dev-ada/gnatcoll-db/files/gnatcoll-db-2018-gentoo.patch @@ -9,13 +9,3 @@ Thread_Lib := (); ---- a/postgres/gnatcoll_postgres.gpr 2018-06-24 16:39:56.345322365 +0200 -+++ b/postgres/gnatcoll_postgres.gpr 2018-06-24 16:40:30.737772583 +0200 -@@ -81,6 +81,7 @@ - for Switches ("Ada") use ("-O2", "-gnatn", "-gnatwaCJ"); - for Switches ("C") use ("-O2", "-Wunreachable-code") & PQP_Flag; - end case; -+ for Driver ("C") use External ("GCC", "gcc"); - end Compiler; - - package Binder is diff --git a/dev-ada/gnatcoll-db/gnatcoll-db-2018.ebuild b/dev-ada/gnatcoll-db/gnatcoll-db-2018.ebuild index 48085f332679..bce7b5b49aef 100644 --- a/dev-ada/gnatcoll-db/gnatcoll-db-2018.ebuild +++ b/dev-ada/gnatcoll-db/gnatcoll-db-2018.ebuild @@ -14,7 +14,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/5b0ce9cbc7a4475263382be6 LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="gnat_2016 gnat_2017 +gnat_2018 gnatcoll_db2ada gnatinspect postgres +shared sql sqlite static-libs static-pic xref" @@ -29,8 +29,7 @@ RDEPEND="dev-ada/gnatcoll-core[gnat_2016=,gnat_2017=,gnat_2018=] DEPEND="${RDEPEND} dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018=]" -REQUIRED_USE="!gnat_2016 - gnatinspect? ( xref ) +REQUIRED_USE="gnatinspect? ( xref ) xref? ( sqlite ) sqlite? ( sql ) gnatcoll_db2ada? ( sql )" @@ -40,10 +39,8 @@ S="${WORKDIR}"/${MYP}-src PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) src_compile() { - GCC_PV=7.3.1 build () { - GCC=${CHOST}-gcc-${GCC_PV} \ - GPR_PROJECT_PATH="${S}/sql":"${S}/sqlite":"${S}/xref" \ + GPR_PROJECT_PATH="${S}/sql":"${S}/sqlite":"${S}/xref" \ gprbuild -p -m -v -j$(makeopts_jobs) -XGNATCOLL_SQLITE=external \ -XGNATCOLL_VERSION=2018 \ -XBUILD=PROD -XLIBRARY_TYPE=$2 -XXMLADA_BUILD=$2 -XGPR_BUILD=$2 \ diff --git a/dev-ada/gnatcoll/Manifest b/dev-ada/gnatcoll/Manifest index 11bd5f56b0ce..8e9585c2dcda 100644 --- a/dev-ada/gnatcoll/Manifest +++ b/dev-ada/gnatcoll/Manifest @@ -1,4 +1,4 @@ -AUX gnatcoll-2017-gentoo.patch 5731 BLAKE2B 392f9cd7f76b835c03646a52eb651bad4094f7ebb51f36a1168ce36b5ab9ff29f287437aa9fd9f2f1a5351f4ee04dbd3a21ea096f0e918d1c61b5822c14c552c SHA512 d15a05823419e763e96cc8d8c8202cac30511d555413fa9b45a79275b5325dda53271b7dbb2cc3a7d1583269b32738a82f3adcb0282bdee4588247c9e8b32e12 +AUX gnatcoll-2017-gentoo.patch 7843 BLAKE2B 1a7a7cc1bb1ad94f65fced28888c37acc3cc3711b0c488413313357551f3109e818f25eeba5fe25448f8362256ed5e8bccb6c5b67fe8195492d0e3b1e271f78b SHA512 d2eef0a5d4fecba7f081b97fc7c78efdb6dad76b492b1711e5c5d47b88ae621ca6826497668c9363ee16e36aaeb0e4978cc978c8688d3b346c3dd08b96a8537c DIST gnatcoll-gpl-2017-src.tar.gz 5785988 BLAKE2B 828aff797f7d992bf3f5dda7f8ce8a79e97ecd98253a657fb6e79a2fd08aac97e19cb421f47010f8c1f26442a013b9126ab3a95353d9ce0f29d071601e9dfe2f SHA512 e8b7f2c00816597f33496168bf8928841a2037e517908810761849e23633b2c229d47e4bfaa808e5a619da52bc165f17b8aefa5dee39ecf1a6773b3b1db80363 -EBUILD gnatcoll-2017.ebuild 3176 BLAKE2B b271efb01c404f10f97b247300d1157fc873ac60cd6abe335fb68c84de60bc16cf433da1b73a21cb1462d2219b550acf0e1e1282e749f4f3e6f7171f63fa0d44 SHA512 8a4a005d7bb43b15873744a2de1b19dbb6e318d257fab99429e36f181337b3bf9ab73f0e0b29d331a099549d50fc9e38f7192ecbd9338f85cc0af7230f1947da -MISC metadata.xml 1362 BLAKE2B 0660675cc1821ffb20a9a80bce768db18252bf049f6f52cf3389a7681cc4a31b040350008e6477a2259c8faba5689525586cd35cdf4bcb9df298941021c5a0bd SHA512 64620ff6da6c812968ac057a3724b9733d4d14e1cacd654bf750efe33f64910ae74da07bbca0d6996f58405c083636e574f1b93958d0fe4447e1896ded2b3940 +EBUILD gnatcoll-2017.ebuild 3250 BLAKE2B d19995ce79c3a0ba473a5e05ca7b9693c5069bc4bad9c291678792e5db5905946adf465e25156c8d6428333c5c6f8d0794e541fa6da6f48f9129e45ee65b60f2 SHA512 6aaabb4e81fedbaa892c0e1c2ac03dbf16a43e2498fcd994b7d953463157df4562d5ef2ccae852edcc2576e46f23300bb0ec84ee10e5576bcfc04679a4a55246 +MISC metadata.xml 1438 BLAKE2B 29ae4896a6c86b1e7e507d4c9a91a553ae363633221762dae9e4e46e5c604e1b1c93ac663975c659e1f316a8affafad25c7c789dd0b528add09d1bfb40e623fb SHA512 919a5c34fcf3a0b55a5d90f8749f7983e7ef4b75ecf25fad33ceb8d335ebd799d203eb126ad99296bc5a838f3d117e48a41299d245ce88a35a1f602cbc81ebed diff --git a/dev-ada/gnatcoll/files/gnatcoll-2017-gentoo.patch b/dev-ada/gnatcoll/files/gnatcoll-2017-gentoo.patch index 36da82626f4c..f0ec53f368ea 100644 --- a/dev-ada/gnatcoll/files/gnatcoll-2017-gentoo.patch +++ b/dev-ada/gnatcoll/files/gnatcoll-2017-gentoo.patch @@ -142,3 +142,65 @@ GNAT_Version => GNAT_Version, Errors => Local_On_Error'Unrestricted_Access); Free (GNAT_Version); +--- a/src/gnatcoll-projects.adb 2018-11-14 18:47:27.760365233 +0100 ++++ b/src/gnatcoll-projects.adb 2018-11-14 19:10:43.961337201 +0100 +@@ -3273,9 +3273,9 @@ + Status : out Status_Type; + Result : out GNATCOLL.VFS.File_Array_Access) + is +- Mains_Str_List : String_List_Access; ++ Mains_Str_List : String_Vectors.Vector; + Closure_Status : GPR.Util.Status_Type; +- Closures_List : String_List_Access; ++ Closures_List : String_Vectors.Vector; + begin + Trace (Me, "Get_Closures"); + +@@ -3287,25 +3287,18 @@ + return; + end if; + +- Mains_Str_List := new String_List (Mains'First .. Mains'Last); + for I in Mains'Range loop +- Mains_Str_List (I) := new String'(Mains (I).Display_Base_Name); ++ Mains_Str_List.Append (Mains (I).Display_Base_Name); + end loop; + + GPR.Util.Get_Closures + (Project.Get_View, Project.Tree_View, +- Mains => Mains_Str_List.all, ++ Mains => Mains_Str_List, + All_Projects => All_Projects, + Include_Externally_Built => Include_Externally_Built, + Status => Closure_Status, + Result => Closures_List); + +- -- Freeing temporary list of mains. +- for I in Mains_Str_List'Range loop +- Free (Mains_Str_List (I)); +- end loop; +- Free (Mains_Str_List); +- + case Closure_Status is + when Success => + Status := Success; +@@ -3321,17 +3314,10 @@ + end case; + + if Closure_Status in Success | Incomplete_Closure then +- for I in Closures_List'Range loop +- Append (Result, Create (+Closures_List (I).all)); ++ for Closure of Closures_List loop ++ Append (Result, Create (+Closure)); + end loop; + end if; +- +- -- Freeing temporary list of closures. +- for I in Closures_List'Range loop +- Free (Closures_List (I)); +- end loop; +- Free (Closures_List); +- + end Get_Closures; + + ---------------- diff --git a/dev-ada/gnatcoll/gnatcoll-2017.ebuild b/dev-ada/gnatcoll/gnatcoll-2017.ebuild index 8790026af64c..f43af38da683 100644 --- a/dev-ada/gnatcoll/gnatcoll-2017.ebuild +++ b/dev-ada/gnatcoll/gnatcoll-2017.ebuild @@ -35,9 +35,12 @@ RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite ) projects? ( - ~dev-ada/libgpr-2017[gnat_2016=,gnat_2017=,shared?,static-libs?] + ~dev-ada/libgpr-2018[gnat_2016=,gnat_2017=,shared?,static-libs?] dev-ada/xmlada[shared?,static-libs?] - )" + ) + !dev-ada/gnatcoll-core + !dev-ada/gnatcoll-bindings + !dev-ada/gnatcoll-db" DEPEND="${RDEPEND} dev-ada/gprbuild[gnat_2016=,gnat_2017=]" diff --git a/dev-ada/gnatcoll/metadata.xml b/dev-ada/gnatcoll/metadata.xml index df4d11fa0b3a..7ba8da900cc2 100644 --- a/dev-ada/gnatcoll/metadata.xml +++ b/dev-ada/gnatcoll/metadata.xml @@ -1,6 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> + <maintainer type="project"> + <email>ada@gentoo.org</email> + </maintainer> <maintainer type="person"> <email>tupone@gentoo.org</email> <name>Tupone Alfredo</name> diff --git a/dev-ada/gprbuild/Manifest b/dev-ada/gprbuild/Manifest index 244077462e3b..c30ae6cb2416 100644 --- a/dev-ada/gprbuild/Manifest +++ b/dev-ada/gprbuild/Manifest @@ -1,10 +1,10 @@ -AUX gprbuild-2017-config.patch 5387 BLAKE2B 0c4e970a384dfa569b44dfa0596fd8e7302f9259eede555c7c760e9291bcb6e68b65d1c405840ac1f917bced6c768d2fd189514e871071f0ad6d19ee7289a0ee SHA512 71e95e20e8624f3a05f04e4ad0a80c92c0069c854c82a48aab90f1c8e1cbb4cb4f83a0500d04fd77969b41caeac6c67b3f38a7aa16e520b19bb91a0f8ad8c912 +AUX gprbuild-2017-config.patch 5738 BLAKE2B 6089d8aa9fc3654958e46eac7ed22f887dc7017c670df53d4aaec37d937bfea866f99ba1232d3f3c55532b0c4754bed4db074850c1160308eddd3223d4d2c921 SHA512 45fd4b1cf4bf94f333350a4d3b3cdd0efd673f4eb32e8b0c837d8cf08aa87bda2b57749c230785f53807f48fcad67331c82ce1857fffbcb4af395d26a5d8f886 AUX gprbuild-2017-gentoo.patch 3381 BLAKE2B 4e4c4d19db49aa3100f0acb97af90d942ea39fa5cc6cca5e369cd3459fa898406be18b762b33764bcc8f8ad6b007f00a2a1098990efe10f4aff96b80961ab6ce SHA512 a20642a117f61dd82469fafbd07fcd1d652ae8a11e866aafd55fb643fb9582994f94d643a4bbfcd0985534947cc8b48220de7503f83e74234b17838ce4468a66 -AUX gprbuild-2018-gentoo.patch 10903 BLAKE2B ac85c698dd4f0fac0eb2e309cffac073608470408268763a4bea1be4716876fb57271e17b25d98e362dfe8f0b32b7f86f0079352f9a7336e3819fa40c5e05534 SHA512 b2c0a2d0df73d60ab1414675a9cc1cd77adf85076f8904ee7163fb1b2edaa70ebfea6addc6c5bf811d40a55e25d0369c5a25bddf8e6dcbd856fb4ef918d724f2 +AUX gprbuild-2018-gentoo.patch 11203 BLAKE2B 0dc7c1e7bfc4d3864c3e200ebb1e5f4f7f920fa1939cd940f67d72cd0bf9044f0bdf09a51e492f133be1ba3ffa50816531d7038ed60c8d757fb3d60f12da268b SHA512 56c439a97109e805dea79ed624cb8687327170351e760078acc4506f02af7374fe1e51aad57150a8960ee7d904f496e0e4583543f5cbcfce2ba3677600b01ead DIST gprbuild-gpl-2017-src.tar.gz 2454957 BLAKE2B 890e5aa29e9f8fa8b140988ee8e5d6042640c34fe0877acde959de803bf690bb33c63b1c7e7db486f804882bddd77ab76ffbaa4dd27da327e21ed0376cadb99d SHA512 12f3682d64ce0718de4940c1e71a4380b20021805d88543842dbf3b5ce5d518c23a6b2d868565579baf81efa1d8cf05c7778253162f0df5d7adc0eb1865c9f88 DIST gprbuild-gpl-2018-src.tar.gz 2479651 BLAKE2B b0e24f4d97f06fe84569f8f0284e1028fce8e4ae90cfd27ab31ada0988f4f1b37eca4868bc212a21d26fb1a0a7ba6f031062e16d9758ab211e2fee40e25077ab SHA512 d22c0133baa6a0b626a0c1d145b21865bd0699cd8155ca22727272b0f8988c78163410b432ae148e87099e931df19d51ea867981556c79cb1cceb25456333044 DIST xmlada-gpl-2017-src.tar.gz 1578393 BLAKE2B 7b4894040b6044e86c96cbd530ebda5c0cfc4ad0e2b472d46798a93f535aca0916b03385a3aef49bd4e59d508a9665c856360e9cab0a4f67b15091228b629d81 SHA512 371f6adc01550a4bb13204ec0404dc1165438db595f4346813e5a23a155de74c857c40c55adde173919c2fe35b3b91d78b235c9718ee86bc848e62ddfd7fa2b4 DIST xmlada-gpl-2018-src.tar.gz 1582215 BLAKE2B 11012dab19f45507eeb5ce6ebec9a77ceb5dfb7749960922f0f48bb1b0409305fd43466a7af90b48ff0a0cf58612e8859274a92e0fe272b4e57a59b92a1725f1 SHA512 8970c4e68defad66625c1110554dadfc485fbbe42e832987593cf727e98f13dd87c90b84461187dbbe2b1051831e6e70f9f53d6a0cfc07451726d601b2856430 -EBUILD gprbuild-2017-r1.ebuild 2099 BLAKE2B 249b02870c30526a8cf70a647dfb2c6c1d4ba3d32ceb69386e7faafd6e1eb4f36a3353737fb10e3935acf096d2e7d343bc2968cfdee36302ec15a56718e98216 SHA512 752fee648caef4a2bebc57ae3c4fa1679729a52036ae393e6e7527072f94f34afc20a0d05f433909b182769e759372bc2ecae561967f28acbf0079b47f19f48c -EBUILD gprbuild-2018-r3.ebuild 2271 BLAKE2B fd44965ebe8726240a9ff70f545cf0f800ee572b10102b068465393f30aae4f3d95725283a7e6e977853430c95b7f6f86651381c169b9375ba2bedf2c93bca3c SHA512 8cd9902b9678655fecd4da3d52757ed94709dde15352c78b3211ce881cf6b3e89cc444e6d6ba93d3674a3c8a216491c97580adc20e5b7d4a808ab286d2c55bbf +EBUILD gprbuild-2017-r1.ebuild 2207 BLAKE2B 50a99fa4729a7cb8a9689fa23b6f764be7077094101aa7dbe7452002b7b0c5602dbd82924ef1a6252ce6c973ec5f1ed687ef1d773b43ada1d0a5c707c97d564c SHA512 0c0d40bcd506f86da9e9b1e2d1d57163de5e3dc12095e6566251a673ddc236e099460a83be1a47e2b103d30474c168240257a442ebc5f727633fa6608e105b7b +EBUILD gprbuild-2018-r3.ebuild 2115 BLAKE2B 6a30d38af19eb3c18bcacae6aa3bdd6e4315102c5f0c3591df90f31e51fa954c654c975c527b8b93d5190851fda8d50cd894050f36cacd351fc707d06dfbf20c SHA512 91dab25795db0e5acfa4d3a1ce9d3653d94726ad9a8f733437b2ea23cda9db17af81c998fa8b70e5ad8d5abb14f15f59aaf9aaf6f4640b11a471b14a5e0b2099 MISC metadata.xml 1057 BLAKE2B 5f0e5e778d450e3f0d37ad489e0be03f69bdcd35e60d1555468ba69608268d7ff0bbffece8b36cac58a84a5739f381a449fe9684f7d5540ff8817ea5ac2b8562 SHA512 753f7ba070723fb9ae26bdb8580d72656d115c7f5515fc11fe4933a216bd0e0734a0a410bd14011a2cff0cc791a93b132d2bddfe889aea372d955c38dd91e650 diff --git a/dev-ada/gprbuild/files/gprbuild-2017-config.patch b/dev-ada/gprbuild/files/gprbuild-2017-config.patch index 72f1fd829c1c..5dcd58ffb21d 100644 --- a/dev-ada/gprbuild/files/gprbuild-2017-config.patch +++ b/dev-ada/gprbuild/files/gprbuild-2017-config.patch @@ -102,12 +102,21 @@ </configuration> --- a/share/gprconfig/linker.xml 2018-10-27 09:43:17.934862859 +0200 +++ b/share/gprconfig/linker.xml 2018-10-27 09:43:54.127304471 +0200 -@@ -742,7 +742,7 @@ - for Shared_Library_Suffix use ".sl"; - for Library_Auto_Init_Supported use "true"; - for Run_Path_Option use ("-Wl,+b,"); -- for Library_Partial_Linker use ("gcc", "-nostdlib", "-Wl,-r", "-o"); -+ for Library_Partial_Linker use ("gcc-@VER@", "-nostdlib", "-Wl,-r", "-o"); +@@ -814,7 +814,7 @@ + when "arm-android" | "arm-linux-androideabi" => + null; + when others => +- for Library_Partial_Linker use ("${PATH(ada)}${PREFIX(ada)}gcc", "-nostdlib", "-Wl,-r", "-o"); ++ for Library_Partial_Linker use ("${PATH(ada)}${PREFIX(ada)}gcc-@VER@", "-nostdlib", "-Wl,-r", "-no-pie", "-o"); + end case; + </config> + </configuration> +@@ -830,7 +830,7 @@ + <target name="^.*linux.*$" /> + </targets> + <config> +- for Library_Partial_Linker use ("${PATH(ada)}${PREFIX(c)}gcc", "-nostdlib", "-Wl,-r", "-o"); ++ for Library_Partial_Linker use ("${PATH(ada)}${PREFIX(c)}gcc-@VER@", "-nostdlib", "-Wl,-r", "-no-pie", "-o"); + </config> + </configuration> - package Linker is - for Max_Command_Line_Length use "5000"; diff --git a/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch b/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch index 1f967b61d4c7..34936ea1f52b 100644 --- a/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch +++ b/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch @@ -264,12 +264,21 @@ </configuration> --- a/share/gprconfig/linker.xml 2018-10-17 21:36:15.856883517 +0200 +++ b/share/gprconfig/linker.xml 2018-10-17 21:35:15.985896804 +0200 +@@ -1025,7 +1025,7 @@ + </targets> + <config> + for Library_Partial_Linker use +- ("${PATH(ada)}${PREFIX(ada)}gcc", "-nostdlib", "-Wl,-r", "-o"); ++ ("${PATH(ada)}${PREFIX(ada)}gcc-@VER@", "-nostdlib", "-Wl,-r", "-no-pie", "-o"); + </config> + </configuration> + @@ -1044,7 +1044,7 @@ </targets> <config> for Library_Partial_Linker use - ("${PATH(c)}${PREFIX(c)}gcc", "-nostdlib", "-Wl,-r", "-o"); -+ ("${PATH(c)}${PREFIX(c)}gcc-@VER@", "-nostdlib", "-Wl,-r", "-o"); ++ ("${PATH(c)}${PREFIX(c)}gcc-@VER@", "-nostdlib", "-Wl,-r", "-no-pie", "-o"); </config> </configuration> diff --git a/dev-ada/gprbuild/gprbuild-2017-r1.ebuild b/dev-ada/gprbuild/gprbuild-2017-r1.ebuild index df5101ac4bfc..d279f478a5e8 100644 --- a/dev-ada/gprbuild/gprbuild-2017-r1.ebuild +++ b/dev-ada/gprbuild/gprbuild-2017-r1.ebuild @@ -50,6 +50,12 @@ src_prepare() { -e "s:@GNATBIND@:gnatbind-${GCC_PV}:g" \ src/gprlib.adb \ || die + if use gnat_2016; then + sed -i \ + -e 's:"-no-pie", ::g' \ + share/gprconfig/linker.xml \ + || die + fi } src_configure() { diff --git a/dev-ada/gprbuild/gprbuild-2018-r3.ebuild b/dev-ada/gprbuild/gprbuild-2018-r3.ebuild index 719ce8ae4725..a1157f5c3701 100644 --- a/dev-ada/gprbuild/gprbuild-2018-r3.ebuild +++ b/dev-ada/gprbuild/gprbuild-2018-r3.ebuild @@ -30,9 +30,7 @@ REQUIRED_USE="!gnat_2016 ^^ ( gnat_2017 gnat_2018 )" PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) src_prepare() { - if use gnat_2016; then - GCC_PV=4.9.4 - elif use gnat_2017; then + if use gnat_2017; then GCC_PV=6.3.0 else GCC_PV=7.3.1 @@ -49,10 +47,6 @@ src_prepare() { -e "s:@GNATBIND@:gnatbind-${GCC_PV}:g" \ src/gprlib.adb \ || die -# sed -i \ -# -e "s:\"-Wl,-r\":\"-r\":g" \ -# share/gprconfig/linker.xml \ -# || die } src_configure() { @@ -88,6 +82,5 @@ src_install() { doins share/gprconfig/* insinto /usr/share/gpr doins share/_default.gpr - insinto /usr/share/gprconfig einstalldocs } diff --git a/dev-ada/gps-bin/Manifest b/dev-ada/gps-bin/Manifest index b1547d98affc..e68d71a7b0d1 100644 --- a/dev-ada/gps-bin/Manifest +++ b/dev-ada/gps-bin/Manifest @@ -1,3 +1,3 @@ DIST gnat-gpl-2016-x86_64-linux-bin.tar.gz 372813330 BLAKE2B a0374ad730ae275aaedcf5663c30f8e0221af32f14391fe87a3ce0630d4498a1e90671c02830d62f78857571a5a521af91f6db409a7b3c367c7b0f059571eefd SHA512 5115ac3be0badc5125ee048a98230f18363d72107da3325ce602c0e618cee2e3646a0decc00a2388f14bc61bfed51dd0622f365f5f7ee8b0cec2187ebcf8e075 EBUILD gps-bin-2016.ebuild 1500 BLAKE2B 32b2a084ea499feedd0b4933030d0d788bcff87285b28ef8c7a876a533678bf5672d42c2dfe6ac66fb88afbcbc78f39d526d9d29c5b723dc2d283fb3b7e30a3a SHA512 a50cfed20c261764fea8e2311a61511d195bbbc83fda86b0da74e3aef4883c38426e633951a3b817e051cf0786b54f3556fff6cd38e6c6c3a6a63a68f2a9ef8f -MISC metadata.xml 1020 BLAKE2B 31b305e3aa3f0c87a449779685bc366e34b4c8f63989f5180feaa26df90322b276081b4bb2e10c23c3e7d139dc9b96e48c42ef7145646bcd1ef0ec6c106a06fb SHA512 b5c9fcae1f4d37762f6bb0457b245c60b3b96449f68b9fbd0f4c1d919174c18d3c2a82c26e1d0ca02177cbc2480125aac3ff47b61c2404571e85d0588ca9644e +MISC metadata.xml 988 BLAKE2B 001b5bbc39d9e1a046455353977d84243724e8bfb3b112415f366dd6a90f8ffe05456f570919fe7d39f8f71f91ec1780773427ff452920b1f2f6cdee71ee202a SHA512 c13d0d9ae64b8097b42603d8da8b36c03622c18251beba9a9b37e0024a45aaac6e615c010f5befd5b3d043126179d7fcc8a9737bbb09e2f6ea6952ece93e9310 diff --git a/dev-ada/gps-bin/metadata.xml b/dev-ada/gps-bin/metadata.xml index 5c70b5a1629a..2768f4f2cde1 100644 --- a/dev-ada/gps-bin/metadata.xml +++ b/dev-ada/gps-bin/metadata.xml @@ -1,9 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>tupone@gentoo.org</email> - <name>Tupone Alfredo</name> + <maintainer type="project"> + <email>ada@gentoo.org</email> </maintainer> <longdescription lang="en"> GPS, the GNAT Programming Studio, is a cutting-edge Free Software IDE diff --git a/dev-ada/gps/Manifest b/dev-ada/gps/Manifest index 5588fed25962..3c2481f75527 100644 --- a/dev-ada/gps/Manifest +++ b/dev-ada/gps/Manifest @@ -1,9 +1,9 @@ AUX gps-2017-gentoo.patch 13283 BLAKE2B 91b546a0ad1f78fc087980b1366f2e3d22bcc9584df7b975d99122b51a6251ec87532c904411cf4cd95c6898e7a9217a8429cf0157db0f8ad6aef94fed778361 SHA512 82caf18d500d10f6841140f57528726e1dd6d115e5ad6538442af80abe0068b98f137fc35027ded1ef3603e3c7003de0f1ff4cc7eb93d6d8863909fa61fc635b -AUX gps-2018-gentoo.patch 4357 BLAKE2B f0097fb364986857139c96c29bf9abe43b894629518e584b16e949a505252483efe94533d3185a838eaad87af487491bb4a2c1fb1a4a87d0633bd9b731d3b6cc SHA512 5b77e991bf0eb9a873a76e2eaccf0bfc6ce0536c093992292791892793f4483544c39fe473ab60b47479e38ef5ebebc4bd98f9335d906727e442652f3b2ded8d +AUX gps-2018-gentoo.patch 2976 BLAKE2B dd72c2c4c8dc8f971b819eb76b4433dd78c587d79bd903e17be0fd879027638821edaa625a64f355b2355a37fa7472b9c1b1072e06fd24c9c5547369916f2bde SHA512 fbfb23f29de218ca1371e39aed70aa4ef22080a11aa8bcbd13ef3ea6b68f69db9a4c6f6f5c7c0cefa85ef6495685fb9811de2521b3085f2f25d9acce0ad14047 DIST gnat-gpl-2017-x86_64-linux-bin.tar.gz 496338280 BLAKE2B b3eee6d311fb9c20bc8fa7217c0731ca1e91ced38700df1d63d91a16c3fa28dfd44c7c8e867c3a857b88e4f0c8b2a7200fb6a8a630b8403538c4784f8914d1a5 SHA512 01a8f3be9b7b7e83cc5bd4a45137b1d35c6448bc22a88bcaf5d312cd63e11081b6b2fe9f09ad2a27d8f0b6471fc5c1a99573bf3bcee1589329054074eaeef04f DIST gps-gpl-2017-src.tar.gz 41216830 BLAKE2B 51ca89c38fa81888a9cf1831cf97f7e0ad72c444328a29063249a4fe72bbdc8357552d470872e9fbbeaf349ef0427b59fa41a0efb56200a07a9426343c731a57 SHA512 101ecef7f183de1da0c2b09d77f284a5e8c5ae56f34a897c8d471e79fe9a2832742608ff5251197ba2a52b5d9dfee6c6937fc22cd55f6d8f38359b070393cb64 DIST gps-gpl-2018-src.tar.gz 40541905 BLAKE2B abe38dd23d9afede27b4ec8294e3245c12d52d60491b6e7c1b2d120a6f1e5d808fdcfb648e72da31376e2de176f7a039c5493341ad295db33b6a1ce44bb64096 SHA512 da0eaa85eb753f215354c9765272d85378f36ebe207314bab9211642f9d9b505a3d05cdec9de6964ae9139c4f8942a29e06c72db32b2aeb053a694e9c982e470 DIST libadalang-tools-gpl-2018-src.tar.gz 19938182 BLAKE2B 34104f3bc43c165a9b74ba8c0c03ee2f34686bcd06b5ced730f70f654d8b808e129a85566e081830b4f20304c793eefe0af81b56984cf06190302ad2f6a419be SHA512 a1176575944cd88b9da5f4e9f03caa1a4d09358df71e6a91300d0b35c2a843d0ea1a77fbd93e7b7f16cef1b978022ee20991f5c2ff74f7d05878c3de1220f2b5 -EBUILD gps-2017.ebuild 2102 BLAKE2B 6cbd6490b0e1cc1399ae54921abe97a54f28582f40af3485e6cc90535e7be4513cc4bc79dc84e11c477deecf964b1f0553b374cb3fd44bce5c6bd288bb44fef6 SHA512 3237b0abd2ee89851eb2e5232833e7536e501d3e5942329fe0d5c538ca6dd070e865e04b8a16acf237573851acb23d710f2c48ddc4488064f922691c2ca38ce5 -EBUILD gps-2018.ebuild 1837 BLAKE2B 5794a97f5e88cf770bbe035450c9ed5cefdc3a40e183bbaf25ee4c17e9fe4eb758f5454ffa1b5c031ffb25feee1d724a12d1a01e0619d2066883ac8921d63e5a SHA512 b428f2b394f3b1a91884a8a27d6b786120c3b7805e6d9b377a2c8dcf61a02a5c82fb4a630087c6957975af6d57b3ce85badef159ab221b02fd63ef3443f18f7f +EBUILD gps-2017.ebuild 2120 BLAKE2B a78b670ff9915bef812bb51b8a45e26feb1ec109b5cafcc1dbfbe3628aa33a02d32585829424e9660cb3759d464d7aca413c038aa5db2d24f0513ba86d2bfbf9 SHA512 f50681981837153b0df3080992c57c17315afbcc90848fe803b03d504284eb6f4f0a8c24cc2caa6aef2e4b5f29fb70af3b06b3c684e5b37844d350e1fa1150a0 +EBUILD gps-2018.ebuild 2289 BLAKE2B 8e8ad988d31b07636b8f3565198035a612dd4bec959ee8564b9d2f5f169ca3b701d4fad37a16b17eb63ef1ab8b6ea4a3a00ef1e2a9387a894f126bf32773f445 SHA512 ebbc185ea3bdffb2fd21bedd2233e6704a30cfc409f127e90b666160c3302f30b08e7238b01a8314320a1b1ca4ed5def3989c2b771f7b717c8aa6e618c3fba1e MISC metadata.xml 657 BLAKE2B c97ff9ab3140c87cb2066f25c639c3a5053c0775abfe23937b92f912ff71299bf136de797de6fd1010d576ba44f4e1b1f6e7dae4d1e076682382b33482240606 SHA512 498222549bd8c7e48575bdc0250cc810540928b19819759ba8a4f9b3aea39ad1b7b579b988a26b1bcf109774b356c7635e11e5e42a41dc76af8d9230a63f9d91 diff --git a/dev-ada/gps/files/gps-2018-gentoo.patch b/dev-ada/gps/files/gps-2018-gentoo.patch index 06a080b69d56..6e258bac36a0 100644 --- a/dev-ada/gps/files/gps-2018-gentoo.patch +++ b/dev-ada/gps/files/gps-2018-gentoo.patch @@ -75,43 +75,3 @@ <string /> </project_attribute> ---- a/gnatcoll_extras/gnatcoll_extras.gpr 2018-07-22 14:42:17.618161040 +0200 -+++ b/gnatcoll_extras/gnatcoll_extras.gpr 2018-07-22 14:43:33.973070921 +0200 -@@ -14,6 +14,7 @@ - for Switches ("C") use - ("-g", "-O2") - & Shared.Gtk_Cflags & Shared.Pygobject_Include & Shared.Python_Cflags; -+ for Driver ("C") use External ("CC", "gcc"); - end Compiler; - - end GNATCOLL_Extras; ---- a/widgets/widgets.gpr 2018-07-22 21:46:23.907355738 +0200 -+++ b/widgets/widgets.gpr 2018-07-22 21:47:02.673825994 +0200 -@@ -14,6 +14,7 @@ - for Switches ("C") use - ("-g", "-O2") - & Shared.Gtk_Cflags; -+ for Driver ("C") use External ("CC", "gcc"); - end Compiler; - - end Widgets; ---- a/common/common.gpr.in 2018-07-25 08:05:45.227060250 +0200 -+++ b/common/common.gpr.in 2018-07-25 08:06:55.067009811 +0200 -@@ -23,6 +23,7 @@ - for Switches ("dynamic_arrays.adb") use No_Checks; - when "Debug" => - end case; -+ for Driver ("C") use External ("CC", "gcc"); - end Compiler; - - package Binder is ---- a/shared.gpr.in 2018-07-25 08:11:47.317597391 +0200 -+++ b/shared.gpr.in 2018-07-25 08:10:56.774362671 +0200 -@@ -60,6 +60,7 @@ - ); - for Switches ("C") use Optimize & ("-g", "-O2"); - end case; -+ for Driver ("C") use External ("CC", "gcc"); - end Compiler; - - package Binder is diff --git a/dev-ada/gps/gps-2017.ebuild b/dev-ada/gps/gps-2017.ebuild index ebfb812fbce5..0cc43ab49084 100644 --- a/dev-ada/gps/gps-2017.ebuild +++ b/dev-ada/gps/gps-2017.ebuild @@ -16,12 +16,12 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed03b LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="doc gnat_2016 +gnat_2017 gnat_2018" RDEPEND="${PYTHON_DEPS} - >=dev-ada/gnatcoll-2017[gtk,iconv,pygobject,sqlite,static-libs,tools] - >=dev-ada/gtkada-2017 + dev-ada/gnatcoll[gtk,iconv,pygobject,sqlite,static-libs,tools] + ~dev-ada/gtkada-2017 dev-ada/libadalang dev-libs/gobject-introspection dev-libs/libffi @@ -73,6 +73,7 @@ src_compile() { ADAFLAGS+=" -fno-strict-aliasing" emake GPRBUILD_FLAGS="-v ${MAKEOPTS} \ -XLIBRARY_TYPE=relocatable \ + -XGPR_BUILD=relocatable \ -XXMLADA_BUILD=relocatable" } diff --git a/dev-ada/gps/gps-2018.ebuild b/dev-ada/gps/gps-2018.ebuild index 85c357baef7e..15d8e2fb9fa8 100644 --- a/dev-ada/gps/gps-2018.ebuild +++ b/dev-ada/gps/gps-2018.ebuild @@ -3,7 +3,7 @@ EAPI=6 PYTHON_COMPAT=( python2_7 ) -inherit python-single-r1 autotools desktop +inherit python-single-r1 autotools desktop llvm MYP=${PN}-gpl-${PV}-src @@ -16,16 +16,23 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/5b0cf627c7a4475261f97ceb LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" +KEYWORDS="amd64 x86" +IUSE="gnat_2017 +gnat_2018" RDEPEND="${PYTHON_DEPS} - dev-ada/gnatcoll-db[gnatcoll_db2ada,gnatinspect,xref] - dev-ada/gnatcoll-bindings[python] - >=dev-ada/gtkada-2017[gnat_2018] - dev-ada/libadalang[gnat_2018] + dev-ada/gnatcoll-db[gnat_2017=,gnat_2018=,gnatcoll_db2ada,gnatinspect,xref] + dev-ada/gnatcoll-bindings[gnat_2017=,gnat_2018=,python] + ~dev-ada/gtkada-2018[gnat_2017=,gnat_2017=] + dev-ada/libadalang[gnat_2017=,gnat_2018=] dev-libs/gobject-introspection dev-libs/libffi + gnat_2017? ( sys-devel/llvm:5 ) + gnat_2018? ( + || ( + sys-devel/llvm:6 + sys-devel/llvm:7 + ) + ) sys-devel/clang:= x11-themes/adwaita-icon-theme x11-themes/hicolor-icon-theme @@ -40,31 +47,47 @@ S="${WORKDIR}"/${MYP} PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) +pkg_setup() { + if use gnat_2017; then + GCC_PV=6.3.0 + LLVM_MAX_SLOT=5 + else + GCC_PV=7.3.1 + LLVM_MAX_SLOT=7 + fi + GNATMAKE=gnatmake-${GCC_PV} + GNATDRV=gnat-${GCC_PV} + GNATLS=gnatls-${GCC_PV} + llvm_pkg_setup + python-single-r1_pkg_setup +} + src_prepare() { GCC_PV=7.3.1 default sed -i \ - -e "s:@GNATMAKE@:${CHOST}-gnatmake-${GCC_PV}:g" \ - -e "s:@GNAT@:${CHOST}-gnat-${GCC_PV}:g" \ - -e "s:@GNATLS@:${CHOST}-gnatls-${GCC_PV}:g" \ - share/support/core/toolchains.py \ - share/support/core/projects.py \ - || die + -e "s:@GNATMAKE@:${CHOST}-${GNATMAKE}:g" \ + -e "s:@GNAT@:${CHOST}-${GNATDRV}:g" \ + -e "s:@GNATLS@:${CHOST}-${GNATLS}:g" \ + share/support/core/toolchains.py \ + share/support/core/projects.py \ + || die mv "${WORKDIR}"/libadalang-tools-src laltools } src_configure() { econf \ - GNATMAKE=/usr/bin/gnatmake-7.3.1 \ - GNATDRV=/usr/bin/gnat-7.3.1 \ + GNATMAKE=/usr/bin/${GNATMAKE} \ + GNATDRV=/usr/bin/${GNATDRV} \ --with-clang=$(llvm-config --libdir) } src_compile() { - CC=/usr/bin/gcc-7.3.1 emake -C gps GPRBUILD_FLAGS="-v ${MAKEOPTS}" \ + emake -C gps GPRBUILD_FLAGS="-v ${MAKEOPTS} \ + -XGPR_BUILD=relocatable" \ Build=Production gprbuild -v -p -Pcli/cli.gpr ${MAKEOPTS} -XLIBRARY_TYPE=relocatable \ - -cargs:Ada ${ADAFLAGS} + -XGPR_BUILD=relocatable -cargs:Ada ${ADAFLAGS} || die } src_install() { diff --git a/dev-ada/langkit/Manifest b/dev-ada/langkit/Manifest index c22bad97ac71..fa838fd0e45f 100644 --- a/dev-ada/langkit/Manifest +++ b/dev-ada/langkit/Manifest @@ -1,7 +1,7 @@ AUX langkit-2017-gentoo.patch 3616 BLAKE2B 3730635b5cb4a2285e3ef283c903705b8f40194bdb65049ca07f651ea9d122e72e863cf132e096f139b9dc6f57a1d7faf7f333a3580e641caa88d4fea4b22009 SHA512 b69c84f3d79adefb254f764ba06c6d5fda81f95a8070b4b651d7a4f2ad078a48e341e5ad94e5ce7e2f756961d943dde3de891c5825c0e367cf7f816e08a31791 -AUX langkit-2018-gentoo.patch 569 BLAKE2B ea4df3a3651da82c7c61d251a2b330ef735d677f1303113160f7bfcf3c0760d7606d4ac7fdd3484efb3bf2fe23deb8d245a68a6425e2b8c36c2fdf0246ad0b38 SHA512 7a115b3f4307a01b7024571ad878b5c459cddf5c3e79747b9e5d7a64a15ffde75f6eef8225721b5f42821248df03d190030d24ae7f82492c8ff415eb76ca1113 +AUX langkit-2018-gentoo.patch 2962 BLAKE2B 7da72c1739c972c6d1aa01c84e8fab3f8864c5449bb3717c8515c41f63eb1a2258ae9be0cfd5bb3bf54327fbe552c2448aa2fb80d69814c1d46f34611683d7db SHA512 72c6ba5e4994ef22f6246a196fdae81ee5f77f7f0420fd31b9bfecb32740b8878863ba75d342cb0c5326ca7031260aefc21f57d430866f7008515470d9ee0899 DIST langkit-gpl-2018.tar.gz 565649 BLAKE2B e18beea565351eb4b10baa9168db742598817d231c5eab578b17c2b0409ac77b9972f8f426499e086779eaeda0ac1ba11e5cb3b47ecab8e63674b7ef654b26b7 SHA512 62a8820c3fd3d44f6cd22e181f6eddcf52945c93ea5eb793a63b7f13e71705807170b0cc4c3873b127e3fafe751a5dd27da54087986f506f8500b916ef1f078f DIST langkit-gps-src-2017.tar.gz 364589 BLAKE2B 14d80e904ded20a73d65a5828157ea82672559b5bb47e465381989ad3a6e90f41bd0c6db0a5e4f7b7c532fd4f697f9bc8cb3163c6e61106d0d44da994b1c7b28 SHA512 1c86e60710e4def3d430372eed11bf1a27bf82e84c7b787c5a0be15229b6e5f786dbdf830a311423dd7539841de3076d370afc8b4c1b0cddd1bc379372dcdc95 EBUILD langkit-2017.ebuild 911 BLAKE2B f75a3fdec74b278be740b37993909e2627a7f4084d6967c2c9a5a7f41cfa2bfd777e45f5d6143fe88b2ba15ead72d47766d94c59d3283f6c18ab98c7959c409d SHA512 2f2c5939fdb316b63f740e230e442ad33e3ab2bee21b08d3a3688391bc8a40c17a3f9fa578062fe0cd58ea4747c27b8a4ed2689dc1a153043a5bf2d9d04fc1fd -EBUILD langkit-2018.ebuild 985 BLAKE2B 2b4bc94e8e20f93ba4b98e345bcf07b717d3f07075a447bb69d6ae586cff4a1ed7d0dfd2f61aa6636cc6212aa335f17a7ed8301b52d98e6fe133219292225a73 SHA512 e499e41572d61a668707710824865ba431d8e6ef576668c8d31895334014996fd98adde25baa7d0017087102b1eadd8c0b768aab18ace9fa5192838635d4c3e6 +EBUILD langkit-2018.ebuild 917 BLAKE2B a7d50141e6a26768aa62a590670624ca43114c0d66472f5e797a023c40efe03e2e747d10b49cf4cad394e78ea9c41a0cf4b2df980578900d4d6ac8f145499121 SHA512 7cc768a8e9829af8711e0adbcedadd2e1d6e02a6fa21d6f7b2a2a6e7e261e1af2cd5c849b6e8b81272ec615dd3e83ab20b754fc9662dcfa7e14cfe607f5e9151 MISC metadata.xml 748 BLAKE2B 29a7b386b6d8d1b2f2bc8fc16739c28129b7886c8cdae6784d54bfaadea87502a5338ed6113f536e7c5701cefb42d5912f6189dccb55ddd704445ae65f5c4176 SHA512 8a3183336e00f01eeb51a5b7d06833599b408801b71713575d83131d39b82c8c74fda8ce133b352dc356135721ef19ca488ef17723172579cd1507d4c1d7c809 diff --git a/dev-ada/langkit/files/langkit-2018-gentoo.patch b/dev-ada/langkit/files/langkit-2018-gentoo.patch index 52920e906eee..62ff7ce17e54 100644 --- a/dev-ada/langkit/files/langkit-2018-gentoo.patch +++ b/dev-ada/langkit/files/langkit-2018-gentoo.patch @@ -9,3 +9,52 @@ quex_file, "-o", "quex_lexer", "--buffer-element-size", "4", +--- a/langkit/libmanage.py 2018-11-20 21:38:03.042086783 +0100 ++++ b/langkit/libmanage.py 2018-11-20 21:39:50.562273656 +0100 +@@ -682,6 +682,8 @@ + + result = ['-XBUILD_MODE={}'.format(build_mode), + '-XLIBRARY_TYPE={}'.format(library_type), ++ '-XGPR_BUILD={}'.format(library_type), ++ '-XGNATCOLL_CORE_BUILD={}'.format(library_type), + '-XXMLADA_BUILD={}'.format(library_type)] + + enable_build_warnings = getattr(args, 'enable_build_warnings', False) +--- a/testsuite/python_support/utils.py 2018-11-20 21:41:46.156324084 +0100 ++++ b/testsuite/python_support/utils.py 2018-11-20 21:42:26.049651194 +0100 +@@ -203,7 +203,8 @@ + main_sources=', '.join('"{}"'.format(m) for m in ada_main) + )) + run('gprbuild', '-Pgen', '-q', '-p', +- '-XLIBRARY_TYPE=relocatable', '-XXMLADA_BUILD=relocatable') ++ '-XLIBRARY_TYPE=relocatable', '-XGPR_BUILD=relocatable', ++ '-XXMLADA_BUILD=relocatable') + + for i, m in enumerate(ada_main): + assert m.endswith('.adb') +--- a/testsuite/testsuite_support/__init__.py 2018-11-20 21:45:08.828905205 +0100 ++++ b/testsuite/testsuite_support/__init__.py 2018-11-20 21:46:10.837858988 +0100 +@@ -110,7 +110,9 @@ + # Build Langkit_Support so that each testcase does not try to build it + # in parallel. + if not self.global_env['options'].disable_tear_up_builds: +- gargs = ['-p', '-P', self.langkit_support_project_file] ++ gargs = ['-p'] ++ gargs = gargs + ['-XGPR_BUILD=relocatable'] ++ gargs = gargs + ['-P', self.langkit_support_project_file] + cargs = ['-cargs', '-O0', '-g'] + if self.coverage_enabled: + gargs.append('--subdirs=gnatcov') +--- a/testsuite/testsuite_support/base_driver.py 2018-11-20 22:04:54.199973719 +0100 ++++ b/testsuite/testsuite_support/base_driver.py 2018-11-20 22:05:26.498436100 +0100 +@@ -312,7 +312,9 @@ + + :param str project_file: Project file name. + """ +- argv = ['gprbuild', '-P', project_file, '-p'] ++ argv = ['gprbuild'] ++ argv = argv + ['-XGPR_BUILD=relocatable'] ++ argv = argv + ['-P', project_file, '-p'] + cargs = ['-O0', '-g', '-gnata'] + if self.coverage_enabled: + argv.append('--subdirs=gnatcov') diff --git a/dev-ada/langkit/langkit-2018.ebuild b/dev-ada/langkit/langkit-2018.ebuild index 9bb818cf2e8b..3eeaca02add9 100644 --- a/dev-ada/langkit/langkit-2018.ebuild +++ b/dev-ada/langkit/langkit-2018.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -16,15 +16,12 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/5b0cfbefc7a4475263382c2a LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" REQUIRED_USE="${PYTHON_REQUIRED_USE}" DEPEND="${PYTHON_DEPS} - || ( - dev-ada/gnatcoll[gnat_2017,iconv,shared] - dev-ada/gnatcoll-bindings[gnat_2018,iconv,shared] - ) + dev-ada/gnatcoll-bindings[iconv,shared] dev-python/mako dev-python/pyyaml dev-python/enum34 diff --git a/dev-ada/libadalang/Manifest b/dev-ada/libadalang/Manifest index 73935cd23e2e..923854bf431b 100644 --- a/dev-ada/libadalang/Manifest +++ b/dev-ada/libadalang/Manifest @@ -2,7 +2,6 @@ AUX libadalang-2017-gentoo.patch 927 BLAKE2B 3c0a92df8aee109faa4be73bc1950af46fb AUX libadalang-2018-gentoo.patch 678 BLAKE2B ebc0c63b62a0b5c2b53a036de1a71ca33af992dd3774d894f4e0407e291bee15fac5be358c5f2600516ecb15c7b7846c7213b1fdd3c522ecd2f1393247d4b4b4 SHA512 346b561e2db3258e768bc4c4ee92a3ba6977f58de3cdae0ab84df9c31ba178dad3788309db2505c2dc8c8fd4319ef68201499303a6b92d837508a6bd91e49779 DIST libadalang-2017-src.tar.gz 1862217 BLAKE2B 58f72726285e56a15278e85902fabf988327ea86a08cc6c86271d61075a6b19a0bffa86e5302f5c32e6d35ef95473ad747853b14899a12d09d49d656f4e6559e SHA512 c8663a7214c3c1dd73a6589a6db10d219fcd2db39ba2ce184eea85272c5f206ab0aa8d13b0e19b08a5996906c7fbddd479795363ec22e889dfceda9967c346c7 DIST libadalang-gpl-2018-src.tar.gz 1990774 BLAKE2B ffad46d4988de7fb8c9bf94d24360a726c59e3c70a2318725a59e0b6b62351e8f5d8dd6501964618607122e3c7cb3bda0e1181818c68324d4067d59ac93e2b1c SHA512 b95196323097065be2996ced767f8f89fb77445f99c249d84043c68d926d61c78b310b4fef0699d08f9112dc423596c076f452745469a75a8467c35b5e10ac2c -EBUILD libadalang-2017-r1.ebuild 1085 BLAKE2B 2239f79e2282925ee0cccda64f41cbf9bd459de1e04f09bdf5be73bd0f01a86d00fc7249c13e8e06373b5a69268ddd5b623a973162da8551b91027b14b9f496e SHA512 b6513432ff0c96cb159325c47aa2af4fc6ab19437c43c94d213f35eb0c1b89226e182da0f80cfb8935e61d50da82731af7e94cd8193f7c26e3472a7918a57976 -EBUILD libadalang-2017.ebuild 1038 BLAKE2B 728c3c30f2b791e8fc88f49f3726118d24221d7b2dd782b08a866c816cbdc3dc0d156022ae2fa61c6e5c891195e898ee8fd4b696d32ffa030568340530f3e44d SHA512 531f5f84f4685038efa9d1bf742aaff2826b0445216d6c7f5664f35d9642f799ea1d50295ec700d7861f6c74b77024fab68175890b89d5189f418fead58bfd6e -EBUILD libadalang-2018.ebuild 1341 BLAKE2B 2440d20e69e4991a5e0f28f47658080c6c2a3784e6339ae85f01d053dfa5f93c4c8aeb31cdcac4be5c5e99b6c59ef7f30963281604428ad1d539cf5890f49020 SHA512 53570131296ef159031711c777d9b20dc34cc2171f3aea67608267f775ccc1bfaa2b5318952c318868a6bfdc812425c2e6d1d00bb3fcefaa487bd70ebfe58c54 +EBUILD libadalang-2017-r1.ebuild 1089 BLAKE2B ff0e7e37c2f2cf5f7ce0d38b5d0efc073edaf16aa77d65bcf5edad54d234549c33a105164e417a7dc838300415568d34bd2a1dbf3d5d07df99a5e00b2940c331 SHA512 1673bb70bc3a2f323b8ca3cc00d2213e5b6ee81eb90319776845b2ec797ebfca1709ce264cfbe995a76f5ca5d0dd9d91bc80b812d94fef650cc3f6e98b8c5510 +EBUILD libadalang-2018.ebuild 1328 BLAKE2B 2383fa22a63f725534503d4b70887f68ad807f64290737075b5dc010410006e8c7a2e0ad337f051a887e2982de9096a79a89d2e29252a4f947c5f01fd2fd262b SHA512 2cbb2b9c76b319326a2717be045993d1f465dcfcb4b80b06438a2918d6a3c0dc22c864ffc5a125453ea7fa8159318b36cd63a058f28bc02c17359a83a7c1fe56 MISC metadata.xml 810 BLAKE2B 89dbced5c050ba4dea4ba0537cda9512bc534bee25aa8260cd7ac30129ada091ced7c37d29efdbf11ceac9e295171e84b248d186cfb11b2072fd2beb7997089a SHA512 6857c4ac7b2cd9de167039889a99d9cdac1ba0235379f36630d51e075f1fbfccab974bbd9f34a1be08cab7869c8dbc5ec14da9ff4ec6225bd89470c350f22ebd diff --git a/dev-ada/libadalang/libadalang-2017-r1.ebuild b/dev-ada/libadalang/libadalang-2017-r1.ebuild index b4185f05c645..ef338c304996 100644 --- a/dev-ada/libadalang/libadalang-2017-r1.ebuild +++ b/dev-ada/libadalang/libadalang-2017-r1.ebuild @@ -14,14 +14,14 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed042 LICENSE="GPL-3 gcc-runtime-library-exception-3.1" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="gnat_2016 +gnat_2017" RDEPEND="dev-python/pyyaml dev-ada/gnatcoll[projects,shared,gnat_2016=,gnat_2017=] ${PYTHON_DEPS}" DEPEND="${RDEPEND} - dev-ada/langkit" + ~dev-ada/langkit-2017" REQUIRED_USE="${PYTHON_REQUIRED_USE}" S="${WORKDIR}"/${PN}-gps-src diff --git a/dev-ada/libadalang/libadalang-2017.ebuild b/dev-ada/libadalang/libadalang-2017.ebuild deleted file mode 100644 index 3856ef26ccef..000000000000 --- a/dev-ada/libadalang/libadalang-2017.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) - -inherit python-single-r1 - -DESCRIPTION="high performance semantic engine for the Ada programming language" -HOMEPAGE="https://libre.adacore.com/" -SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed042 - -> ${P}-src.tar.gz" - -LICENSE="GPL-3 gcc-runtime-library-exception-3.1" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="gnat_2016 +gnat_2017" - -RDEPEND="dev-python/pyyaml - dev-ada/gnatcoll[projects,shared,gnat_2016=,gnat_2017=] - ${PYTHON_DEPS}" -DEPEND="${RDEPEND} - dev-ada/langkit" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -S="${WORKDIR}"/${PN}-gps-src - -src_prepare() { - default - rm -r ada/testsuite/tests/acats_parse || die -} - -src_configure() { - ada/manage.py generate || die -} - -src_compile() { - ada/manage.py --verbosity=debug build || die -} - -src_test () { - ada/manage.py test | grep FAILED && die -} - -src_install () { - ada/manage.py install "${D}"usr - python_domodule build/python/libadalang.py -} diff --git a/dev-ada/libadalang/libadalang-2018.ebuild b/dev-ada/libadalang/libadalang-2018.ebuild index 7a0db2177830..6ac7ffb8994b 100644 --- a/dev-ada/libadalang/libadalang-2018.ebuild +++ b/dev-ada/libadalang/libadalang-2018.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -15,17 +15,12 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/5b0cf9adc7a4475263382c18 LICENSE="GPL-3 gcc-runtime-library-exception-3.1" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="gnat_2016 gnat_2017 +gnat_2018 +shared static-libs" RDEPEND="dev-python/pyyaml - || ( - dev-ada/gnatcoll[projects,shared,gnat_2016=,gnat_2017=] - ( - dev-ada/gnatcoll-bindings[gnat_2016=,gnat_2017=,gnat_2018=] - dev-ada/gnatcoll-bindings[iconv,shared=,static-libs=] - ) - ) + dev-ada/gnatcoll-bindings[gnat_2016=,gnat_2017=,gnat_2018=] + dev-ada/gnatcoll-bindings[iconv,shared=,static-libs=] ${PYTHON_DEPS}" DEPEND="${RDEPEND} >=dev-ada/langkit-2018" @@ -33,7 +28,10 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" S="${WORKDIR}"/${MYP} -PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) +PATCHES=( + "${FILESDIR}"/${P}-gentoo.patch + "${FILESDIR}"/${PN}-2017-gentoo.patch +) src_configure() { ada/manage.py -v debug generate || die @@ -57,4 +55,5 @@ src_install () { $(use_enable static-libs static) \ install "${D}"usr || die python_domodule build/python/libadalang.py + rm -r "${D}"usr/python || die } diff --git a/dev-ada/libgpr/Manifest b/dev-ada/libgpr/Manifest index d05da8d64096..71ae0a8d2181 100644 --- a/dev-ada/libgpr/Manifest +++ b/dev-ada/libgpr/Manifest @@ -1,7 +1,4 @@ -AUX libgpr-2016-gentoo.patch 2831 BLAKE2B 2f9083ab7e9b75662b224527def3033f1f9f2bd5836fc7812e3c551865e4c3eaab4ef9abdb3c0c06d19aa9aad6ab63a61153ea6fefccc3556ed5587bc5761cb0 SHA512 e807bbccbd5514e9f2919937de657cac306b063ece2d87e0defd41e1dcbbf00faca488699f3c2cfa99118da4b569baaee1610b5aaa65a5bdf6c0859bd06c1b9a AUX libgpr-2018-gentoo.patch 1691 BLAKE2B 4e11098f835d9d0adbd6a4eed0e63f71140eb68d0e350fd52303a0d21c308e483556b31ce84ba97a7fccddfc91e519a6ae8f999d87258c0d4f4ee473597f7267 SHA512 959e4e63c3367fd98878a2004d0fac981a1acc2a29e35960a27f2ca48b4557fc16148aa052cdba590f208c8b23832f3bc2f3959523f6e54eb8dfe2e87812f285 -DIST gprbuild-gpl-2017-src.tar.gz 2454957 BLAKE2B 890e5aa29e9f8fa8b140988ee8e5d6042640c34fe0877acde959de803bf690bb33c63b1c7e7db486f804882bddd77ab76ffbaa4dd27da327e21ed0376cadb99d SHA512 12f3682d64ce0718de4940c1e71a4380b20021805d88543842dbf3b5ce5d518c23a6b2d868565579baf81efa1d8cf05c7778253162f0df5d7adc0eb1865c9f88 DIST gprbuild-gpl-2018-src.tar.gz 2479651 BLAKE2B b0e24f4d97f06fe84569f8f0284e1028fce8e4ae90cfd27ab31ada0988f4f1b37eca4868bc212a21d26fb1a0a7ba6f031062e16d9758ab211e2fee40e25077ab SHA512 d22c0133baa6a0b626a0c1d145b21865bd0699cd8155ca22727272b0f8988c78163410b432ae148e87099e931df19d51ea867981556c79cb1cceb25456333044 -EBUILD libgpr-2017.ebuild 1299 BLAKE2B c152fef9cef6867ec0b3b04c3756ec3b2c247a72e1c4bf4e5933d817cda35720a729a9fd0d29705bf994ec5d18681501eed752b58d04a9cd161cf6f03b826509 SHA512 dff8e1a99b64f347a1aa1ba5d2675608d1b86a2ff3c5dc125a5b800fd3350278e444573eeb0e272334f28aead87d088e9983604329c6ba628657503e1d6b7861 -EBUILD libgpr-2018.ebuild 1425 BLAKE2B b3e1b294e1028b9a975b75f8b634ef878ef9ae3525c24b0fd4870d36230763106e1caacbfd4e8b09ceac1b9c2f8612b6aca65ad302750fddbf517afd8a23ab15 SHA512 38c68f42fdfa6286668efb0ca7cd2c75e102d92eb26985d28bb34480e3a972025c0263c5f8f42e9cb0c982ae4405157bec6a9295b857870319271aa0dcd224b1 +EBUILD libgpr-2018.ebuild 1418 BLAKE2B ea2cd84edd7c32b6094559a9de24d8ac0ff84806b6f90fa393f07e48d984ad4f79be53211198952456b2695dc2d1af2e0bc46a0e6cf30ecbb36cccc9e64430d1 SHA512 77c55ea1e0d33b2f4ced11e495390bbccc30425fd1842361306b92aa21eff2be446837d6100977deb1ea174a1415d6de9e8c5a195a95bbbba6386bce89f0e4f1 MISC metadata.xml 1175 BLAKE2B 8b512fd5efae4481d319fc52a11f3730af081d5c3ff12f6c6d62768e905e0651e3b4792765f65edbf659862b56372f32ba3aa7ae51c12b2911b711cb12a013e1 SHA512 edd6bb889abfe036d2509e56f350cf058e249e398811fdb2890bd001b75143b8d9df28bb64acba195852d01d484b7e6381e82ce972aad6d8cf1e0c961b3ade72 diff --git a/dev-ada/libgpr/files/libgpr-2016-gentoo.patch b/dev-ada/libgpr/files/libgpr-2016-gentoo.patch deleted file mode 100644 index 0282e60892bf..000000000000 --- a/dev-ada/libgpr/files/libgpr-2016-gentoo.patch +++ /dev/null @@ -1,89 +0,0 @@ ---- gprbuild-gpl-2016-src/Makefile.in.old 2017-01-19 19:52:41.242907252 +0100 -+++ gprbuild-gpl-2016-src/Makefile.in 2017-01-19 19:54:45.822646333 +0100 -@@ -25,12 +25,12 @@ - host=@host@ - target=@target@ - build=@build@ --prefix=@prefix@ -+prefix=$(DESTDIR)@prefix@ - srcdir=@srcdir@ - objdir=@objdir@ - exec_prefix=@exec_prefix@ - datarootdir=@datarootdir@ --datadir=@datadir@ -+datadir=$(DESTDIR)@datadir@ - bindir=@bindir@ - libdir=@libdir@ - libexecdir=@libexecdir@ -@@ -173,13 +173,13 @@ - libgpr.build: $(foreach t, $(LIBGPR_TYPES), libgpr.build.$(t)) - - libgpr.build.shared: -- ${BUILDER} -XLIBRARY_TYPE=relocatable -P$(srcdir)/gpr/gpr.gpr -+ ${BUILDER} -v -XLIBRARY_TYPE=relocatable -P$(srcdir)/gpr/gpr.gpr -cargs:Ada $(ADAFLAGS) - - libgpr.build.static: -- ${BUILDER} -XLIBRARY_TYPE=static -P$(srcdir)/gpr/gpr.gpr -+ ${BUILDER} -v -XLIBRARY_TYPE=static -P$(srcdir)/gpr/gpr.gpr -cargs:Ada $(ADAFLAGS) - - libgpr.build.static-pic: -- ${BUILDER} -XLIBRARY_TYPE=static-pic -P$(srcdir)/gpr/gpr.gpr -+ ${BUILDER} -v -XLIBRARY_TYPE=static-pic -P$(srcdir)/gpr/gpr.gpr -cargs:Ada $(ADAFLAGS) - - libgpr.install: $(foreach t, $(LIBGPR_TYPES), libgpr.install.$(t)) - ---- gprbuild-gpl-2016-src/gpr/src/gpr-env.adb.old 2017-11-13 22:16:53.349083426 +0100 -+++ gprbuild-gpl-2016-src/gpr/src/gpr-env.adb 2017-11-13 22:17:22.692590351 +0100 -@@ -1948,6 +1948,8 @@ - - end if; - -+ Add_Directories (Self, "/usr/share/gpr"); -+ - if Gpr_Prj_Path.all /= "" then - Add_Directories (Self, Gpr_Prj_Path.all); - end if; ---- gprbuild-gpl-2017-src/gpr/src/gpr-names.ads.old 2017-11-19 13:09:18.947527738 +0100 -+++ gprbuild-gpl-2017-src/gpr/src/gpr-names.ads 2017-11-19 13:10:08.125654595 +0100 -@@ -27,6 +27,8 @@ - Name_Buffer : String (1 .. 1_000_000); - Name_Len : Natural := 0; - -+ Last_Id : Name_Id := Name_Id'First; -+ - procedure Get_Name_String (Id : Name_Id); - procedure Get_Name_String (Id : Unit_Name_Type); - procedure Get_Name_String (Id : File_Name_Type); ---- gprbuild-gpl-2017-src/gpr/src/gpr-names.adb.old 2017-11-19 13:10:27.674316703 +0100 -+++ gprbuild-gpl-2017-src/gpr/src/gpr-names.adb 2017-11-19 13:14:38.360963627 +0100 -@@ -354,6 +354,8 @@ - - Name_Chars.Append (ASCII.NUL); - -+ Last_Id := Name_Entries.Last; -+ - return Name_Entries.Last; - end Name_Enter; - -@@ -427,6 +429,8 @@ - - Name_Chars.Append (ASCII.NUL); - -+ Last_Id := Name_Entries.Last; -+ - return Name_Entries.Last; - end Name_Find; - ---- gprbuild-gpl-2017-src/gpr/src/gpr-snames.adb.old 2017-11-19 13:12:41.592995718 +0100 -+++ gprbuild-gpl-2017-src/gpr/src/gpr-snames.adb 2017-11-19 13:16:31.980979696 +0100 -@@ -53,6 +53,10 @@ - return; - end if; - -+ if Last_Id = Name_Id'First then -+ Add_Name (""); -+ end if; -+ - Add_Name ("a"); - Add_Name ("b"); - Add_Name ("c"); diff --git a/dev-ada/libgpr/libgpr-2017.ebuild b/dev-ada/libgpr/libgpr-2017.ebuild deleted file mode 100644 index f143af3dc4f8..000000000000 --- a/dev-ada/libgpr/libgpr-2017.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs multiprocessing - -MYP=gprbuild-gpl-${PV} - -DESCRIPTION="Ada library to handle GPRbuild project files" -HOMEPAGE="http://libre.adacore.com/" -SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deecff7 - -> ${MYP}-src.tar.gz" -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="gnat_2016 +gnat_2017 +shared static-libs static-pic" - -RDEPEND="dev-ada/xmlada[static-libs,gnat_2016=,gnat_2017=]" -DEPEND="${RDEPEND} - dev-ada/gprbuild" - -S="${WORKDIR}"/${MYP}-src - -REQUIRED_USE="|| ( shared static-libs static-pic )" -PATCHES=( "${FILESDIR}"/${PN}-2018-gentoo.patch ) - -src_configure() { - emake prefix="${D}"usr setup -} - -src_compile() { - build () { - gprbuild -p -m -j$(makeopts_jobs) -XBUILD=production -v \ - -XLIBRARY_TYPE=$1 -XXMLADA_BUILD=$1 \ - gpr/gpr.gpr -cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} || 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 -} - -src_install() { - if use static-libs; then - emake DESTDIR="${D}" libgpr.install.static - fi - for kind in shared static-pic; do - if use ${kind}; then - emake DESTDIR="${D}" libgpr.install.${kind} - fi - done -} diff --git a/dev-ada/libgpr/libgpr-2018.ebuild b/dev-ada/libgpr/libgpr-2018.ebuild index ae6c33a82bbb..6041a1d9e70e 100644 --- a/dev-ada/libgpr/libgpr-2018.ebuild +++ b/dev-ada/libgpr/libgpr-2018.ebuild @@ -20,7 +20,7 @@ RDEPEND="dev-ada/xmlada[shared?,static-libs?,static-pic?] dev-ada/xmlada[gnat_2016=,gnat_2017=,gnat_2018=] !net-libs/grpc" DEPEND="${RDEPEND} - >=dev-ada/gprbuild-2018[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?]" + dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?]" S="${WORKDIR}"/${MYP}-src |