diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-09-06 10:28:05 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-09-06 10:28:05 +0100 |
| commit | f1af93971b7490792d8541bc790e0d8c6d787059 (patch) | |
| tree | a38046712bbc3a3844d77452d16c84e716caa3d4 /dev-ada | |
| parent | fc637fb28da700da71ec2064d65ca5a7a31b9c6c (diff) | |
gentoo resync : 06.08.2019
Diffstat (limited to 'dev-ada')
68 files changed, 99 insertions, 1133 deletions
diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz Binary files differindex 3e5b3ca1295b..bd097bf098a9 100644 --- a/dev-ada/Manifest.gz +++ b/dev-ada/Manifest.gz diff --git a/dev-ada/asis/Manifest b/dev-ada/asis/Manifest index fd5cb6dfabf9..3b154b482d12 100644 --- a/dev-ada/asis/Manifest +++ b/dev-ada/asis/Manifest @@ -3,7 +3,7 @@ AUX asis-2017-gentoo.patch 2030 BLAKE2B 261d2e32b818f17ea4ea51047cf71b73f89d9180 DIST asis-2019-20190517-18AB5-src.tar.gz 6173053 BLAKE2B 2ce8ba783f5d58503f6b792329779eb8a5f99746b3b03225f13da058ed5a757aef49c6ae8729b71079c67da6537c35db1c7173a569a2d7063421da5d2adee2c4 SHA512 3ca32fa2eeee10ef2d0e6eb8ab555c3e31b417bdab6749fdd8bd264efa2c93a388a5731c40705782a3a28f16e0c385af195f69d95020e265b2230ead1c91977f DIST asis-gpl-2016-src.tar.gz 5240554 BLAKE2B b95be816f5f52ac2b29814c09166774884dc166df6e08b26769c9502443f9797c42a1f9b6168336636add6515b748b3ef4b38c6a1dc6f49c1afb9ecec8e50c50 SHA512 439195d4cb5d58328dcc8c815cb6a32c5f8ed1d6581246dfa5dcca7c212ffad38dd63df25e490c4ac628eaf8c8e6d286f8ea036b7f39499704565b60c1bba8ee DIST asis-gpl-2018-src.tar.gz 5983604 BLAKE2B d91e3ff5cb95ec5b69121ed09e73f7bff234147b809353577315cd25cae0069ec5ebfc221a9798341b2a33bde316d74c4ce47c7ace580fe4d867e47032e207f2 SHA512 e00750adf17df8d534f0e561d129002d8b3c9efd6ba9c8d6768840d1399933271d748bafb7358a45d0a520620a335e669a6c2770ed89660bb319b609961a433a -EBUILD asis-2016.ebuild 1220 BLAKE2B 3d31f42030ea2cf19b2c98159018528cfe423cdb4fbabb0bfe116cd5f153c2c2f4a80f357381cc8dbacb25134234f4529b36214596bdfd6f03af03423ed71e03 SHA512 77c3f1f87a1cfbbb96080e37a1ebf5d3a3407eda5e31e8fba02f2e155207e07cc3ec5c47917a0b4ae11293ae053e5c0602a2b46d5655bbe817a5a1a0d0010111 -EBUILD asis-2018.ebuild 1297 BLAKE2B e8fd884ce0b058dd198aadc4c0937ccac24585ec37dfe40e34f44f65e756df2ddf6b84d366a200f018aa60887c8564cc552966118cf8be2ce81a9cf803e355fd SHA512 6f4ced4d984e41c98bce656dc82c266f04287728660d80720595c4382c799b1382522eb7f4df6e6f8b81b34ee5fb7865ecccf40dee3f4e86982470fce602d395 +EBUILD asis-2016.ebuild 1232 BLAKE2B d3a93a852880141b7403033fa92830477e7df5a1f915a5114caa44524370da669b46784debe3d2eb752733aa5427f337ecf6874cde2c1118240f85668656e577 SHA512 e90b86afa5992ea86ae4f11d1023486f96a758b218091f2b7fc05a5434815d71d9b93c770f67144a80b87dd973fc211a13f8d5b900e809ef1251bcf499bca83f +EBUILD asis-2018.ebuild 1315 BLAKE2B b9dc4ee73cca440af4b9af2987ebcf216d462b1551ac7a0147962bf456036f2ad36821234e3a76ee38bb77e81d4f42adf5ee8dae553c0e5745955cfe5c731f55 SHA512 e5f61d632e71e995319194ef9d813c4434446c6c18ae02bfec32cd974aebf0e723e6f55fd3241221f4b667785644dcde623612506cd448cadc36157b27b321ff EBUILD asis-2019.ebuild 1418 BLAKE2B d9576140d91ddeae07f5eb5c25ee740f6223492827ad5070029ad92db4c01926c5a875a4792ab441bdaabf1c89662bcfac5274683ed015424dd6fb67049e6348 SHA512 c27a90fc7082419a9a016add0d6c68274af236d498a47368464886b09436df44d29989fb2eac75945d723ff1ca94043a4bd5ec200046a042ef3f752c889de163 -MISC metadata.xml 794 BLAKE2B 4a70d59a4f24d7c0e075a11acd84a5e0cc21f9836e10bb4c3adffb98a5b4cd738489d0089852a7b303c014f78d38a758aae753db09f70285fe76a2cefaae5510 SHA512 99f17f74644496f2f74fb430f46b3e9e2927773b41d101d761d358f16c06bc8f2202b5467e718cabdaf0258a94511ff86718028cbd278fedc3814ac3d7c808d4 +MISC metadata.xml 507 BLAKE2B 8b1df4ce46d0dad00a66b5460fe5274c3d31080a6dbfe88c2482bce2097c22899ed9bf8415243c4af658dfb383c5865bf0b363cec7f72ddda54d595bbd772708 SHA512 09fcf4af4c0ff4a27bdd41a2abece2736c6f78c38b1a5a4f05dbe418def78493df4940b2ee6e528f9ffc9184f69c61deb1912fc309b0304da0b4a30f1690dd9d diff --git a/dev-ada/asis/asis-2016.ebuild b/dev-ada/asis/asis-2016.ebuild index 74f0b0bdfadc..e86f691ae7bb 100644 --- a/dev-ada/asis/asis-2016.ebuild +++ b/dev-ada/asis/asis-2016.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -16,13 +16,13 @@ SLOT="0" KEYWORDS="amd64 x86" IUSE="+gnat_2016 gnat_2017 gnat_2018" -RDEPEND="dev-ada/gnat_util[gnat_2016=,gnat_2017=] +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=]" + dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?]" REQUIRED_USE="^^ ( gnat_2016 gnat_2017 ) !gnat_2018" diff --git a/dev-ada/asis/asis-2018.ebuild b/dev-ada/asis/asis-2018.ebuild index 503e02383473..b895af4212b4 100644 --- a/dev-ada/asis/asis-2018.ebuild +++ b/dev-ada/asis/asis-2018.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -18,11 +18,11 @@ 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] + dev-ada/gnatcoll-core[gnat_2017(-)?,gnat_2018(-)?,shared] + dev-ada/gnatcoll[gnat_2017(-)?,gnat_2018(-)?,projects,shared] )" DEPEND="${RDEPEND} - dev-ada/gprbuild[gnat_2017=,gnat_2018=]" + dev-ada/gprbuild[gnat_2017(-)?,gnat_2018(-)?]" REQUIRED_USE="|| ( gnat_2017 gnat_2018 )" diff --git a/dev-ada/asis/metadata.xml b/dev-ada/asis/metadata.xml index 4d4d828b644c..a2c17d742260 100644 --- a/dev-ada/asis/metadata.xml +++ b/dev-ada/asis/metadata.xml @@ -4,12 +4,6 @@ <maintainer type="project"> <email>ada@gentoo.org</email> </maintainer> - <use> - <flag name="gnat_2016">Compile with dev-lang/gnat-gpl-2016</flag> - <flag name="gnat_2017">Compile with dev-lang/gnat-gpl-2017</flag> - <flag name="gnat_2018">Compile with dev-lang/gnat-gpl-2018</flag> - <flag name="gnat_2019">Compile with dev-lang/gnat-gpl-2019</flag> - </use> <longdescription lang="en"> ASIS is a library that gives applications access to the complete syntactic and semantic structure of an Ada compilation unit. This diff --git a/dev-ada/aunit/Manifest b/dev-ada/aunit/Manifest index b2579b336618..df3ca80c08ff 100644 --- a/dev-ada/aunit/Manifest +++ b/dev-ada/aunit/Manifest @@ -1,6 +1,6 @@ AUX aunit-2016-gentoo.patch 374 BLAKE2B 00d34a835afdc4a1a80f8c4dad23ae4a30a89eb801c3aeb8177a4d0cb838b3edf0c8463c774da212a9be56378f493ddd41aa4a26d976a38f1800999903dd2263 SHA512 0ea27e0d8783788c83a3916071ea0dd5361f21a4fc67727b735986dfc624c9f1bd6aa471229c389f5453001577ca1eec0ecdd0865952a0aa5fe1453787dac33b DIST aunit-2019-20190429-18B77-src.tar.gz 624683 BLAKE2B 455c3566ed46138116f258b175e883a59102dc334b41040cd6a332175fc4138d7ccdab1357c5b8886f14e551e3a6f4f4aa73eb755ade4a7a1663ac2d999973ca SHA512 9b1834ebacb9dbaa7a01f702455a44921a26a8d8d00f55ecc2fc8ddf2d884ef2ef2bba0f62551421f5a47d558d0fba88cbd57671459bba0c9f90c6310d714b19 DIST aunit-gpl-2018-src.tar.gz 639544 BLAKE2B a7d7469b0ec4951517b113a794dca4399a27d6d5d848194fc5bfa7728a5cd04644e4b5f1247eb3cfbab64c0294502ac70cdd6e7052cd60b788c7892eddb4294e SHA512 3409b490978e9160e3ec2d9214d50f846c4c38f7a728cd4ff306d6454d1e0944023342f17a580b0449cb528f42d3c608adec58b61318284237d02b7f77498513 -EBUILD aunit-2018.ebuild 1156 BLAKE2B b432e80cad038926b2bfa98840e66b97de0e0403c4723340c85634152a99032bcfcdfe3751fceba7e173975f21db836ea89e189221bed59909cf58ac03e006a9 SHA512 82309c188fa9fce5f3f4a4fc12af988a589eb7adcf8a0311f4713990819bc82974cfeb382d099b0e29b02d1de7de72492affab7312be958dffc79b3903f09299 -EBUILD aunit-2019.ebuild 1335 BLAKE2B ad17ad295f3880d2c9b89c5635be075c2ea1cd1bd6c6157bae0410c7efcfa26a53b40bf3e741e68495e526d9875da034e8a9a490175b0a514df2b0e137cecb74 SHA512 054e01da1ecd29d386b0ecf014c5dccd76f2fa30b6d4a485958b01fd85b82d28164e70b37245837cd85930c8639b884607e02fbdd77ae0a5b1bd37669c60f984 -MISC metadata.xml 1051 BLAKE2B 5828d585f090cce22fb64f4f70e2e0a1d58757d4242910299c04eb3712c363ab64b0a316245ccc7e607c1261b1422a91830129d9b823b1c57e944ee1d227dc9c SHA512 8f64ba0a90839f9ef941982a3466704363c62f125eea6b1a6c782e9a268e97241a49bef0d62fc21c4f46ceb7a153c800c8a68ce3d7cc18f86087fe1b6513f571 +EBUILD aunit-2018.ebuild 1165 BLAKE2B ec11e394f0c83a3570d4e917a614fd4c42629409f53160e149ebd73bf80e51500be6427927845108a82a4c0ec81490866afe0fd291427a15a22e200b76271e91 SHA512 399dbeec06d5dd59adeaf107cb997c9ccce3acfe61c2733dd5bc17685b9aa748666942c552766f3c39bf0e9bc86353fafd9da5cf5e4556ba205b06afcabfcee7 +EBUILD aunit-2019.ebuild 1354 BLAKE2B e4a20da7dbec249b71ed193e46401f6d25d5b39502e1392a2c508f5c99cffa5542e480debef936f30ade98880e4c53bda16ba400d2f1b29837f6f871cf40db6b SHA512 4474a1c3eaf90391ce7f76c96ef291dc8c15fa47ea55842183c49f6911c896092f1d9775d84bc1b12212305b26226ef9fb16295f60ad6b339cf7d5427bcaa58c +MISC metadata.xml 764 BLAKE2B fa5a767e7539d5fa8d2ce44240495fe471f8221897273a6c73748b0065a5239afaf99d4c28172a877b47611aa7d568a439cf47d172bee4a3f2878d4bd778ef9d SHA512 211f0200353e3573a700d1cbacb421e53e817617bbc5b74dbfb668194eae397b34193ad743acf70287b66d3fcb4c366214822b2e97a15bcfa80f9252b7f5faa9 diff --git a/dev-ada/aunit/aunit-2018.ebuild b/dev-ada/aunit/aunit-2018.ebuild index ccb8643f3730..9e5b6ccce816 100644 --- a/dev-ada/aunit/aunit-2018.ebuild +++ b/dev-ada/aunit/aunit-2018.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -21,7 +21,7 @@ RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) gnat_2018? ( dev-lang/gnat-gpl:7.3.1 )" DEPEND="${RDEPEND} - dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018=]" + dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?]" REQUIRED_USE="^^ ( gnat_2016 gnat_2017 gnat_2018 )" diff --git a/dev-ada/aunit/aunit-2019.ebuild b/dev-ada/aunit/aunit-2019.ebuild index 069e8fc90324..58339ce37a43 100644 --- a/dev-ada/aunit/aunit-2019.ebuild +++ b/dev-ada/aunit/aunit-2019.ebuild @@ -22,7 +22,8 @@ RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) gnat_2019? ( dev-lang/gnat-gpl:8.3.1 )" DEPEND="${RDEPEND} - dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]" + dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?] + dev-ada/gprbuild[gnat_2019(-)?]" REQUIRED_USE="^^ ( gnat_2016 gnat_2017 gnat_2018 gnat_2019 )" diff --git a/dev-ada/aunit/metadata.xml b/dev-ada/aunit/metadata.xml index 1d2d7f1a8b65..ae3ec21e600e 100644 --- a/dev-ada/aunit/metadata.xml +++ b/dev-ada/aunit/metadata.xml @@ -4,12 +4,6 @@ <maintainer type="project"> <email>ada@gentoo.org</email> </maintainer> - <use> - <flag name="gnat_2016">Compile with dev-lang/gnat-gpl-2016</flag> - <flag name="gnat_2017">Compile with dev-lang/gnat-gpl-2017</flag> - <flag name="gnat_2018">Compile with dev-lang/gnat-gpl-2018</flag> - <flag name="gnat_2019">Compile with dev-lang/gnat-gpl-2019</flag> - </use> <longdescription lang="en"> AUnit is a set of Ada packages based on the xUnit family of unit test frameworks. It’s intended as a developer’s tool to facilitate confident diff --git a/dev-ada/aws/Manifest b/dev-ada/aws/Manifest index 791adfd2b684..598bca431537 100644 --- a/dev-ada/aws/Manifest +++ b/dev-ada/aws/Manifest @@ -3,8 +3,8 @@ AUX aws-2018-gentoo.patch 2097 BLAKE2B cbb0ed91c632292994efc2bec19d49b8ce62b0ccb DIST aws-2019-20190512-18AB9-src.tar.gz 4241817 BLAKE2B 1054c17c0e79ea4992a7e29fdb1996caa663321407b64ae88cb76cb03d953b7ea36a8c91a28f60328ea2ec3223c1d7f8c2f052f4f181f03b1f59cf33443ee27e SHA512 989043f75504ee8b3736800fa36f4d3a98a6bc745ff4bef38dd4f7c8a7072d5d1ea383dfd2fc090d8558a6d6442953e5f3c65e4633ab16bfb3dacf60ebf79a3b 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-r1.ebuild 1188 BLAKE2B 9fc4e57fba892e399f424bb56307aa3e36be1606fdab1ffad7ac1547bcfa8a3f5249c9625e57c6eb95f538b53cc4b98b738e4d85949311fb0e9e31b1a735ab3a SHA512 f049316cc3a95c4950334cccfb00f74965cd2416e1550309189c56551b84e0e7db8daf1f1cdaf71cce13b7b936f0615c19309ab8c51c9e4287946987d2a7e10f -EBUILD aws-2018.ebuild 1004 BLAKE2B 54fe0f8d215f2f4e48deecf0439fa38c9a6ea33691e12378e39722413f7615e6650af2e4f14aebe2003f242f2128c97013bb8b035d9ab088377a653f2b50ef25 SHA512 0f61677a688267efc153d69ba68f9e9f12140cc5883f955894c896dacc1b9a1b24c045a476250834e74de12476223fc98e393b7f25038bcb75bab9cd95c7f74d +EBUILD aws-2017.ebuild 1043 BLAKE2B 4bf8df983ccf8dc107999091aacc234dc16e53c8cad90a06fe41cb00808a1394612a684864daf6931ba2dc5c940975256e5d0e9bdf6831d618dfcc74856ec876 SHA512 b09d084921f0a5268188405801e107f0679d1f8041dfb93f116eade1c04033146b4dd9c521fe1b5217cc6e927d91c7583e1662259c50b0975ed8d66b36807c93 +EBUILD aws-2018-r1.ebuild 1207 BLAKE2B d57e15312c9735c240b71679e379cec64249d1dea46462b62f00bbacb7f150cc295bb6b4b99d9e5e75eba310c15c82d2b3fa389e331964409e9c4f485a5afed7 SHA512 04d8b535f4086d32bbdf792ed9f80a071777b61e04b34048a88185262d3addd983f4b91b12e43ad6e4554751cb3bd8571ff591310fb60830f1dd7576fa97c110 +EBUILD aws-2018.ebuild 1010 BLAKE2B 220f4ef079cbe6a6e2d5672c338e1c8cdde58c985ed6fac110c07ad867390ec2e654c2b94db609ac0b4d3ee3679b73b98e73d7664a5e527a342d174780ded586 SHA512 b547af64ff976d2bc95d7cddfd1bceefcea0f92ce6e5065bb14442a3693236ea6b91682223a5b357690e32d6f3fc960e857e55f25af2971c6f845ccd32bdaf89 EBUILD aws-2019.ebuild 844 BLAKE2B fb145d0a9ad8af618b011dbe870932077ee571b5474019603d9ac7e00aaaa1dbbbc6a94606dca60b76792093f9e8d447221dabb46824b270125ff9cdce974bbf SHA512 38f856ed7a87e116a556a084fb7ed3f1131028998d7fc1595dae97e87b1613112b014705dd83f24a161047760e8beb9b6adb615d55664cfd6cf5dde1d827a096 -MISC metadata.xml 946 BLAKE2B b3cbfc3e5c25db14f46b6a3f617fc9f8d6cdb043fa4cd3f678969625df42fe63503ad9bdd01e71dfc580c2e86c1b0cf8de4d2807dbe84b81518dbb8216f807dd SHA512 1751c4efb119a546872823b4f937cb39a7964b09dd60cbf9c8db083b9fd06e7ed801d3adcabc793ac633d2aef540a120e940956d63da7a6eb90bf704ebcc087a +MISC metadata.xml 659 BLAKE2B b9dcbdc561b8ffd774e7aa8d5fc1a6a809e1017e3b83d6473d8c72c690abac54b3a0ea7c4df5cbc5ed832ce9bf60e26d71c43f09cf35b3c33bdba9c3fb2dd423 SHA512 b17cf2ab035805b5e0fd7f423cfbaca61eaa6a8e7ce575fcb65b631b3c3318fc0eb9fbdcd4010a0187f07a4986acd351809697a7fc044ab7a9f4fe394b6ca227 diff --git a/dev-ada/aws/aws-2017.ebuild b/dev-ada/aws/aws-2017.ebuild index 081d598a0027..7bc3f363c081 100644 --- a/dev-ada/aws/aws-2017.ebuild +++ b/dev-ada/aws/aws-2017.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -19,9 +19,9 @@ IUSE="gnat_2016 +gnat_2017" RDEPEND="dev-ada/xmlada[gnat_2016=,gnat_2017=,static-libs]" DEPEND="${RDEPEND} - dev-ada/gnat_util[gnat_2016=,gnat_2017=,static-libs] - dev-ada/asis[gnat_2016=,gnat_2017=] - dev-ada/gprbuild[gnat_2016=,gnat_2017=]" + dev-ada/gnat_util[gnat_2016(-)?,gnat_2017(-)?,static-libs] + dev-ada/asis[gnat_2016(-)?,gnat_2017(-)?] + dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?]" REQUIRED_USE="^^ ( gnat_2016 gnat_2017 )" S="${WORKDIR}"/${MY_P} diff --git a/dev-ada/aws/aws-2018-r1.ebuild b/dev-ada/aws/aws-2018-r1.ebuild index a3ffe95306c1..8cdf9346bfde 100644 --- a/dev-ada/aws/aws-2018-r1.ebuild +++ b/dev-ada/aws/aws-2018-r1.ebuild @@ -22,7 +22,8 @@ RDEPEND="dev-ada/xmlada[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?] DEPEND="${RDEPEND} dev-ada/asis[gnat_2016(-)?] dev-ada/asis[gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?] - dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]" + dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?] + dev-ada/gprbuild[gnat_2019(-)?]" REQUIRED_USE="^^ ( gnat_2016 gnat_2017 gnat_2018 gnat_2019 )" diff --git a/dev-ada/aws/aws-2018.ebuild b/dev-ada/aws/aws-2018.ebuild index 877e8c4fc1e0..13df9f3052b8 100644 --- a/dev-ada/aws/aws-2018.ebuild +++ b/dev-ada/aws/aws-2018.ebuild @@ -21,7 +21,7 @@ RDEPEND="dev-ada/xmlada[gnat_2016=,gnat_2017=,gnat_2018(-)=] dev-ada/xmlada[shared,static-libs]" DEPEND="${RDEPEND} dev-ada/asis[gnat_2016(-)=,gnat_2017(-)=,gnat_2018(-)=] - dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018(-)=]" + dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?]" S="${WORKDIR}"/${MY_P} diff --git a/dev-ada/aws/metadata.xml b/dev-ada/aws/metadata.xml index 9f6b024a0833..732360689a7a 100644 --- a/dev-ada/aws/metadata.xml +++ b/dev-ada/aws/metadata.xml @@ -4,12 +4,6 @@ <maintainer type="project"> <email>ada@gentoo.org</email> </maintainer> - <use> - <flag name="gnat_2016">Compile with dev-lang/gnat-gpl-2016</flag> - <flag name="gnat_2017">Compile with dev-lang/gnat-gpl-2017</flag> - <flag name="gnat_2018">Compile with dev-lang/gnat-gpl-2018</flag> - <flag name="gnat_2019">Compile with dev-lang/gnat-gpl-2019</flag> - </use> <longdescription lang="en"> AWS is a complete framework to develop Web based applications. The main part of the framework is the embedded Web server. This small yet powerful Web diff --git a/dev-ada/gnat_util/Manifest b/dev-ada/gnat_util/Manifest index 81b2d6f37d9e..1508655eff54 100644 --- a/dev-ada/gnat_util/Manifest +++ b/dev-ada/gnat_util/Manifest @@ -2,9 +2,8 @@ AUX gnat_util-2017-gentoo.patch 2419 BLAKE2B e8085e6a6cb65c5ffe6054aa360e90042a0 DIST gnat_util-2019-20190517-18c94-src.tar.gz 906682 BLAKE2B d00ae8b92429f9a7d7476ff6437148a869555fb66435f9355b8ba1ec3d827cd32063e9b64a6862b99a4b26e570e1a1a7b4dfabd67d1aa1b997fb5510e9b43324 SHA512 fbf9114a75f6f794705384a67581f1630460292b8d640c34323c8147bea280bdf2ac8b6097313992d27716f2edc814e587d9396d85d28158ea82ee6002e47425 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-2017-r1.ebuild 1430 BLAKE2B 1d5e92937f0ce1196145bf75b2df951201265ed320b62c6c7709a58127e5e3c0f66a77e23e1becfc95bcc370aafb887c4808fd06ad9376ccfa0c9eb90b388856 SHA512 4c675dcac5771a4581c85ef5fdee785155395af8fe7f8943f7e2a7cc6d562d830f6b8f770055ce0da32c098ea15bce41fbc6e7d90d576feb44b565445a77a8c5 -EBUILD gnat_util-2017.ebuild 1422 BLAKE2B b69c22ede488f993d0efeb7e66846c33f20f15e10b5344ff02252fb6d037910fc4bc24fd0421a08504164796bc50481bae6109e2d3ebd21a4425ff6d969fc918 SHA512 d3a1ebb59b8a31162349bc40027f5cb36f8e7ed4de8190fc336f4ad930792b8263bd0c47909d909245c348823a57d05bfe26fabce0938c4e292c7b7f70154cd4 +EBUILD gnat_util-2017-r1.ebuild 1428 BLAKE2B 82c57959eecc3aaa4aa4f47495ec92d05dbdb195f03834d5d0fa8c133b69f293e1cb460c071daf9025e69e15eba75160f81874118d2055c312ef832a92a33a05 SHA512 c7df4a1ed891db9d537b819aaa9ffae0f7750e0b95ae1182a8d90619288888287e6336624dd127a913b872f35a890527714f16e5c48a246ee45aebd4f06bb8d0 EBUILD gnat_util-2018-r1.ebuild 1436 BLAKE2B 4a97460a25fdb8bfcac1eb0783a3fc9111aae0636f01a966a0c58c1298244f23eae1345d56ff72d4b3b6d03ce97e6890b70393d00f00a6347d5ad69e5a9ab652 SHA512 ffcb270b491efdfd0a6cbeb9a3d1c9a3ec1d3c8d7d5b7f3eab9da404789f570611cac0861b77933f67fe2977d9fec5672aea8293d11b66e361650d6f0a2ec6bd EBUILD gnat_util-2018.ebuild 1326 BLAKE2B 336432396b5b98f7d59704f30a7063873651c296eb8a63700025c5c37cda497baf1caac3d4097ed95b99cfb1aee9e8402a1e75293560b7db1e12bb40b1a5aaf6 SHA512 8014d612eb4e2fcd1599aa6262f6afc131ca5dea70b40f096aa22c95a94bcb0ecc38a94c705254085b84c56e89fb21a034f082a5606885f58231dfe37738b247 EBUILD gnat_util-2019.ebuild 1296 BLAKE2B ee2e6b50d0ea4e324864d4be580607616bb8c556c1d53e4afa154d7662e8b396b2d5fc06521d56145dd63d6f5671de7ade9982b0dbd77319925527ae534e7691 SHA512 b849ce93833c3aecd9ee93ef275e546580c261fc395bc440a215590e5d370c098e485e32ccc96a5fcfc04bb0a8af402541ed8babe07bd39890b8b1406379cef7 -MISC metadata.xml 1193 BLAKE2B 1661d540e7969dfb3abb0d53ff6250f9f26809f07f03859c066d34088d7908f3889a787b237e935ab500466763e5166933c2d3e92f50c07e01d809a0f318a802 SHA512 c75c8b8e0344dcd9e9b5aac3b5f300798b0138b31cac960a485886805cea164cdbc224a7e6324bb2834c188115b0e6bd9463e0fb114c5dea1b1481d049a9ad13 +MISC metadata.xml 921 BLAKE2B 7e70b07f291098feab880aaedb4ebf5eb1dd6a83d4e5bff1f50b9e8657b9d2fc947cc33d91c02b1a1df5cfd15ce565fee9c267fdbe4063affc4a02e8944348c2 SHA512 d313f2d9d6dfd9a5616e75ce7ab5fb3670deb54f0fbc66f584ce398d5b5c8b9196f92833f54188ab8ea5dc50e5b7b8c74104b4af7050b268e9c2dfd5defe0374 diff --git a/dev-ada/gnat_util/gnat_util-2017-r1.ebuild b/dev-ada/gnat_util/gnat_util-2017-r1.ebuild index 0d7f07e12a8f..3a211e741e37 100644 --- a/dev-ada/gnat_util/gnat_util-2017-r1.ebuild +++ b/dev-ada/gnat_util/gnat_util-2017-r1.ebuild @@ -14,7 +14,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed037 LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="gnat_2016 +gnat_2017 +shared static-libs static-pic" RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) diff --git a/dev-ada/gnat_util/gnat_util-2017.ebuild b/dev-ada/gnat_util/gnat_util-2017.ebuild deleted file mode 100644 index de225724a4e8..000000000000 --- a/dev-ada/gnat_util/gnat_util-2017.ebuild +++ /dev/null @@ -1,60 +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=${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/591c45e2c7a447af2deed037 - -> ${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 - GNATMAKE=${CHOST}-gnatmake-${GCC_PV} - emake GNATMAKE="${GNATMAKE} ${ADAFLAGS}" \ - BUILDER="gprbuild -j$(makeopts_jobs)" generate_sources - if use static-libs; then - emake BUILDER="gprbuild -v -j$(makeopts_jobs)" build-static - fi - for kind in shared static-pic; do - if use ${kind}; then - emake 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/metadata.xml b/dev-ada/gnat_util/metadata.xml index 7810e6399b12..a1270420b82b 100644 --- a/dev-ada/gnat_util/metadata.xml +++ b/dev-ada/gnat_util/metadata.xml @@ -5,10 +5,6 @@ <email>ada@gentoo.org</email> </maintainer> <use> - <flag name="gnat_2016">Compile with dev-lang/gnat-gpl-2016</flag> - <flag name="gnat_2017">Compile with dev-lang/gnat-gpl-2017</flag> - <flag name="gnat_2018">Compile with dev-lang/gnat-gpl-2018</flag> - <flag name="gnat_2019">Compile with dev-lang/gnat-gpl-2019</flag> <flag name="shared">Build gnat_util shared library</flag> <flag name="static-pic">Build gnat_util static library with pic code</flag> </use> diff --git a/dev-ada/gnatcoll-bindings/Manifest b/dev-ada/gnatcoll-bindings/Manifest index 5f9611707b18..147dde2c8fc8 100644 --- a/dev-ada/gnatcoll-bindings/Manifest +++ b/dev-ada/gnatcoll-bindings/Manifest @@ -1,6 +1,5 @@ DIST gnatcoll-bindings-2019-20190430-1928C-src.tar.gz 138935 BLAKE2B c72398b51bf383b163ac10000c4dd5441334a6f24d7ad075d8115f25c030b43bc1dace6a1121e1e69add1eead93a5389aff09ef013deb4682ccb1d31bb85313f SHA512 6db1d35a1cdf5188001084750f7aa32b193768f8c3dfb6d7db8a8314c745fc054b0a6d2234a6dd64c5acd4b1bafffa7ce7f1080bd51fbb8bc88edfcc855b7a48 DIST gnatcoll-bindings-gpl-2018-src.tar.gz 100068 BLAKE2B 7e5fe106d421d853135ddaea04b7bf2b306e7d0f054379b4c66b58844ac73270d7c82de549e9440f4ecc672ed7e9df6e2b3c1fea55b67403aaa33b09c124bb9b SHA512 2d42e904ab7324d958b34b103ceb2cf7d9bf620f324578b8d3537c18bcc2b4ba73d553bbec773cde5d57979c3e68bc9eef69f97dd55a3b21e43d464881676295 -EBUILD gnatcoll-bindings-2018-r1.ebuild 2248 BLAKE2B a993d10786af11f28309c092ab9fbeafefa51ead53f8f78b07b672034306fdb202b10cda2fd0a8d1913a192fb0eb6d1a9ed061f9dc131adec38db9a0266f0c49 SHA512 f3c6d4029a8d08d3d74f9c3602f0399e3f12e942346f6a6a8a9545ddefce63b54b86e5d2d89281f5a04230e87346b2e0bc472be65c2618a5636316ea95e7ba7e -EBUILD gnatcoll-bindings-2018.ebuild 2142 BLAKE2B 8ee5521ae2b74c65a8adff85ae19459c5dfb993184c436d05813236cc8c2bad0b7df87f46e9c1c7efb614020d51cae95f717d0be60fab88229cbfe65d9dc88e9 SHA512 16a17b64f31fbb362c58325efa18da979193befbc642270b240e0b6b36bfe243c1aef67e3b91efba097cb55097ee0b1dadc61bf8faf153d5431a6ceff1d22118 -EBUILD gnatcoll-bindings-2019.ebuild 2252 BLAKE2B e6c1d076c3983d155ec133d42718a58f52b0ab435c46a5ec53666b898182893577b5317c5100a30e44b7f65e0ed94c42bfd02f52134e89f711789b55b2e0b7f7 SHA512 39bf1d9214961bb7087d9bd04dc8e984b71d9572711f2d91d5cfa3c8ee4aa0766f08900f93e49befe3940f16589335cd155736325c9aa1d69eea61199d8883fc -MISC metadata.xml 1353 BLAKE2B d8e1f6c7684858b837728014480a82099f9ff663db60b359681732754a6825639bdbef93d0b6c4c744358b5da1b0bdb2f35ddc8f082d53a51f509bf1914ff61b SHA512 e4094ba1d5fb1b1dafa446cb75351ce459aff3e2bd13bc0f3aa62303e23c67a96a4e04ff95ca09abe9aa5b6717309f004f2938c7aba569f849df4071c437310f +EBUILD gnatcoll-bindings-2018-r1.ebuild 2265 BLAKE2B 6a68652aa98e6cc69e4158542b72826ed4aa12164e0c5555d7d490d6ad4d10196e3527875be17f6bc02a7f485e3dc9eccd9cc25ae5cdb8fedee3f4888a2ce8b7 SHA512 b324c1a8f9eb2cacb141ea49d1f1901d26f584976f34c1e3d8334bb2fcbfcc7483151c866d40b2d9e5ca36f8565c212d22e519b85dbb14f8691e96245efc268e +EBUILD gnatcoll-bindings-2019.ebuild 2271 BLAKE2B ff53a14264e960bcb52a323f6b939b649e0c63b3f9c0481c33daea6223e3385f5f0cc9ede9755d65883b5e9182563944246f1edf5c9f73b9b5f089e4c94aab5b SHA512 c659dcee428f2acc6122b05d5deb050a68533c291e5ca6992d124e8af168d1854040f906af7df83b7598f80d7503204ab2d5ac1bcd41d6588bd305a0d63764bf +MISC metadata.xml 1081 BLAKE2B a4c643dd943c019ebb42f81dc078391885d80fb3abf3afb52494d33802592eacbf43c33560855239c7e88e86f306444392b9a6336a8255d18762f095d8283838 SHA512 7e4006ffc2f972dc45efb174451c9450545c10b1b55c63bad0157940d5c64da2ac7a908f51c4a0244e2df3b09e448aac610b97dfdfa8e80a32d913de2f6c31af diff --git a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2018-r1.ebuild b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2018-r1.ebuild index e4b95d410d3e..131bd638518d 100644 --- a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2018-r1.ebuild +++ b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2018-r1.ebuild @@ -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 gnat_2019 gmp iconv python readline +shared static-libs static-pic syslog" @@ -24,7 +24,8 @@ RDEPEND="python? ( ${PYTHON_DEPS} ) dev-ada/gnatcoll-core[shared?,static-libs?,static-pic?] gmp? ( dev-libs/gmp:* )" DEPEND="${RDEPEND} - dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]" + dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?] + dev-ada/gprbuild[gnat_2019(-)?]" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) ^^ ( gnat_2016 gnat_2017 gnat_2018 gnat_2019 )" diff --git a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2018.ebuild b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2018.ebuild deleted file mode 100644 index 5d7f13c2235f..000000000000 --- a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2018.ebuild +++ /dev/null @@ -1,80 +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 multilib multiprocessing python-single-r1 - -MYP=${PN}-gpl-${PV} - -DESCRIPTION="GNAT Component Collection" -HOMEPAGE="http://libre.adacore.com" -SRC_URI="http://mirrors.cdn.adacore.com/art/5b0ce9cfc7a4475261f97ca5 - -> ${MYP}-src.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="gnat_2016 gnat_2017 +gnat_2018 gmp iconv python readline +shared - static-libs static-pic syslog" - -RDEPEND="python? ( ${PYTHON_DEPS} ) - dev-ada/gnatcoll-core[gnat_2016=,gnat_2017=,gnat_2018=] - dev-ada/gnatcoll-core[shared?,static-libs?,static-pic?] - gmp? ( dev-libs/gmp:* )" -DEPEND="${RDEPEND} - dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018=]" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -S="${WORKDIR}"/${MYP}-src - -src_compile() { - build () { - 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) \ - -cargs:Ada ${ADAFLAGS} -cargs:C ${CFLAGS} || die "gprbuild failed" - } - for kind in shared static-libs static-pic ; do - if use $kind; then - lib=${kind%-libs} - lib=${lib/shared/relocatable} - for dir in gmp iconv python readline syslog ; do - if use $dir; then - build $dir $lib - fi - done - fi - done -} - -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 - if use $kind; then - lib=${kind%-libs} - lib=${lib/shared/relocatable} - for dir in gmp iconv python readline syslog ; do - if use $dir; then - build $dir $lib - fi - done - fi - done - if use iconv; then - sed -i \ - -e "s:GNATCOLL_ICONV_BUILD:LIBRARY_TYPE:" \ - "${D}"/usr/share/gpr/gnatcoll_iconv.gpr \ - || die - fi - rm -r "${D}"/usr/share/gpr/manifests || die - einstalldocs -} diff --git a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2019.ebuild b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2019.ebuild index 60a73d35f0d0..d4e00b70793b 100644 --- a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2019.ebuild +++ b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2019.ebuild @@ -24,7 +24,8 @@ RDEPEND="python? ( ${PYTHON_DEPS} ) dev-ada/gnatcoll-core[shared?,static-libs?,static-pic?] gmp? ( dev-libs/gmp:* )" DEPEND="${RDEPEND} - dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]" + dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?] + dev-ada/gprbuild[gnat_2019(-)?]" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) ^^ ( gnat_2016 gnat_2017 gnat_2018 gnat_2019 )" diff --git a/dev-ada/gnatcoll-bindings/metadata.xml b/dev-ada/gnatcoll-bindings/metadata.xml index 911c487969ed..bd36590b78b7 100644 --- a/dev-ada/gnatcoll-bindings/metadata.xml +++ b/dev-ada/gnatcoll-bindings/metadata.xml @@ -5,10 +5,6 @@ <email>ada@gentoo.org</email> </maintainer> <use> - <flag name="gnat_2016">Compile with dev-lang/gnat-gpl-2016</flag> - <flag name="gnat_2017">Compile with dev-lang/gnat-gpl-2017</flag> - <flag name="gnat_2018">Compile with dev-lang/gnat-gpl-2018</flag> - <flag name="gnat_2019">Compile with dev-lang/gnat-gpl-2019</flag> <flag name="shared">Build shared library</flag> <flag name="static-pic">Build shared library</flag> </use> diff --git a/dev-ada/gnatcoll-core/Manifest b/dev-ada/gnatcoll-core/Manifest index 8a7546724d9e..8986cfdee86d 100644 --- a/dev-ada/gnatcoll-core/Manifest +++ b/dev-ada/gnatcoll-core/Manifest @@ -1,7 +1,6 @@ AUX gnatcoll-core-2018-gentoo.patch 555 BLAKE2B d0913c845f4f7d96afbcec5d400599535417ee1c7b0d9f3c1e0c8766218c6a2556ff2de3e39febc1882b31e947876ca0849fad1564970f422530e58a8966c638 SHA512 90ef785337cb85aa7e2e2b5d0a24efc963512aa19780b215a96a1db6d980e55ff3b1409939e6d77913bf6416d158402ca900fd3ccc4cfb5362ee7440dfb42b64 DIST gnatcoll-core-2019-20190515-24AD8-src.tar.gz 1423276 BLAKE2B 154b7a7f77c1f0d6414cb407958d64b84be8d19b7e3a12f69bd3dd1253b71df394aa0c842d2caf9d2de071ea5466589111526329155291f0d967c8b4cc2b18ac SHA512 9b2101448b96ac46cebada1fe3cb7b583cbf296f9b7d627771e83c56c78ce72c50ede5474f64f16feba252a18fd46b473901820766902b0c68d63beaf55a884a DIST gnatcoll-core-gpl-2018-src.tar.gz 1657129 BLAKE2B 616aef931fb542f4a022c63db53acb0f8b4323e3b948eb7b8b5688c36817b3f52b5f517b969b0560b6492d51a3e59c8350449cbbe7246b5294c45caeead4d9d6 SHA512 bf6082573dc537836ea8506a2c9a75dc7837440c35c5b02a52add52e38290d99e90a9706690591f8899b8b4935824b195f230b3aa1c4da10911e3caf954c04ac -EBUILD gnatcoll-core-2018-r1.ebuild 1819 BLAKE2B c7ebb38b4ee6b3cce6b2a54aadad4482b03405cdf290498f63ca0106af6fc9b8e865f31b352112f7dc875047388a5cdfd9681bfff3505c8dd4d5248ead9fc9de SHA512 469841e1059869a40084d23150ec8c053e3752c319c8945b004a2422ab5a09df222a3039def88c764356de7f325adf72ee6a483b878055fe8f78bc3625bd6d2a -EBUILD gnatcoll-core-2018.ebuild 1657 BLAKE2B 65f2a5a2f354b4582607e90d278099cdc17f9dfa416639e39c095f991b531d01c45256d059b30a9f26c41393c52f6f84d9e91cf8e073b3f6d314f7585334bc1f SHA512 17303963480f1335c29d4af93e2038f128a676a2a62ced9a77cf4434892b1bc94356992f55af24f3dee18f4cc9f5b65c10a799298bcee691a1d84a891cf46881 -EBUILD gnatcoll-core-2019.ebuild 1830 BLAKE2B 45bb3e91490790ae103d74ccf9397dbae604c4f1200bace2452e881d7b7fd6fa72663b991b3e1ea91ca13905ed3c683432e565cf4b3d513f368da6640bb19056 SHA512 25a6c2dfad3738c5aed6bfd7c1cb5852d5511ff568e45ce557ec454c20222671c9790a34e8850e15c03ef5378f2b31886736ec480fe78836b3e8036e5e154b13 -MISC metadata.xml 1367 BLAKE2B 8d2cc7d1880d5dad79c2a3c7692c6a0261605ba5de8709ca89eab302671b8261ec5a1d25db143cd7aa16b963c3893b47681d27f44a88ef82e685842e1301836f SHA512 b1574899cdb80ac0e497b7d3f1f281ac95f0573f8a917ab4545ce0c9a2a8aad6b7082f854f07d954c4f54af578070406d01d65ae008a2966bc35fe5aaff4ce1b +EBUILD gnatcoll-core-2018-r1.ebuild 1836 BLAKE2B 47ca0213599f3b740c14934bb3360599d86409a221ef555e5388c39f16bb1e7f73fae3b7bdd914919e4d4d9d8431630af364166daccb3fc5aa491739c4be5a37 SHA512 e54b32a58803f4c2bb06a56d3981dff7ae9a8bdd0fd8a055316a489e433a7f807828f32501718644983fa602e7bf0556342148099ce0be00a8e9a4ffa5bd8815 +EBUILD gnatcoll-core-2019.ebuild 1849 BLAKE2B 2d4e3be08c9126b602bdb97808e9514d982141975647cc3755cb6382c6005db7e31129512b5991e65d26ac26ad80ae4c0e92c996b5c4e5954c01c999abb292a3 SHA512 d519208fd2ac9e542a017f2fa2b78b7974cbe04042b110901eb1a3678573a2457109e6c59ab1708f6548133827f2f978114d7d1cdf31bb6259a27ad8f43edf84 +MISC metadata.xml 1095 BLAKE2B 52c64e5050f7d0be080c1c05a6beef22b88e1389c61c958c8f0ccd6958e7686c3b8ca5dcca685f0314e68e1713635475178d63edef1d41277ca83fdb59322529 SHA512 57963c0ed66d0f4844b6d41e66c3c2451f4d61da45119b38e3ef2e5b80de94d6426eefbc0307928c3629e052bd4c0fdd2e6e2cf7678029308299ffb151960905 diff --git a/dev-ada/gnatcoll-core/gnatcoll-core-2018-r1.ebuild b/dev-ada/gnatcoll-core/gnatcoll-core-2018-r1.ebuild index e3449f09b04f..605dcf42e672 100644 --- a/dev-ada/gnatcoll-core/gnatcoll-core-2018-r1.ebuild +++ b/dev-ada/gnatcoll-core/gnatcoll-core-2018-r1.ebuild @@ -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 gnat_2019 +shared static-libs static-pic" RDEPEND=" @@ -21,7 +21,8 @@ RDEPEND=" dev-ada/libgpr[shared?,static-libs?,static-pic?] !dev-ada/gnatcoll" DEPEND="${RDEPEND} - dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]" + dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?] + dev-ada/gprbuild[gnat_2019(-)?]" REQUIRED_USE="^^ ( gnat_2016 gnat_2017 gnat_2018 gnat_2019 )" diff --git a/dev-ada/gnatcoll-core/gnatcoll-core-2018.ebuild b/dev-ada/gnatcoll-core/gnatcoll-core-2018.ebuild deleted file mode 100644 index 37d1058f21c9..000000000000 --- a/dev-ada/gnatcoll-core/gnatcoll-core-2018.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit multiprocessing - -MYP=${PN}-gpl-${PV} - -DESCRIPTION="GNAT Component Collection Core packages" -HOMEPAGE="http://libre.adacore.com" -SRC_URI="http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a99 - -> ${MYP}-src.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="gnat_2016 gnat_2017 +gnat_2018 +shared static-libs static-pic" - -RDEPEND=" - dev-ada/libgpr[gnat_2016=,gnat_2017=,gnat_2018=] - dev-ada/libgpr[shared?,static-libs?,static-pic?] - !dev-ada/gnatcoll" -DEPEND="${RDEPEND} - dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018=]" - -S="${WORKDIR}"/${MYP}-src - -PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) - -src_prepare() { - 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 - fi - default - sed -i \ - -e "s:@GNATLS@:${CHOST}-gnatls-${GCC_PV}:g" \ - src/gnatcoll-projects.ads \ - || die -} - -src_configure() { - emake prefix="${D}usr" PROCESSORS=$(makeopts_jobs) setup -} - -src_compile() { - build () { - 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 - } - if use shared; then - build relocatable - fi - if use static-pic; then - build static-pic - fi - if use static-libs; then - build static - fi -} - -src_install() { - if use shared; then - emake install-relocatable - fi - if use static-pic; then - emake install-static-pic - fi - if use static-libs; then - emake install-static - fi - rm -r "${D}"/usr/share/gpr/manifests || die - einstalldocs -} diff --git a/dev-ada/gnatcoll-core/gnatcoll-core-2019.ebuild b/dev-ada/gnatcoll-core/gnatcoll-core-2019.ebuild index e9678209c711..e1a9570911f3 100644 --- a/dev-ada/gnatcoll-core/gnatcoll-core-2019.ebuild +++ b/dev-ada/gnatcoll-core/gnatcoll-core-2019.ebuild @@ -21,7 +21,8 @@ RDEPEND=" dev-ada/libgpr[shared?,static-libs?,static-pic?] !dev-ada/gnatcoll" DEPEND="${RDEPEND} - dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]" + dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?] + dev-ada/gprbuild[gnat_2019(-)?]" REQUIRED_USE="^^ ( gnat_2016 gnat_2017 gnat_2018 gnat_2019 )" diff --git a/dev-ada/gnatcoll-core/metadata.xml b/dev-ada/gnatcoll-core/metadata.xml index 67e9acaf0903..26e17d5dcfbb 100644 --- a/dev-ada/gnatcoll-core/metadata.xml +++ b/dev-ada/gnatcoll-core/metadata.xml @@ -5,10 +5,6 @@ <email>ada@gentoo.org</email> </maintainer> <use> - <flag name="gnat_2016">Compile with dev-lang/gnat-gpl-2016</flag> - <flag name="gnat_2017">Compile with dev-lang/gnat-gpl-2017</flag> - <flag name="gnat_2018">Compile with dev-lang/gnat-gpl-2018</flag> - <flag name="gnat_2019">Compile with dev-lang/gnat-gpl-2018</flag> <flag name="shared">Build shared library</flag> <flag name="static-pic">Build static library with pic code</flag> </use> diff --git a/dev-ada/gnatcoll-db/Manifest b/dev-ada/gnatcoll-db/Manifest index 8c3ad6a4a7b4..5084389e81e4 100644 --- a/dev-ada/gnatcoll-db/Manifest +++ b/dev-ada/gnatcoll-db/Manifest @@ -1,5 +1,4 @@ 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-r1.ebuild 2802 BLAKE2B 4804c796c704d417276f345f97b02089edbe911e43c05ca5209c8f824131b5de4fd9cae0404dbdce90835a84ba20e0d16f6bf2d3692f869d26d98e55cfbf33ce SHA512 47ef7f0a0aab10023565291e049b7290c1a6af1c22158a41cd4ffcde4be503bdc18ed7f17a8f657df79e11c6bc1ebc550d54ec13cae14be5364a8963946cef20 -EBUILD gnatcoll-db-2018.ebuild 2633 BLAKE2B 87dd5f392ab6986ba13268ca70c7c873486471c9dd4e62f8160666a149a386249693506c244b02b455f47f033c28325da27c7ca893ca93a7cae4a39a1fa9e8d8 SHA512 5e0885514dc75800d83b444f53d5487b1c0ea3faf04581335f876cd64b2631ba541f76fc5bb1b704190f20c13ba9421e0bd7ac7d0e336654de3e3f16f7de2280 -MISC metadata.xml 1555 BLAKE2B 18ba00a762c3ec120d127c9c47f8e7b086fa6126bf6a9196e7ffd7d29f88725d591df937d809c1348e20785d03a6371455fd9ae6ee8b40f68533392ded420279 SHA512 4c515e6411f950d2847076bcd2aca4b49ba9639f439e865c186616e7e7529bbc89f31f8f956e9246d56f68f4f4447849067df71a6fed141a3b2eefe056134186 +EBUILD gnatcoll-db-2018-r1.ebuild 2819 BLAKE2B 8ea0088b103661b811009fe4bbaa8a9de77e07e04e82d0387edc708b527527bb35a6f539944edf38385d36509a0482bffdc72934a7f9e99dff7f6ed51a3b1ad3 SHA512 2b1f5c94d82d86a7737c68aedfda88674bb427911117036a7c1439cb297659de3167456b4cd8127413526d4107c6197f6220fc42b2ea8949799f3c0060355eeb +MISC metadata.xml 1283 BLAKE2B edf8cff8d918007b78ad3d5011a1b4b6b0d3cb1023b892c941d499dd054c21e6e7e9ce0dc913b33e80f0052cd25d453114e622ffedd737f1a4e45bd9dd616364 SHA512 4c5746a6e201c8c5a1d4d17af1c73ed5f402eddf3af2b152e0229d847476b03dba2fb15c4439b0f032b5f0ed9ed425267db0e36617d9d220709c4ff279ea6e7c diff --git a/dev-ada/gnatcoll-db/gnatcoll-db-2018-r1.ebuild b/dev-ada/gnatcoll-db/gnatcoll-db-2018-r1.ebuild index edb42ca118a3..af9bc69a22f9 100644 --- a/dev-ada/gnatcoll-db/gnatcoll-db-2018-r1.ebuild +++ b/dev-ada/gnatcoll-db/gnatcoll-db-2018-r1.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 gnat_2019 gnatcoll_db2ada gnatinspect postgres +shared sql sqlite static-libs static-pic xref" @@ -28,7 +28,8 @@ RDEPEND="dev-ada/gnatcoll-core[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_20 ) ${PYTHON_DEPS}" DEPEND="${RDEPEND} - dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]" + dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?] + dev-ada/gprbuild[gnat_2019(-)?]" REQUIRED_USE="gnatinspect? ( xref ) xref? ( sqlite ) diff --git a/dev-ada/gnatcoll-db/gnatcoll-db-2018.ebuild b/dev-ada/gnatcoll-db/gnatcoll-db-2018.ebuild deleted file mode 100644 index bce7b5b49aef..000000000000 --- a/dev-ada/gnatcoll-db/gnatcoll-db-2018.ebuild +++ /dev/null @@ -1,101 +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 multilib multiprocessing autotools python-single-r1 - -MYP=${PN}-gpl-${PV} - -DESCRIPTION="GNAT Component Collection" -HOMEPAGE="http://libre.adacore.com" -SRC_URI="http://mirrors.cdn.adacore.com/art/5b0ce9cbc7a4475263382be6 - -> ${MYP}-src.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="gnat_2016 gnat_2017 +gnat_2018 gnatcoll_db2ada gnatinspect postgres - +shared sql sqlite static-libs static-pic xref" - -RDEPEND="dev-ada/gnatcoll-core[gnat_2016=,gnat_2017=,gnat_2018=] - dev-ada/gnatcoll-core[shared?,static-libs?,static-pic?] - sqlite? ( dev-db/sqlite:3 ) - postgres? ( dev-db/postgresql:* ) - xref? ( - dev-ada/gnatcoll-bindings[iconv,shared?,static-libs?,static-pic?] - dev-ada/gnatcoll-bindings[gnat_2016=,gnat_2017=,gnat_2018=] - )" -DEPEND="${RDEPEND} - dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018=]" - -REQUIRED_USE="gnatinspect? ( xref ) - xref? ( sqlite ) - sqlite? ( sql ) - gnatcoll_db2ada? ( sql )" - -S="${WORKDIR}"/${MYP}-src - -PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) - -src_compile() { - build () { - 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 \ - -P $1/$3.gpr \ - -cargs:Ada ${ADAFLAGS} -cargs:C ${CFLAGS} || die "gprbuild failed" - } - for kind in shared static-libs static-pic ; do - if use $kind; then - lib=${kind%-libs} - lib=${lib/shared/relocatable} - for dir in sql sqlite xref postgres ; do - if use $dir; then - build $dir $lib gnatcoll_${dir} - fi - done - fi - done - if use shared; then - preflib=relocatable - elif use static-libs; then - preflib=static - else - preflib=static-pic - fi - for dir in gnatinspect gnatcoll_db2ada ; do - if use $dir; then - build $dir $lib ${dir} - fi - done -} - -src_install() { - build () { - GPR_PROJECT_PATH="${D}/usr/share/gpr" gprinstall -p -f \ - -XBUILD=PROD -XGNATCOLL_VERSION=2018 \ - --prefix="${D}"/usr -XLIBRARY_TYPE=$2 -XXMLADA_BUILD=$2 \ - -XGPR_BUILD=$2 --build-name=$2 --build-var=LIBRARY_TYPE \ - -P $1/$3.gpr - } - for kind in shared static-libs static-pic ; do - if use $kind; then - lib=${kind%-libs} - lib=${lib/shared/relocatable} - for dir in sql sqlite xref postgres ; do - if use $dir; then - build $dir $lib gnatcoll_${dir} - fi - done - fi - done - for dir in gnatinspect gnatcoll_db2ada ; do - if use $dir; then - build $dir $lib ${dir} - fi - done - rm -rf "${D}"/usr/share/gpr/manifests - einstalldocs -} diff --git a/dev-ada/gnatcoll-db/metadata.xml b/dev-ada/gnatcoll-db/metadata.xml index 7cd1fd91fa6e..888f72c483e5 100644 --- a/dev-ada/gnatcoll-db/metadata.xml +++ b/dev-ada/gnatcoll-db/metadata.xml @@ -5,10 +5,6 @@ <email>ada@gentoo.org</email> </maintainer> <use> - <flag name="gnat_2016">Compile with dev-lang/gnat-gpl-2016</flag> - <flag name="gnat_2017">Compile with dev-lang/gnat-gpl-2017</flag> - <flag name="gnat_2018">Compile with dev-lang/gnat-gpl-2018</flag> - <flag name="gnat_2019">Compile with dev-lang/gnat-gpl-2019</flag> <flag name="gnatcoll_db2ada">Build gnatcoll_db2ada</flag> <flag name="gnatinspect">Build gnatinspect</flag> <flag name="shared">Build shared library</flag> diff --git a/dev-ada/gnatcoll/Manifest b/dev-ada/gnatcoll/Manifest index 8e9585c2dcda..0d9d849c119b 100644 --- a/dev-ada/gnatcoll/Manifest +++ b/dev-ada/gnatcoll/Manifest @@ -1,4 +1,4 @@ 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 3250 BLAKE2B d19995ce79c3a0ba473a5e05ca7b9693c5069bc4bad9c291678792e5db5905946adf465e25156c8d6428333c5c6f8d0794e541fa6da6f48f9129e45ee65b60f2 SHA512 6aaabb4e81fedbaa892c0e1c2ac03dbf16a43e2498fcd994b7d953463157df4562d5ef2ccae852edcc2576e46f23300bb0ec84ee10e5576bcfc04679a4a55246 -MISC metadata.xml 1438 BLAKE2B 29ae4896a6c86b1e7e507d4c9a91a553ae363633221762dae9e4e46e5c604e1b1c93ac663975c659e1f316a8affafad25c7c789dd0b528add09d1bfb40e623fb SHA512 919a5c34fcf3a0b55a5d90f8749f7983e7ef4b75ecf25fad33ceb8d335ebd799d203eb126ad99296bc5a838f3d117e48a41299d245ce88a35a1f602cbc81ebed +EBUILD gnatcoll-2017.ebuild 3257 BLAKE2B 3fe04c24429c39e1904bd95ecc09ac7f45a357ee9305fdfb3689fe9201ebedc51b838188a15d1c3ed1b40cb31fed42dc12da08a0e2a1171bebeb0af1816281a5 SHA512 d029004d698dae4016008e2c29a2a106c68f7b1b5647d3a05108d49fa44b2e5c7d90d806b2218736cb6116c18c7be6ebb2ff6d7f2a92bca65c7860d3c516fc65 +MISC metadata.xml 1194 BLAKE2B b4b93464f8dffd89bb43ca27e18e015d7cb720041fd7d405d3c7e5af9f8a53316959ab6696d5d762a1afa887648f7028cb831305b63a1782cd1c62f2486447c1 SHA512 a6fb6bf6f82f5582f4cca95e5864202664483fba5c4b813c4f515f670cb5fd720437001fd497167235c29843da2fb967e429f9a410d5b7ec2acefbc01ac30bf3 diff --git a/dev-ada/gnatcoll/gnatcoll-2017.ebuild b/dev-ada/gnatcoll/gnatcoll-2017.ebuild index f43af38da683..54e0a586a460 100644 --- a/dev-ada/gnatcoll/gnatcoll-2017.ebuild +++ b/dev-ada/gnatcoll/gnatcoll-2017.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -35,14 +35,14 @@ RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite ) projects? ( - ~dev-ada/libgpr-2018[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=]" + dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?]" REQUIRED_USE="${PYTHON_REQUIRED_USE} tools? ( static-libs ) diff --git a/dev-ada/gnatcoll/metadata.xml b/dev-ada/gnatcoll/metadata.xml index 7ba8da900cc2..cc1fe1d3561e 100644 --- a/dev-ada/gnatcoll/metadata.xml +++ b/dev-ada/gnatcoll/metadata.xml @@ -4,13 +4,7 @@ <maintainer type="project"> <email>ada@gentoo.org</email> </maintainer> - <maintainer type="person"> - <email>tupone@gentoo.org</email> - <name>Tupone Alfredo</name> - </maintainer> <use> - <flag name="gnat_2016">Compile with dev-lang/gnat-gpl-2016</flag> - <flag name="gnat_2017">Compile with dev-lang/gnat-gpl-2017</flag> <flag name="projects">Adds support for projects</flag> <flag name="pygobject">Adds support for pygobject</flag> <flag name="shared">Build shared library</flag> diff --git a/dev-ada/gnatmem/Manifest b/dev-ada/gnatmem/Manifest index 62d9fef2e6e7..67f6ae2fd3bd 100644 --- a/dev-ada/gnatmem/Manifest +++ b/dev-ada/gnatmem/Manifest @@ -1,6 +1,4 @@ AUX gnatmem-2018-gentoo.patch 2998 BLAKE2B ef2afa9a7ef200adb3729ac6e3bf80b6a4f92cae8c560805c741189917e454a391a6cc09271491110fd2e0c7c95cef672f807a64acf247cea2996fb2bbc71c31 SHA512 259915b1b9c5a586609c0e2801df3239f859871a194da5cd53ad323020832f5e2f37419bbb6f7e3c1d6a0c5d4a2bcf7b709db220b190abe84faa54463f43d199 DIST gnatmem-2019-20190429-19745-src.tar.gz 80136 BLAKE2B 8ae3b41827416f951abb0d0a1fe533946fad2ac8d67ae6aad2b14495a3c068718befbbbf11800c1864f3becaa0ca6dfb838aeec3b3d715b250d4436ccee93c69 SHA512 4354a30efcf95a013f481b3519a79a22f85348840f074c734013d6c73e00fd771118b84eec416260983c383484f7a404217a32c012ca0bd7c37253ba17f2eb85 -DIST gnatmem-gpl-2018-src.tar.gz 80101 BLAKE2B c117552c2f8369f588127933ca1ba3075aeea6d7c3867861817b080f633fe26a7692c101b500d7441b49e79e75ce5a771a80287d0fb28bd0f569a358a8976d7d SHA512 539703bcb97cab996a4b4381685b021a419df781be3997538120580944fdcbb021fd28f574f66b8d52adbf5c6f1d7e29495c2115515d761f3cfce5bcc7bd8f56 -EBUILD gnatmem-2018.ebuild 901 BLAKE2B d0dbd7a555bac90acedda1f7ee2b609f3968da6a6833e6473569c38087dbcca9e84605c3bc11f96a6327b00b9338bf7433aa1f1761c6ee1bdc9d1069d167733b SHA512 f49105a45131b38de1074ecf1e0e665b247754e97a42e93eb989b44444d7f56e91854e74bfbef6bdb1b8d8eb1c9e93f62ee7c284d92a12281b0b17be9b3b6d0a -EBUILD gnatmem-2019.ebuild 956 BLAKE2B 0709bfe8717af32203a2e4ea17ac6a3ab95526faaf014dc43b61d4f04249315cf9afb6d4129cc3fc06b62f427204306dae63266dc8f3ac9cad883586e0f2549c SHA512 b9e88b4f70a55d2802a197d9d6d85b161d3cafb094e0a8f6e36e73a3a035ee8fad00342a4c9f358704556c08ba1847004cf287902e89425024463314027b10f2 -MISC metadata.xml 1242 BLAKE2B cab6b4d13e6af83e0d7227dc9e77d5ed93a3fef9b79d2e5bbbd2375d7613794e3d8861906008f510eda9aacdd05dc898a9bc465a4a40de483bb3d6dfa4d6772c SHA512 b5f47ca9628e0a7939590ce8e40cecafb416b99860c70a8ae729183da21decc7dc080e71b704c4594b9e22f58b4bdd9257daca579cdc6c57feac54050ea3110b +EBUILD gnatmem-2019.ebuild 973 BLAKE2B 6377ebe8d84042b57458c20105119849507e44dad55db598e472f7ef58d07828ca2db1d2a76dc78238899717221073813f963349b3b68776780cdb13739c204f SHA512 1502881ffc88f3bca1543abcae61331aa4f69010a9a42186ba2511fb8610fd35d3e9af08d6905968141fd00d1e8e2ad5bac12936f978b7a1131cff8305b69066 +MISC metadata.xml 955 BLAKE2B fe2d45bebeeb3f23c6eae6b4b2fbc14156884636af28c5bf31bb946d9a8bd74280a426be7d5e003aa88d1c6bc390f8ddd96c864d4715ce1c034b44995eeba3d1 SHA512 f2fee13e2c491e0a0393b67aa558bac39c7f3ea5a186da421ceb3ebf092bc5acb74cd2076ae59abb81d28a83c07bf4561017164ab27558a1805653023877fa72 diff --git a/dev-ada/gnatmem/gnatmem-2018.ebuild b/dev-ada/gnatmem/gnatmem-2018.ebuild deleted file mode 100644 index 5f76770a3b7c..000000000000 --- a/dev-ada/gnatmem/gnatmem-2018.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit multiprocessing autotools - -MYP=${PN}-gpl-${PV}-src - -DESCRIPTION="Monitors dynamic allocation and deallocation activity in a program" -HOMEPAGE="http://libre.adacore.com/" -SRC_URI="http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a72 -> - ${MYP}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="gnat_2016 gnat_2017 +gnat_2018" - -RDEPEND="" -DEPEND="dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018=] - sys-libs/binutils-libs" - -REQUIRED_USE="^^ ( gnat_2016 gnat_2017 gnat_2018 )" - -S="${WORKDIR}"/${MYP} - -PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) - -src_prepare() { - default - mv configure.in configure.ac - eautoreconf -} - -src_compile() { - gprbuild -v -Pgnatmem.gpr -j$(makeopts_jobs) \ - -cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} -} - -src_install() { - dobin obj/gnatmem -} diff --git a/dev-ada/gnatmem/gnatmem-2019.ebuild b/dev-ada/gnatmem/gnatmem-2019.ebuild index dbe496b25696..b99814fd6e4c 100644 --- a/dev-ada/gnatmem/gnatmem-2019.ebuild +++ b/dev-ada/gnatmem/gnatmem-2019.ebuild @@ -14,11 +14,12 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/5cdf8e1431e87a8f1d425089 LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="gnat_2016 gnat_2017 gnat_2018 +gnat_2019" RDEPEND="" -DEPEND="dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?] +DEPEND="dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?] + dev-ada/gprbuild[gnat_2019(-)?] sys-libs/binutils-libs" REQUIRED_USE="^^ ( gnat_2016 gnat_2017 gnat_2018 gnat_2019 )" diff --git a/dev-ada/gnatmem/metadata.xml b/dev-ada/gnatmem/metadata.xml index c6a22a23c94b..f1230ca3fa8a 100644 --- a/dev-ada/gnatmem/metadata.xml +++ b/dev-ada/gnatmem/metadata.xml @@ -4,12 +4,6 @@ <maintainer type="project"> <email>ada@gentoo.org</email> </maintainer> - <use> - <flag name="gnat_2016">Compile with dev-lang/gnat-gpl-2016</flag> - <flag name="gnat_2017">Compile with dev-lang/gnat-gpl-2017</flag> - <flag name="gnat_2018">Compile with dev-lang/gnat-gpl-2018</flag> - <flag name="gnat_2019">Compile with dev-lang/gnat-gpl-2019</flag> - </use> <longdescription lang="en"> The gnatmem utility monitors dynamic allocation and deallocation activity in a program, and displays information about incorrect diff --git a/dev-ada/gnatsymbolize/Manifest b/dev-ada/gnatsymbolize/Manifest index 0bbcb2729ecf..b51d688947c0 100644 --- a/dev-ada/gnatsymbolize/Manifest +++ b/dev-ada/gnatsymbolize/Manifest @@ -2,4 +2,4 @@ DIST gnatsymbolize-2019-20190429-19761-src.tar.gz 14297 BLAKE2B 8ea689266abc4856 DIST gnatsymbolize-gpl-2018-src.tar.gz 14286 BLAKE2B ac655b951b584224e64778fd800c082defee9abce4b3e7e1ac766a38c3b1ed8624c349f249714376e5984e37a9e9df256b6627b6ed2898f2f71fcaa8067cf36b SHA512 4fc21b45c32c08f9911cb7cdc0170e36f1c10d703244bbbfbd525386297b6e6779651751281402e8c4caee668df052e7c1ccc234e5cd88151ee471b8e3f06d0f EBUILD gnatsymbolize-2018.ebuild 621 BLAKE2B 50262887f4d4eaaffa4a6923f655f8e01513fe7adaaa160f6df09891441da59a6569ab1979d9a43d21c6123f2f33f6b30391d6c737162c064f1adb774e645c79 SHA512 707400f48b8be3becdb822a6049b2bb19f36d3e4674ae60b67f2a61318207df0aa242a73e60d90fb62b822f43706f45886a546cb2d20280558f5fad44534ab0e EBUILD gnatsymbolize-2019.ebuild 813 BLAKE2B 601a6348c8d268012af6a24863f5f30e1509b794fad9b614a9edf23d17ff4b4c0206a115afa0e42f14a11995e95484dcac80f7a8d86d52c1e485b30bddad7c2b SHA512 cfe19dd085925e8693aa12b7c9154cafe6007d56e53af968593f4052d75be83daf0d8d9d94bcbbdb30630231ed56449d8a6d4a66e9359a29a0474d453173c391 -MISC metadata.xml 541 BLAKE2B 276eebab31ec8be8532d22ce08ead6111eb5378491cd72467ca663e0446c773788da5ebb3193812243fc6cc7d874e355f6b6310b70d01896c5c83880221df986 SHA512 2a0a258e7ba3e583141810e3c99bc37afdf07bb067a2da60c45150327ab674c625becd4ca37d397e3df2ed06af280aee818d24874658d1d70f7dec04708de7c1 +MISC metadata.xml 390 BLAKE2B e655e84d98e4db460d4a5ad93fbe44c1de69cccabca3e19640ce08bf159be414aa86096e7bdf79692f99a53f433ff83fb5cf82f01be3fc67d45fff4a01e2b72d SHA512 48aa4b2d37b38a602b064a6e312fad19c193239899d859e2558b1a9090cc927f9b9983cc0c7f9a2384bf3bb7665a342d6871c236b19ed2b695fb1618d525cc05 diff --git a/dev-ada/gnatsymbolize/metadata.xml b/dev-ada/gnatsymbolize/metadata.xml index 527404c23c2a..e429e17e3fc9 100644 --- a/dev-ada/gnatsymbolize/metadata.xml +++ b/dev-ada/gnatsymbolize/metadata.xml @@ -4,10 +4,6 @@ <maintainer type="project"> <email>ada@gentoo.org</email> </maintainer> - <use> - <flag name="gnat_2018">Compile with dev-lang/gnat-gpl-2018</flag> - <flag name="gnat_2019">Compile with dev-lang/gnat-gpl-2019</flag> - </use> <longdescription lang="en"> gnatsymbolize is a program which translates addresses into their corresponding filename, line number, and function names. diff --git a/dev-ada/gprbuild/Manifest b/dev-ada/gprbuild/Manifest index 1f5e5f430543..1597af2b7522 100644 --- a/dev-ada/gprbuild/Manifest +++ b/dev-ada/gprbuild/Manifest @@ -1,15 +1,10 @@ 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 11203 BLAKE2B 0dc7c1e7bfc4d3864c3e200ebb1e5f4f7f920fa1939cd940f67d72cd0bf9044f0bdf09a51e492f133be1ba3ffa50816531d7038ed60c8d757fb3d60f12da268b SHA512 56c439a97109e805dea79ed624cb8687327170351e760078acc4506f02af7374fe1e51aad57150a8960ee7d904f496e0e4583543f5cbcfce2ba3677600b01ead AUX gprbuild-2019-gentoo.patch 11240 BLAKE2B 609968e7d95bb686db4362c06600a90cd9d9cde1c4058618ed40fd90585153b02316369dc3a439b84f3c8e1031d182ed3f739b449ed8e09761e90e2b80d73a4c SHA512 f48ed180ecfd8cb6691473e1f996f1805dcae693a0e2710fdfd0c246443cbe732ccc6dbb415c90396886b0b79d8aac22e3c7b720ca4f6da746e22485972aace5 DIST gprbuild-2019-20190517-194D8-src.tar.gz 2507961 BLAKE2B 0f70d94cb0db9ddc1dd308862aaa305a91965a62a936cfbdde2ae9f3f735f0cc3d69596b09da4b979a1d7923087ab0ec5cf2d6541551f057b5e8e0c499065a90 SHA512 0388d7e6cdf625fef40b33da764091b3283dd88714c64ecfad4b5e99253f183b1a9b717c19281e6d45cc4277a05fadb2e2ace394d6f30638664b66c97123052b 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-2019-20190429-19B9D-src.tar.gz 1582603 BLAKE2B e2be3e7c0c8b843bfc808a3dd726235a82588caed8c919975a97ce34c72d6d634361bbc34208590210936add9e2f881b59d01168ef79abed1e489c50b27094d8 SHA512 f8e0e25b0aee9a7a18223ae7761603082af55134f062c767d0cd0dbf0dbcb2058fc7c57532b567fb2c6efa464a53ead57b300578e98962025866e5c3ad73e380 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 2207 BLAKE2B 50a99fa4729a7cb8a9689fa23b6f764be7077094101aa7dbe7452002b7b0c5602dbd82924ef1a6252ce6c973ec5f1ed687ef1d773b43ada1d0a5c707c97d564c SHA512 0c0d40bcd506f86da9e9b1e2d1d57163de5e3dc12095e6566251a673ddc236e099460a83be1a47e2b103d30474c168240257a442ebc5f727633fa6608e105b7b -EBUILD gprbuild-2018-r3.ebuild 2115 BLAKE2B 6a30d38af19eb3c18bcacae6aa3bdd6e4315102c5f0c3591df90f31e51fa954c654c975c527b8b93d5190851fda8d50cd894050f36cacd351fc707d06dfbf20c SHA512 91dab25795db0e5acfa4d3a1ce9d3653d94726ad9a8f733437b2ea23cda9db17af81c998fa8b70e5ad8d5abb14f15f59aaf9aaf6f4640b11a471b14a5e0b2099 -EBUILD gprbuild-2018-r4.ebuild 2216 BLAKE2B 6f3d2ed1ba98f78f6de056a417b105f4b7fea7913e4f24c96ea0db53efaaa8d5d64e8e8d9b7282c2c2830f20c50a4d490303eba376f50f9cb711104d54ce9dc1 SHA512 30ffb50005d27bb1b16e6b6e55e0ef8d1919e5dd4232fc269931e4b140cb9ca9cdd760142a5e8857b14c2666755ac7ff3dcff600760b6892846cd80a5bef6433 EBUILD gprbuild-2019.ebuild 2173 BLAKE2B 9d2e45af39dc7ba00768f6e2dad33b45bb41d356302e3b95ba8f563723ef6a1c6a963feebbfe7b48a11b674a81eb10953c406a5db6194d65fb87e6e1c82f0ff0 SHA512 971ff937c6b44df9d953b0e229bee3a09fd958b64925c295f7c75bffb20a7db693899731c46971f790c550d1c850163af63b711ed0474102adb7ee4124178519 -MISC metadata.xml 1093 BLAKE2B 825a9a6458e11fddc7e9e644ba3a6ea24d9ae110384f6db18d348e3a1e87cc9889f103af7f6ef2008284ce3fe87aab1a3b96675a23f686ee1b2e7aa8b275113b SHA512 b4bdcbc66e7cacd1d02b53ea1220cde0b6a40a2edf5b8eda269b6183f6459ce79228515cac6e6a59395288bc067c37285fa6f2bf11456f5b166ceebbc41d7c28 +MISC metadata.xml 806 BLAKE2B 9d6978348f59b502b01b50115341a30ee205bc7022197e70be4048e59b510bded9a1b292e8c33085a59291b2322bb14a1bbcb6f1a779f13189aa7d8e816c8d62 SHA512 76843dcfafdee7a423975793838849602b7ecc437704932d852cff87000bd1ab98c36ea33cb9a07ca09ee40eb728df1c78b4f6aa37a11ae9fe3f8bd74d83138f diff --git a/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch b/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch deleted file mode 100644 index 34936ea1f52b..000000000000 --- a/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch +++ /dev/null @@ -1,284 +0,0 @@ ---- a/gpr/gpr.gpr 2017-05-27 20:59:07.061135892 +0200 -+++ b/gpr/gpr.gpr 2017-05-27 20:59:38.022638398 +0200 -@@ -67,6 +67,7 @@ - for Switches ("gpr*.ad?") use - Compiler'Default_Switches ("Ada") & ("-g1"); - end case; -+ for Driver ("C") use External ("CC", "gcc"); - end Compiler; - - end GPR; ---- a/gpr/src/gpr-names.ads 2017-11-19 13:09:18.947527738 +0100 -+++ b/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); ---- a/gpr/src/gpr-names.adb 2017-11-19 13:10:27.674316703 +0100 -+++ b/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; - ---- a/gpr/src/gpr-snames.adb 2017-11-19 13:12:41.592995718 +0100 -+++ b/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"); ---- a/src/gprlib.adb 2017-12-18 12:20:02.937317216 +0100 -+++ b/src/gprlib.adb 2017-12-18 12:21:36.519604590 +0100 -@@ -263,7 +263,9 @@ - - Driver_Name : Name_Id := No_Name; - -- Gnatbind_Name : String_Access := new String'("gnatbind"); -+ Gnatbind_Name : String_Access := new String'("@GNATBIND@"); -+ -+ Gnatbind_Path_Option : constant String := "--gnatbind_path="; - - Compiler_Name : String_Access := new String'("gcc"); - -@@ -1944,13 +1946,13 @@ - and then Line (Last - 2 .. Last) = "gcc" - then - Gnatbind_Name := -- new String'(Line (1 .. Last - 3) & "gnatbind"); -+ new String'(Line (1 .. Last - 3) & "@GNATBIND@"); - - elsif Last > 7 - and then Line (Last - 6 .. Last) = "gcc.exe" - then - Gnatbind_Name := -- new String'(Line (1 .. Last - 7) & "gnatbind"); -+ new String'(Line (1 .. Last - 7) & "@GNATBIND@"); - end if; - end if; - -@@ -2100,7 +2102,13 @@ - Mapping_File_Name := new String'(Line (1 .. Last)); - - when Binding_Options => -- Binding_Options_Table.Append (Line (1 .. Last)); -+ if Last > Gnatbind_Path_Option'Length -+ and then Line (1 .. Gnatbind_Path_Option'Length) = -+ Gnatbind_Path_Option then -+ null; -+ else -+ Binding_Options_Table.Append (Line (1 .. Last)); -+ end if; - - when Copy_Source_Dir => - Copy_Source_Directory := new String'(Line (1 .. Last)); ---- a/share/gprconfig/compilers.xml 2018-10-17 14:36:15.100480516 +0200 -+++ b/share/gprconfig/compilers.xml 2018-10-17 15:38:57.333256634 +0200 -@@ -20,15 +20,15 @@ - <!-- GCC 3.x & 4.x (not for GNAT Pro)--> - <compiler_description> - <name>GCC</name> -- <executable prefix="1">(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-generic-linux-gnu-|.*-pc-mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|aarch64-linux-gnu-)?gcc</executable> -+ <executable prefix="1">(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-generic-linux-gnu-|.*-pc-mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|aarch64-linux-gnu-)?gcc-@VER@</executable> - <version> -- <external>${PREFIX}gcc -v</external> -+ <external>${PREFIX}gcc-@VER@ -v</external> - <nogrep regexp="for GNAT Pro"></nogrep> - <grep regexp="^gcc \S+ (\S+)" group="1"></grep> - </version> - <languages>C</languages> - <target> -- <external>${PREFIX}gcc -dumpmachine</external> -+ <external>${PREFIX}gcc-@VER@ -dumpmachine</external> - <grep regexp="[^\r\n]+"></grep> - </target> - </compiler_description> -@@ -170,14 +170,14 @@ - --> - <compiler_description> - <name>GNAT</name> -- <executable prefix="1">(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-generic-linux-gnu-|.*-pc-mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|aarch64-linux-gnu-|.*-qnx.*)?gnatls</executable> -+ <executable prefix="1">(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-generic-linux-gnu-|.*-pc-mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|aarch64-linux-gnu-|.*-qnx.*)?gnatls-@VER@</executable> - <version> -- <external>${PREFIX}gnatls -v --version</external> -+ <external>${PREFIX}gnatls-@VER@ -v --version</external> - <grep regexp="^GNATLS.+?(\d+(\.\d+)?)" group="1"></grep> - </version> - <languages>Ada</languages> - <variable name="gcc_version"> -- <external>${PREFIX}gcc -v</external> -+ <external>${PREFIX}gcc-@VER@ -v</external> - <grep regexp="^[-\w]*gcc \S+ (\S+)" group="1"></grep> - </variable> - <runtimes default="default,kernel,native"> -@@ -187,71 +187,11 @@ - <directory group="1" >\.\./$TARGET/lib/gnat/(.*)/adalib/</directory> - </runtimes> - <target> -- <external>${PREFIX}gcc -dumpmachine</external> -+ <external>${PREFIX}gcc-@VER@ -dumpmachine</external> - <grep regexp="[^\r\n]+"></grep> - </target> - </compiler_description> - -- <!-- CodePeer --> -- -- <compiler_description> -- <name>GNAT_CODEPEER</name> -- <executable prefix="1">(.*codepeer-)gnatls</executable> -- <version> -- <external>${PREFIX}gnatls -v</external> -- <grep regexp="^GNATLS.+?(\d+(\.\d+)?)" group="1"></grep> -- </version> -- <languages>Ada</languages> -- <variable name="gcc_version"> -- <external>${PREFIX}gcc -v</external> -- <grep regexp="^[-\w]*gcc \S+ (\S+)" group="1"></grep> -- </variable> -- <runtimes default="default,native"> -- <directory group="default" >\.\./lib/gcc/.*/$gcc_version/adalib/</directory> -- <directory group="1" >\.\./lib/gnat/(.*)/adalib/</directory> -- <directory group="1" >\.\./lib/gcc/.*/$gcc_version/rts-(.*)/adalib/</directory> -- </runtimes> -- <target>codepeer</target> -- </compiler_description> -- -- <!-- C Target --> -- -- <compiler_description> -- <name>GNAT_C</name> -- <executable prefix="1">(c-)gnatls</executable> -- <version> -- <external>${PREFIX}gnatls -v</external> -- <grep regexp="^GNATLS.+?(\d+(\.\d+)?)" group="1"></grep> -- </version> -- <languages>Ada</languages> -- <variable name="gcc_version"> -- <external>${PREFIX}gcc -v</external> -- <grep regexp="^[-\w]*gcc \S+ (\S+)" group="1"></grep> -- </variable> -- <runtimes default="default"> -- <directory group="default" >\.\./libexec/gnat_ccg/lib/gcc/.*/$gcc_version/adalib/</directory> -- <directory group="1" >\.\./lib/gnat/(.*)/adalib/</directory> -- </runtimes> -- <target>c</target> -- </compiler_description> -- -- <!-- GNAT_DOTNET --> -- -- <compiler_description> -- <name>GNAT_DOTNET</name> -- <executable prefix="1">(.*dotnet-)gnatls</executable> -- <version> -- <external>${PREFIX}gnatls -v</external> -- <grep regexp="^GNATLS.+?(\d+(\.\d+)?)" group="1"></grep> -- </version> -- <languages>Ada</languages> -- <runtimes default="default,kernel"> -- <directory group="default" >\.\./lib/dotgnat/adalib/</directory> -- <directory group="1" >\.\./lib/dotgnat/rts-(.*)/adalib/</directory> -- </runtimes> -- <target>dotnet</target> -- </compiler_description> -- - <!-- G77 --> - <compiler_description> - <name>G77</name> -@@ -295,21 +295,6 @@ - </target> - </compiler_description> - -- <!-- LLVM Compiler --> -- <compiler_description> -- <name>LLVM</name> -- <executable>clang</executable> -- <version> -- <external>clang -v</external> -- <grep regexp=".*(LLVM|clang) version ([0-9.]*)" group="2"></grep> -- </version> -- <languages>C</languages> -- <target> -- <external>clang -dumpmachine</external> -- <grep regexp="[^\r\n]+"></grep> -- </target> -- </compiler_description> -- - <!-- Windres compiler --> - <compiler_description> - <name>WINDRES</name> ---- a/share/gprconfig/gnat.xml 2018-10-17 18:38:35.547094541 +0200 -+++ b/share/gprconfig/gnat.xml 2018-10-17 18:40:16.281379341 +0200 -@@ -60,7 +60,7 @@ - &filter_gnat; - <config> - package Compiler is -- for Driver ("Ada") use "${PATH(ada)}${PREFIX(ada)}gcc"; -+ for Driver ("Ada") use "${PATH(ada)}${PREFIX(ada)}gcc-@VER@"; - for Language_Kind ("Ada") use "unit_based"; - for Dependency_Kind ("Ada") use "ALI_File"; - for Leading_Required_Switches ("Ada") use -@@ -77,6 +77,9 @@ - for Objects_Path_File ("Ada") use "ADA_PRJ_OBJECTS_FILE"; - for Driver ("Ada") use - "${GPRCONFIG_PREFIX}libexec/gprbuild/gprbind"; -+ for Switches ("Ada") use ("--gnatbind_path=gnatbind-@VER@"); -+ for Required_Switches ("Ada") use -+ Binder'Required_Switches ("Ada") & ("--RTS=${RUNTIME_DIR(ada)}"); - end Binder; - - for Toolchain_Version ("Ada") use "GNAT ${VERSION(ada)}"; ---- a/share/gprconfig/c.xml 2018-10-17 21:31:44.442501471 +0200 -+++ b/share/gprconfig/c.xml 2018-10-17 21:33:06.562088044 +0200 -@@ -14,7 +14,7 @@ - </compilers> - <config> - package Compiler is -- for Driver ("C") use "${PATH(c)}${PREFIX(c)}gcc"; -+ for Driver ("C") use "${PATH(c)}${PREFIX(c)}gcc-@VER@"; - end Compiler; - </config> - </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", "-no-pie", "-o"); - </config> - </configuration> - diff --git a/dev-ada/gprbuild/gprbuild-2018-r3.ebuild b/dev-ada/gprbuild/gprbuild-2018-r3.ebuild deleted file mode 100644 index a1157f5c3701..000000000000 --- a/dev-ada/gprbuild/gprbuild-2018-r3.ebuild +++ /dev/null @@ -1,86 +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=${PN}-gpl-${PV} - -DESCRIPTION="Multi-Language Management" -HOMEPAGE="http://libre.adacore.com/" -SRC_URI=" - http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a68 - -> ${MYP}-src.tar.gz - http://mirrors.cdn.adacore.com/art/5b0819dec7a447df26c27a40 - -> xmlada-gpl-${PV}-src.tar.gz" -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="gnat_2016 gnat_2017 +gnat_2018" - -DEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) - gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) - gnat_2018? ( dev-lang/gnat-gpl:7.3.1 )" -RDEPEND="${DEPEND}" - -S="${WORKDIR}"/${MYP}-src - -REQUIRED_USE="!gnat_2016 ^^ ( gnat_2017 gnat_2018 )" -PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) - -src_prepare() { - if use gnat_2017; then - GCC_PV=6.3.0 - else - GCC_PV=7.3.1 - fi - default - sed -i \ - -e "s:@VER@:${GCC_PV}:g" \ - share/gprconfig/compilers.xml \ - share/gprconfig/gnat.xml \ - share/gprconfig/c.xml \ - share/gprconfig/linker.xml \ - || die - sed -i \ - -e "s:@GNATBIND@:gnatbind-${GCC_PV}:g" \ - src/gprlib.adb \ - || die -} - -src_configure() { - emake prefix="${D}"usr setup -} - -bin_progs="gprbuild gprconfig gprclean gprinstall gprname gprls" -lib_progs="gprlib gprbind" - -src_compile() { - GCC=${CHOST}-gcc-${GCC_PV} - GNATMAKE=${CHOST}-gnatmake-${GCC_PV} - local xmlada_src="../xmlada-gpl-${PV}-src" - incflags="-Isrc -Igpr/src -I${xmlada_src}/sax -I${xmlada_src}/dom \ - -I${xmlada_src}/schema -I${xmlada_src}/unicode \ - -I${xmlada_src}/input_sources" - ${GCC} -c ${CFLAGS} gpr/src/gpr_imports.c -o gpr_imports.o || die - for bin in ${bin_progs}; do - ${GNATMAKE} -j$(makeopts_jobs) ${incflags} $ADAFLAGS ${bin}-main \ - -o ${bin} -largs gpr_imports.o || die - done - for lib in $lib_progs; do - ${GNATMAKE} -j$(makeopts_jobs) ${incflags} ${lib} $ADAFLAGS \ - -largs gpr_imports.o || die - done -} - -src_install() { - dobin ${bin_progs} - exeinto /usr/libexec/gprbuild - doexe ${lib_progs} - insinto /usr/share/gprconfig - doins share/gprconfig/* - insinto /usr/share/gpr - doins share/_default.gpr - einstalldocs -} diff --git a/dev-ada/gprbuild/gprbuild-2018-r4.ebuild b/dev-ada/gprbuild/gprbuild-2018-r4.ebuild deleted file mode 100644 index de11e09704d2..000000000000 --- a/dev-ada/gprbuild/gprbuild-2018-r4.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs multiprocessing - -MYP=${PN}-gpl-${PV} - -DESCRIPTION="Multi-Language Management" -HOMEPAGE="http://libre.adacore.com/" -SRC_URI=" - http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a68 - -> ${MYP}-src.tar.gz - http://mirrors.cdn.adacore.com/art/5b0819dec7a447df26c27a40 - -> xmlada-gpl-${PV}-src.tar.gz" -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="gnat_2016 gnat_2017 +gnat_2018 gnat_2019" - -DEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) - gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) - gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) - gnat_2019? ( dev-lang/gnat-gpl:8.3.1 )" -RDEPEND="${DEPEND}" - -S="${WORKDIR}"/${MYP}-src - -REQUIRED_USE="!gnat_2016 ^^ ( gnat_2017 gnat_2018 gnat_2019 )" -PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) - -src_prepare() { - if use gnat_2017; then - GCC_PV=6.3.0 - elif use gnat_2018; then - GCC_PV=7.3.1 - else - GCC_PV=8.3.1 - fi - default - sed -i \ - -e "s:@VER@:${GCC_PV}:g" \ - share/gprconfig/compilers.xml \ - share/gprconfig/gnat.xml \ - share/gprconfig/c.xml \ - share/gprconfig/linker.xml \ - || die - sed -i \ - -e "s:@GNATBIND@:gnatbind-${GCC_PV}:g" \ - src/gprlib.adb \ - || die -} - -src_configure() { - emake prefix="${D}"usr setup -} - -bin_progs="gprbuild gprconfig gprclean gprinstall gprname gprls" -lib_progs="gprlib gprbind" - -src_compile() { - GCC=${CHOST}-gcc-${GCC_PV} - GNATMAKE=${CHOST}-gnatmake-${GCC_PV} - local xmlada_src="../xmlada-gpl-${PV}-src" - incflags="-Isrc -Igpr/src -I${xmlada_src}/sax -I${xmlada_src}/dom \ - -I${xmlada_src}/schema -I${xmlada_src}/unicode \ - -I${xmlada_src}/input_sources" - ${GCC} -c ${CFLAGS} gpr/src/gpr_imports.c -o gpr_imports.o || die - for bin in ${bin_progs}; do - ${GNATMAKE} -j$(makeopts_jobs) ${incflags} $ADAFLAGS ${bin}-main \ - -o ${bin} -largs gpr_imports.o || die - done - for lib in $lib_progs; do - ${GNATMAKE} -j$(makeopts_jobs) ${incflags} ${lib} $ADAFLAGS \ - -largs gpr_imports.o || die - done -} - -src_install() { - dobin ${bin_progs} - exeinto /usr/libexec/gprbuild - doexe ${lib_progs} - insinto /usr/share/gprconfig - doins share/gprconfig/* - insinto /usr/share/gpr - doins share/_default.gpr - einstalldocs -} diff --git a/dev-ada/gprbuild/metadata.xml b/dev-ada/gprbuild/metadata.xml index 505e6ca37ea1..ae7bd66e7cc3 100644 --- a/dev-ada/gprbuild/metadata.xml +++ b/dev-ada/gprbuild/metadata.xml @@ -4,12 +4,6 @@ <maintainer type="project"> <email>ada@gentoo.org</email> </maintainer> - <use> - <flag name="gnat_2016">Compile with dev-lang/gnat-gpl-2016</flag> - <flag name="gnat_2017">Compile with dev-lang/gnat-gpl-2017</flag> - <flag name="gnat_2018">Compile with dev-lang/gnat-gpl-2018</flag> - <flag name="gnat_2019">Compile with dev-lang/gnat-gpl-2019</flag> - </use> <longdescription lang="en"> GPRbuild is an advanced software tool designed to help automate the construction of multi-language systems. It removes complexity from diff --git a/dev-ada/gps/Manifest b/dev-ada/gps/Manifest index dd0f05d80409..e87a7cd5705a 100644 --- a/dev-ada/gps/Manifest +++ b/dev-ada/gps/Manifest @@ -7,4 +7,4 @@ DIST gtk+-3.14.15-src.tar.gz 32009863 BLAKE2B 93c6897c431fa8e1c19ea758378bc7e365 DIST libadalang-tools-gpl-2018-src.tar.gz 19938182 BLAKE2B 34104f3bc43c165a9b74ba8c0c03ee2f34686bcd06b5ced730f70f654d8b808e129a85566e081830b4f20304c793eefe0af81b56984cf06190302ad2f6a419be SHA512 a1176575944cd88b9da5f4e9f03caa1a4d09358df71e6a91300d0b35c2a843d0ea1a77fbd93e7b7f16cef1b978022ee20991f5c2ff74f7d05878c3de1220f2b5 EBUILD gps-2017.ebuild 2120 BLAKE2B a78b670ff9915bef812bb51b8a45e26feb1ec109b5cafcc1dbfbe3628aa33a02d32585829424e9660cb3759d464d7aca413c038aa5db2d24f0513ba86d2bfbf9 SHA512 f50681981837153b0df3080992c57c17315afbcc90848fe803b03d504284eb6f4f0a8c24cc2caa6aef2e4b5f29fb70af3b06b3c684e5b37844d350e1fa1150a0 EBUILD gps-2018-r1.ebuild 3163 BLAKE2B b97918cfad05d883c0ea9365b73768351c15878a784e3381eefa0b1f24ff319bfdc508c2f615c245fe30e5e3a0a87fb388084fb8dc7224ecf5b8a3a3d1ea24b7 SHA512 b2da7c1b5ebd5726ee1abd24bfb512dfb94ba680a0270bee413f4003eabbc08a16f98bd491e3e7b4385faeb3c431557b5b15063104e5ca84b220a596fefb517c -MISC metadata.xml 657 BLAKE2B c97ff9ab3140c87cb2066f25c639c3a5053c0775abfe23937b92f912ff71299bf136de797de6fd1010d576ba44f4e1b1f6e7dae4d1e076682382b33482240606 SHA512 498222549bd8c7e48575bdc0250cc810540928b19819759ba8a4f9b3aea39ad1b7b579b988a26b1bcf109774b356c7635e11e5e42a41dc76af8d9230a63f9d91 +MISC metadata.xml 438 BLAKE2B 105849097d35788d4178db05bd3c9ab5b17eb94bee320d0dfc2914889a3764824f53950f674a4d1488b649a344729e03bb8eacda9896636a632b1288a0abf07c SHA512 2bf4e76aab6f461c501b34fee6fbf719715af34e2af827daee3a145de31b96b5568009a21daaa4269a19386b0be45dd419710e926505bda7763312c809864aae diff --git a/dev-ada/gps/metadata.xml b/dev-ada/gps/metadata.xml index 0657e56673cc..eb9ac43cfff3 100644 --- a/dev-ada/gps/metadata.xml +++ b/dev-ada/gps/metadata.xml @@ -5,11 +5,6 @@ <email>tupone@gentoo.org</email> <name>Tupone Alfredo</name> </maintainer> - <use> - <flag name="gnat_2016">Compile with dev-lang/gnat-gpl-2016</flag> - <flag name="gnat_2017">Compile with dev-lang/gnat-gpl-2017</flag> - <flag name="gnat_2018">Compile with dev-lang/gnat-gpl-2018</flag> - </use> <longdescription lang="en"> GPS is a lightweight, extensible IDE, intended to develop high-integrity software in Ada and SPARK, with support for C and C++ diff --git a/dev-ada/gtkada/Manifest b/dev-ada/gtkada/Manifest index ea3b066bbb86..1ea48d80b040 100644 --- a/dev-ada/gtkada/Manifest +++ b/dev-ada/gtkada/Manifest @@ -2,8 +2,7 @@ AUX gtkada-2017-gentoo.patch 2270 BLAKE2B 54b7f2258ce0073b79f56a3c0c379123622e7d DIST gtkada-2019-20190424-19D98-src.tgz 12273911 BLAKE2B e2d0f3c410973d0412bf433f2e1cc60a5b00e9f34ad0471cb583596587e6073fdeb9b6441aa50dfa81894ce692101fe51c7714090477d585721571261737a823 SHA512 aed0758b42ee8eac752c2c83a0974ee0c7cddfa15149879472ff2fb8ee7565456a225ce783739ede76bc0f47340e97af5b5d1149e244611bcd3b3760e20f8cf5 DIST gtkada-gpl-2017-src.tgz 11952333 BLAKE2B 2a333452ff271bba0521235598afdb1abebc4ceeab0f915f173862329ae0986b0fc4f654d3df28eac73af075db224c0b12340c3acd1e4ed0ffc965e4365f8b40 SHA512 f5bbb9ebdd966e70b3edcaaf359cb9e75edba3c3f4f8febfa7de9f634f8e96cd0dd1482fb16ad852b1c9f9b0e2c16eb3a437120d37f0638d90af666620f09f3f DIST gtkada-gpl-2018-src.tgz 11958880 BLAKE2B 4946918b52de5e15efc77411927812910d84d13cea66b86b1162b987c7849ba7fbb6da487881762f64005dc32a74fa73c9d759d25bb9ac0241d1d76cd4becbfb SHA512 9000de7675f8ee688b1c9cd93cf35b32f698aca8fc22d3b4e695d7c6b34feb60118cc687cf35432cd5ed9af7825eda7e20575a9fad4523a7b59cb0322bce0762 -EBUILD gtkada-2017.ebuild 1291 BLAKE2B 4f26d0c4c40df64522c77df6acf75175f22cf0aef8e8e3213d663e3bb4c4b7ebff538540b7bbdb212d0ecce2e60f7d7d463f3178a1df44059ce7a2ef22fe8936 SHA512 433a5ce57cf39a012f17756d8843933910e51ad3b1641360e7dd28e0f871399a57f3ec0376e7ae7c69491f2e4712aad23c71c7fabd2ce507c9c5a79c247daabc -EBUILD gtkada-2018-r1.ebuild 1535 BLAKE2B edaf0ee99f67f2dfcc7dac73c42a1ec79f2c13b5a5b01193f7ea0a515a74078a5bebaf4640ac4cb25c833d2d41617759a54e9c4da566e8db28af5e30f8bce69e SHA512 0e616bffcd61d6ac790149b896a405964356a1a5431868486f0ddebacffd2e9f05779f6eb00171196c4d9abe3174bfd2c06b165168fe92d2aa9039695e06227c -EBUILD gtkada-2018.ebuild 1412 BLAKE2B 60234e0a79c8b865d0adeefe8089de9b2e480b89cd2513c0ff53107202eb7a164350ed182bb6b36e269ec6a946d87d94cbf43cc26a0519de2b94c06e43312d05 SHA512 1c0739006fabdfc1b587eb6db5c55f3de8036db2b6aeb844c14b485b9b7321c90aea91b87e3a390d2e3fba38d94fd12939392557403920f62319b33cb253bb1c -EBUILD gtkada-2019.ebuild 1539 BLAKE2B 7a9017d9c7ebd1dfc74577be0732a4da0687a82fe8b7df01d11e9d6cbcc66d8d59d4be3a2a0e6472698c8664957acd2f05cd4797231eff26d85b0801af0ace3f SHA512 018ac892a0721f5196035d014f7eda3a85ca5f7ba89721dbba9ac3b32cfb5d78a9b039c9900f2ddfa32663bfbab46e67d0facd4964930ebeb42ec8757e8af220 -MISC metadata.xml 808 BLAKE2B 06340d8d3acd7f62d9ee5a353b97dee85d4e218d3a3387f37cc0e31e1c6c219df5cce42516a2d3925dc4675d707c8a0734258bde7408c3a3c425232bd53fa583 SHA512 0dc7ec72a087e3828153b69cb455740bf26100f86966c4048a0ba41712f302636b287d18dd65003aa010b31230b3595edc0d4a42860514f86864b7bdc3bac530 +EBUILD gtkada-2017.ebuild 1297 BLAKE2B 83536071e25bc43cff672b957b9473029d910d8ac283496ff9bde6b282b57d478999780340b74b16987e935f4b042b9ecc28f0f0455217bfd89df9f297a0a89f SHA512 396961a4521e82fabbde327e7d66fef20dc5815253275e3de9118c3538ad166c85e3cdb27db2867e6e06ae683fc381a859f0c5f2afcfcfc78af23fc66120293b +EBUILD gtkada-2018-r1.ebuild 1552 BLAKE2B 4175046358b5a6abed6de7112a6d4c0d7f65f156ec417e5f8882c5580e032bf0dce6ba7d26544723d35ad3ee0ba04cd1763a11e6140f64168ef09fd8c71f50d9 SHA512 27b3f09407e484b3edf9344fea4ab1d5800f1c347b31e10a8cfa6fef4126dc6151e35ba122ea25b7a8c864ec900231db78f1c9b8efa978edf2133950f509a1c6 +EBUILD gtkada-2019.ebuild 1558 BLAKE2B 73b5b1b9b714981ce941e7d0bf8d25193b8ab36c7bcf1429fbdf8a681e808bee835f95c0b23f81480edfb4a29a82fe545827307307dd5dc4c4f3b2b386b19cbf SHA512 42620c9318ec624821ed9fef88bbf9f5bbfc00e4637d009bac9f29dd4be18744554a7d0cf03ad08aa1fd79698ebd57f6c374f5676d44196bab1103c77a68e531 +MISC metadata.xml 536 BLAKE2B 9809d3168ce41ea5f2aaaf8f9ed0c61ffca037a42dc1d3ba5424f68c399a24f64336494b0e73b3f6a3ab1be9c5ec2e499d93d62aa34a4e2a45af09bd15482b5b SHA512 f6ce7169d8015d691548836e074450d79afffdb7449bc7bd4b7ab868b967763675d8f69b1ad89a3642de0e1c5c9271261d72ee1b8fe448b9aa4afa4879b619d5 diff --git a/dev-ada/gtkada/gtkada-2017.ebuild b/dev-ada/gtkada/gtkada-2017.ebuild index f64be7a6ac09..f6edaf0546c7 100644 --- a/dev-ada/gtkada/gtkada-2017.ebuild +++ b/dev-ada/gtkada/gtkada-2017.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -28,7 +28,7 @@ RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) x11-libs/gtk+:3 x11-libs/pango" DEPEND="${RDEPEND} - dev-ada/gprbuild[gnat_2016=,gnat_2017=]" + dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?]" REQUIRED_USE="^^ ( gnat_2016 gnat_2017 )" diff --git a/dev-ada/gtkada/gtkada-2018-r1.ebuild b/dev-ada/gtkada/gtkada-2018-r1.ebuild index 4ce851b8da6b..a4f93c664a1a 100644 --- a/dev-ada/gtkada/gtkada-2018-r1.ebuild +++ b/dev-ada/gtkada/gtkada-2018-r1.ebuild @@ -14,7 +14,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/5b0cf840c7a4475261f97ced LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="gnat_2016 gnat_2017 +gnat_2018 gnat_2019 +shared static-libs" RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) @@ -30,7 +30,8 @@ RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) x11-libs/gtk+:3 x11-libs/pango" DEPEND="${RDEPEND} - dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]" + dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?] + dev-ada/gprbuild[gnat_2019(-)?]" REQUIRED_USE="^^ ( gnat_2016 gnat_2017 gnat_2018 gnat_2019 )" diff --git a/dev-ada/gtkada/gtkada-2018.ebuild b/dev-ada/gtkada/gtkada-2018.ebuild deleted file mode 100644 index 63d33a60a954..000000000000 --- a/dev-ada/gtkada/gtkada-2018.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools multiprocessing - -MYP=${PN}-gpl-${PV} - -DESCRIPTION="A complete Ada graphical toolkit" -HOMEPAGE="http://libre.adacore.com//tools/gtkada/" -SRC_URI="http://mirrors.cdn.adacore.com/art/5b0cf840c7a4475261f97ced - -> ${MYP}-src.tgz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="gnat_2016 gnat_2017 +gnat_2018 +shared static-libs" - -RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) - gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) - gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) - dev-libs/atk - dev-libs/glib:2 - media-libs/fontconfig - media-libs/freetype - x11-libs/cairo - x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:3 - x11-libs/pango" -DEPEND="${RDEPEND} - dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018(-)=]" - -REQUIRED_USE="^^ ( gnat_2016 gnat_2017 gnat_2018 )" - -S="${WORKDIR}"/${MYP}-src - -PATCHES=( "${FILESDIR}"/${PN}-2017-gentoo.patch ) - -src_prepare() { - default - mv configure.{in,ac} - eautoreconf -} - -src_configure() { - if use gnat_2018; then - GCC_PV=7.3.1 - elif use gnat_2017; then - GCC_PV=6.3.0 - else - GCC_PV=4.9.4 - fi - econf \ - --prefix="${D}/usr" \ - $(use_enable static-libs static) \ - $(use_enable shared) \ - --without-GL -} - -src_compile() { - GNATPREP=${CHOST}-gnatprep-${GCC_PV} - emake -j1 GNATPREP=${GNATPREP} PROCESSORS=$(makeopts_jobs) -} - -src_install() { - emake -j1 install - einstalldocs -} diff --git a/dev-ada/gtkada/gtkada-2019.ebuild b/dev-ada/gtkada/gtkada-2019.ebuild index 4a02372e72e0..0b4c73a820f3 100644 --- a/dev-ada/gtkada/gtkada-2019.ebuild +++ b/dev-ada/gtkada/gtkada-2019.ebuild @@ -30,7 +30,8 @@ RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) x11-libs/gtk+:3 x11-libs/pango" DEPEND="${RDEPEND} - dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]" + dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?] + dev-ada/gprbuild[gnat_2019(-)?]" REQUIRED_USE="^^ ( gnat_2016 gnat_2017 gnat_2018 gnat_2019 )" diff --git a/dev-ada/gtkada/metadata.xml b/dev-ada/gtkada/metadata.xml index 5daab6a5e97b..032d800ebe61 100644 --- a/dev-ada/gtkada/metadata.xml +++ b/dev-ada/gtkada/metadata.xml @@ -5,10 +5,6 @@ <email>ada@gentoo.org</email> </maintainer> <use> - <flag name="gnat_2016">Compile with dev-lang/gnat-gpl-2016</flag> - <flag name="gnat_2017">Compile with dev-lang/gnat-gpl-2017</flag> - <flag name="gnat_2018">Compile with dev-lang/gnat-gpl-2018</flag> - <flag name="gnat_2019">Compile with dev-lang/gnat-gpl-2019</flag> <flag name="shared">Build gtkada as shared library</flag> </use> <longdescription lang="en"> diff --git a/dev-ada/libadalang-tools/Manifest b/dev-ada/libadalang-tools/Manifest index 1c6b6cb1cfbd..33e714f93630 100644 --- a/dev-ada/libadalang-tools/Manifest +++ b/dev-ada/libadalang-tools/Manifest @@ -1,5 +1,5 @@ DIST libadalang-tools-2019-20190517-195C4-src.tar.gz 625775 BLAKE2B 2ec69e307576c505d20a43d229b13404966f4442778e5390da327ae71cc065873de4fff03a720949fa6bfb5ce66f405e7d45f7f0c21032a639efcff208323aed SHA512 b7368606847244cbb08ff2111fabfbfc8a9aa7f58e953febc70838006d94711dba1fd75bfb69ed2081a37a2dfaaad46097127870696c882d7cc54de5d7b051a1 DIST libadalang-tools-gpl-2018-src.tar.gz 19938182 BLAKE2B 34104f3bc43c165a9b74ba8c0c03ee2f34686bcd06b5ced730f70f654d8b808e129a85566e081830b4f20304c793eefe0af81b56984cf06190302ad2f6a419be SHA512 a1176575944cd88b9da5f4e9f03caa1a4d09358df71e6a91300d0b35c2a843d0ea1a77fbd93e7b7f16cef1b978022ee20991f5c2ff74f7d05878c3de1220f2b5 -EBUILD libadalang-tools-2018.ebuild 679 BLAKE2B b2869094c925f06b6e8bb44e0aef8d6c4abc258f2f02d1a6b9b8f7633c1c716db9868dcb90bf63d6c5e1dcc6cb7a6bc7168772daf0a940c2796ff02292f0a31d SHA512 97b31e48174392f26a6fe67a9dfb5f8a4c509e99fff2823b3eced0988dc88f2fd06c1f8d595b5ddd6fa8a978864419dd4f5b390823c8030e86f41003fdcbcccc -EBUILD libadalang-tools-2019.ebuild 996 BLAKE2B 1f0df32ffc3ab067b1b16800e8d74a10100eda102923c42d300ecfc5793d793df25bc0e1ce3190ec07ed60a1519134d564e6589542ad032f38e7fdcb85fb6945 SHA512 dd1b7275fe9fe232d505563100ff8be90d7c56cd994d077d0707e2d07a8a79919bc029549453a6fa8e92dcf3c3ea0d52f89ab8c9f2817410601b2cf587a07195 -MISC metadata.xml 609 BLAKE2B f462c2a06ef2101b1c03ea448ea0770e108f38530cbeedb332974d686c79ead78cad8c15e1e200c7e9e5005364c3bbfe538bf0820d8bfd701d196bae55c3214d SHA512 6d9183c3467e597593bee1926ce664cde3c3cd764aed941387e979721fee4d3a747ef82143222e78344986c8bf051ac97f698c3410fa97755869470365cec8f0 +EBUILD libadalang-tools-2018.ebuild 685 BLAKE2B 240aa78f91f485c0f7d1779a5310ad9793b323e266ee36a744863a5210ea86720f5745360f09c65e4305a7c063fc431ebb4e0a432af75ffbb7c2b8d9293679df SHA512 e2017e038a91577ac88c40ea5e4b51d4e7ca31e66fc37a2e06252b25a025ae323fd3ae673d856e9d89a304906ab71735a5034f1640a6610edd4222ef31d6f77d +EBUILD libadalang-tools-2019.ebuild 1015 BLAKE2B 5c141a923e9163cc46fe5e402300c36edfa1997ae51c35f9b9020e2d2b703deb49bcb7fdd2840a5b78640d8879f00c56534625c761a7397390c41c27355cfd1f SHA512 b3fb7265d4571451e06834d17499141d5698ea7d330542e779f94ecb522a8a49f333c0b1fb715e4fd07c51c30fbacfc33cfaab30c85081f051e204f284b64ab1 +MISC metadata.xml 322 BLAKE2B 15b950c159b5ceea83d02f9bc17739607d76cc1ddf829fb9eea4187cfba6721d9ff81385e011cbba5c31114c8932354b40cf40dcb7582205ffc39e9204b2a8cf SHA512 dba6a4015eaa3143d0e165df7e1d18ac8faf4077ea8b3521ebb12979aa24b5519dfa90239cc2a41630edc803cbf4529338f9ddc2de5ed3fb0987702747c5ab80 diff --git a/dev-ada/libadalang-tools/libadalang-tools-2018.ebuild b/dev-ada/libadalang-tools/libadalang-tools-2018.ebuild index b29808431c3e..a412e2338adf 100644 --- a/dev-ada/libadalang-tools/libadalang-tools-2018.ebuild +++ b/dev-ada/libadalang-tools/libadalang-tools-2018.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -16,7 +16,7 @@ IUSE="gnat_2016 gnat_2017 +gnat_2018" RDEPEND="" DEPEND="${RDEPEND} - dev-ada/libadalang[gnat_2016=,gnat_2017=,gnat_2018=,static-libs]" + dev-ada/libadalang[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,static-libs]" S="${WORKDIR}"/${PN}-src diff --git a/dev-ada/libadalang-tools/libadalang-tools-2019.ebuild b/dev-ada/libadalang-tools/libadalang-tools-2019.ebuild index 283494661fa1..279ba91a1748 100644 --- a/dev-ada/libadalang-tools/libadalang-tools-2019.ebuild +++ b/dev-ada/libadalang-tools/libadalang-tools-2019.ebuild @@ -20,7 +20,8 @@ RDEPEND="" DEPEND="${RDEPEND} dev-ada/libadalang[gnat_2016(-)?] dev-ada/libadalang[gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?,static-libs] - dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]" + dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?] + dev-ada/gprbuild[gnat_2019(-)?]" S="${WORKDIR}"/${MYP}-src diff --git a/dev-ada/libadalang-tools/metadata.xml b/dev-ada/libadalang-tools/metadata.xml index 596aff3263a9..2fab82fdcf6f 100644 --- a/dev-ada/libadalang-tools/metadata.xml +++ b/dev-ada/libadalang-tools/metadata.xml @@ -4,12 +4,6 @@ <maintainer type="project"> <email>ada@gentoo.org</email> </maintainer> - <use> - <flag name="gnat_2016">Compile with dev-lang/gnat-gpl-2016</flag> - <flag name="gnat_2017">Compile with dev-lang/gnat-gpl-2017</flag> - <flag name="gnat_2018">Compile with dev-lang/gnat-gpl-2018</flag> - <flag name="gnat_2019">Compile with dev-lang/gnat-gpl-2018</flag> - </use> <longdescription lang="en"> Libadalang-based tools: gnatpp, gnatmetric and gnatstub </longdescription> diff --git a/dev-ada/libadalang/Manifest b/dev-ada/libadalang/Manifest index 72ddfaa1855f..378558a7da6c 100644 --- a/dev-ada/libadalang/Manifest +++ b/dev-ada/libadalang/Manifest @@ -8,4 +8,4 @@ EBUILD libadalang-2017-r1.ebuild 1089 BLAKE2B ff0e7e37c2f2cf5f7ce0d38b5d0efc073e EBUILD libadalang-2018-r1.ebuild 1461 BLAKE2B 3a5f20ddf7868e8253e761d9aaa3b43064c18f7e45dbb99ecd20b22fe8f7d43530010c3d195693ab75dbd54baae21ad73d6d5b6155f361d115ae45b5cfd76f79 SHA512 489d19ec76fe9e6e7bec478b840a1bee0140827251e165b2941da377dacaef98c0f81d2068b28058d251c88a3c8024bbf6a92436da9ed910abf211bc74960e07 EBUILD libadalang-2018.ebuild 1327 BLAKE2B 802fdf2de0d0f4659807458581887278febe957924f30e021557566c271fd4301cf3ee1587056d7d29c3a0f964c3f8074bcd0e613105e5030736f7feef1cd10a SHA512 0a08c3661094e31ca8c6bf132fa029da706b10321cf97d14e43cf856da3fba6a890de09353af2a29478a52c538f4d2d06ce4452089e9331164ced4e77d85a696 EBUILD libadalang-2019.ebuild 1519 BLAKE2B f4b1e6cb07001949b225a57bde98f530e4f93b89ca379f33aa96e14d2f942d9c3fbf223cdeda7c6b3291a97804e9822518ad30bda62ed34ac1e2fb4547a3487b SHA512 a8226f42d074efa3ff295c75ddf1483a539fcfdd425f0008653cee6e2c25e53557cb88b3ea6b9bf7b90c30f71a9417cf430205989bec4ee95f01d22a3923e4ac -MISC metadata.xml 878 BLAKE2B b8b5f581aa552350fdb737fd9d89fc33a02ccccad106424333f87992a8f9c6ba60d5e70f3aaba1dae13bc117e2ac97f81a66ae6cc34a1aa13a8c86cab08c2a65 SHA512 02ea95c2cf1d7c131edb2634a6daf3fe77d50d2368c1d2afa5ab18c802de0a8b596bd3bf176fbfa67f7cada1d4a8bddc8c51cb444e23ebf0d437c19922c511f9 +MISC metadata.xml 606 BLAKE2B b0a66091ccb460eb66fe3fb70be07d49dce48a655e1a7584baf532fec0f995c4de9ef0a7a99f32b44f2645b4acd446723911c569a8757ab93cbb9b70110223c8 SHA512 bab64b417a58e000c4aca66c99a04e268db42f56c24273b47f5a81be9bdc8d6224653bb169aec8095c02887d37b227999772f1b0fe6d05c5754073cdd2ad3432 diff --git a/dev-ada/libadalang/metadata.xml b/dev-ada/libadalang/metadata.xml index 5ed09e4fd913..a2b4d6b3c81a 100644 --- a/dev-ada/libadalang/metadata.xml +++ b/dev-ada/libadalang/metadata.xml @@ -6,10 +6,6 @@ <name>Tupone Alfredo</name> </maintainer> <use> - <flag name="gnat_2016">Compile with dev-lang/gnat-gpl-2016</flag> - <flag name="gnat_2017">Compile with dev-lang/gnat-gpl-2017</flag> - <flag name="gnat_2018">Compile with dev-lang/gnat-gpl-2018</flag> - <flag name="gnat_2019">Compile with dev-lang/gnat-gpl-2019</flag> <flag name="shared">Build shared library</flag> </use> <longdescription lang="en"> diff --git a/dev-ada/libgpr/Manifest b/dev-ada/libgpr/Manifest index 4fd387024f15..8a2ee5d212b7 100644 --- a/dev-ada/libgpr/Manifest +++ b/dev-ada/libgpr/Manifest @@ -1,7 +1,6 @@ AUX libgpr-2018-gentoo.patch 1691 BLAKE2B 4e11098f835d9d0adbd6a4eed0e63f71140eb68d0e350fd52303a0d21c308e483556b31ce84ba97a7fccddfc91e519a6ae8f999d87258c0d4f4ee473597f7267 SHA512 959e4e63c3367fd98878a2004d0fac981a1acc2a29e35960a27f2ca48b4557fc16148aa052cdba590f208c8b23832f3bc2f3959523f6e54eb8dfe2e87812f285 DIST gprbuild-2019-20190517-194D8-src.tar.gz 2507961 BLAKE2B 0f70d94cb0db9ddc1dd308862aaa305a91965a62a936cfbdde2ae9f3f735f0cc3d69596b09da4b979a1d7923087ab0ec5cf2d6541551f057b5e8e0c499065a90 SHA512 0388d7e6cdf625fef40b33da764091b3283dd88714c64ecfad4b5e99253f183b1a9b717c19281e6d45cc4277a05fadb2e2ace394d6f30638664b66c97123052b DIST gprbuild-gpl-2018-src.tar.gz 2479651 BLAKE2B b0e24f4d97f06fe84569f8f0284e1028fce8e4ae90cfd27ab31ada0988f4f1b37eca4868bc212a21d26fb1a0a7ba6f031062e16d9758ab211e2fee40e25077ab SHA512 d22c0133baa6a0b626a0c1d145b21865bd0699cd8155ca22727272b0f8988c78163410b432ae148e87099e931df19d51ea867981556c79cb1cceb25456333044 -EBUILD libgpr-2018-r1.ebuild 1455 BLAKE2B 09c0754d011aaa9507c89e7931ee261a06d72f507fb171ea2290a5087fe423837e4c16c82408732ffbf5375f16fd315e19dff4889604f3a934b1379e8c514e06 SHA512 2e48d5c512756b1e0222a43e958b6bab697be451b74e20a9b3afb3f7dfd65a15671b1a81b2479cad60eecd9f0b893201ebba9d1fa70b47cb9fd5a63d4b49c4f3 -EBUILD libgpr-2018.ebuild 1418 BLAKE2B ea2cd84edd7c32b6094559a9de24d8ac0ff84806b6f90fa393f07e48d984ad4f79be53211198952456b2695dc2d1af2e0bc46a0e6cf30ecbb36cccc9e64430d1 SHA512 77c55ea1e0d33b2f4ced11e495390bbccc30425fd1842361306b92aa21eff2be446837d6100977deb1ea174a1415d6de9e8c5a195a95bbbba6386bce89f0e4f1 -EBUILD libgpr-2019.ebuild 1434 BLAKE2B bd5ec33870135ccbe9dfcdd42d2c12cee85a593afd6cadfd764d260dd17d640193f167b46751816368ae5e6fc8030d8e69a9e3a39d46646fba19502d0ac945aa SHA512 de84b8e96df7d2d1a8f2449e731bcf964c96555d16001f47746b637eec35b8a3626434dfcff51dabc251b917d95dc9a9c0235dbe9d34d8db0d85ef2f56d5b540 -MISC metadata.xml 1211 BLAKE2B 072a1af7bb43fc3a59da80afdae5aecca7ddd9307d8aed91a1bb70892036485a8a0ca3057484e2af8209915bc71ea3a1d3799bae7d44e8fb5fa701eb78267639 SHA512 bb6a4a25fcc68773ee2b78313d1ccdfac47e21504f4f7e5ccfbee41fdfffd2af2561bf0db505df29c1298bffce49c750d038779bdc255f9ba6dacf1a8f3cffa0 +EBUILD libgpr-2018-r1.ebuild 1484 BLAKE2B a7d8bc4137640c55f24f0d26bea4cbad31aee22b9226402d1ccec485b39730276be75c4f8ec9568d86c4a4bd0e736a9f9b5c71a1197223f7566c4dab5a39ee44 SHA512 47a20f6b42e982f0cbe0f2ac8064c71e8384529f50b1e8e93d9b0a3125d910c7f54ae992e714968313588038bfb9b16b4f8001dbb5ba7457c0742877701c8261 +EBUILD libgpr-2019.ebuild 1451 BLAKE2B 974cfb4da43aed484fba18cb88b922d8139dacc1e7d2fd06f32d6c1d2f48ee5eb10fbeade2cd969a91d7fb1d553f61fbd51e47bb24b1ec14b882c044b69d8df9 SHA512 51ac3ce060d096e71faefaf481011592acbd4de25de1c9ee5c3e4a79ce622ab9bed793adf63df3c1dab2541cc72afe0d6379dcdf2221bdace22caebd6043e0a3 +MISC metadata.xml 939 BLAKE2B a14a037f7b5a45004833b83bd6ef13accff7e1d107873c823f0c42dd663eb638a59fdbedd8ce06aa5c00cb53e2c89bbc9f23f1f0a4dd1a388b0f5f9d5f522617 SHA512 3a09da26b5f736ece53917fbee3939ebff2045297d81043cf282fa0e0b1344be9e551df0a92b35db38b6feeb516e5319a8c65507b2f574971c9f5df66bda8079 diff --git a/dev-ada/libgpr/libgpr-2018-r1.ebuild b/dev-ada/libgpr/libgpr-2018-r1.ebuild index 18b7fe860f2a..fdd4077231da 100644 --- a/dev-ada/libgpr/libgpr-2018-r1.ebuild +++ b/dev-ada/libgpr/libgpr-2018-r1.ebuild @@ -13,14 +13,15 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a68 -> ${MYP}-src.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="gnat_2016 gnat_2017 +gnat_2018 gnat_2019 +shared static-libs static-pic" RDEPEND="dev-ada/xmlada[shared?,static-libs?,static-pic?] - dev-ada/xmlada[gnat_2016=,gnat_2017=,gnat_2018=,gnat_2019=] + dev-ada/xmlada[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?] !net-libs/grpc" DEPEND="${RDEPEND} - dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]" + dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?] + dev-ada/gprbuild[gnat_2019(-)?]" S="${WORKDIR}"/${MYP}-src diff --git a/dev-ada/libgpr/libgpr-2018.ebuild b/dev-ada/libgpr/libgpr-2018.ebuild deleted file mode 100644 index 6041a1d9e70e..000000000000 --- a/dev-ada/libgpr/libgpr-2018.ebuild +++ /dev/null @@ -1,61 +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/5b0819dfc7a447df26c27a68 - -> ${MYP}-src.tar.gz" -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="gnat_2016 gnat_2017 +gnat_2018 +shared static-libs static-pic" - -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[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?]" - -S="${WORKDIR}"/${MYP}-src - -PATCHES=( "${FILESDIR}"/${P}-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 - rm -r "${D}"/usr/share/gpr/manifests || die - einstalldocs -} diff --git a/dev-ada/libgpr/libgpr-2019.ebuild b/dev-ada/libgpr/libgpr-2019.ebuild index aa2517a75a3c..c493b2839717 100644 --- a/dev-ada/libgpr/libgpr-2019.ebuild +++ b/dev-ada/libgpr/libgpr-2019.ebuild @@ -13,14 +13,15 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/5cdf8e8031e87a8f1d425093 -> ${MYP}-src.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="gnat_2016 gnat_2017 gnat_2018 +gnat_2019 +shared static-libs static-pic" RDEPEND="dev-ada/xmlada[shared?,static-libs?,static-pic?] dev-ada/xmlada[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?] !net-libs/grpc" DEPEND="${RDEPEND} - dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]" + dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?] + dev-ada/gprbuild[gnat_2019(-)?]" S="${WORKDIR}"/${MYP}-src diff --git a/dev-ada/libgpr/metadata.xml b/dev-ada/libgpr/metadata.xml index b019905df244..1f0f18cea5f2 100644 --- a/dev-ada/libgpr/metadata.xml +++ b/dev-ada/libgpr/metadata.xml @@ -5,10 +5,6 @@ <email>ada@gentoo.org</email> </maintainer> <use> - <flag name="gnat_2016">Compile with dev-lang/gnat-gpl-2016</flag> - <flag name="gnat_2017">Compile with dev-lang/gnat-gpl-2017</flag> - <flag name="gnat_2018">Compile with dev-lang/gnat-gpl-2018</flag> - <flag name="gnat_2019">Compile with dev-lang/gnat-gpl-2019</flag> <flag name="shared">Build shared library</flag> <flag name="static-pic">Build static library with pic code</flag> </use> diff --git a/dev-ada/xmlada/Manifest b/dev-ada/xmlada/Manifest index 7e0c0ec2b27f..ebbdc81c6afd 100644 --- a/dev-ada/xmlada/Manifest +++ b/dev-ada/xmlada/Manifest @@ -3,5 +3,5 @@ AUX xmlada-2019-gentoo.patch 1053 BLAKE2B 33403adf7bf4f774d7fbcf9f07fe0d248a0c7e DIST xmlada-2019-20190429-19B9D-src.tar.gz 1582603 BLAKE2B e2be3e7c0c8b843bfc808a3dd726235a82588caed8c919975a97ce34c72d6d634361bbc34208590210936add9e2f881b59d01168ef79abed1e489c50b27094d8 SHA512 f8e0e25b0aee9a7a18223ae7761603082af55134f062c767d0cd0dbf0dbcb2058fc7c57532b567fb2c6efa464a53ead57b300578e98962025866e5c3ad73e380 DIST xmlada-gpl-2018-src.tar.gz 1582215 BLAKE2B 11012dab19f45507eeb5ce6ebec9a77ceb5dfb7749960922f0f48bb1b0409305fd43466a7af90b48ff0a0cf58612e8859274a92e0fe272b4e57a59b92a1725f1 SHA512 8970c4e68defad66625c1110554dadfc485fbbe42e832987593cf727e98f13dd87c90b84461187dbbe2b1051831e6e70f9f53d6a0cfc07451726d601b2856430 EBUILD xmlada-2018.ebuild 1871 BLAKE2B f36dba5e21dadead63933f44e9b62da81ba3a40e523f92485515c7b9ccda27a84ba454325cbd7155de2da0552708266d4d05907255c852eef685e7ff007093fb SHA512 0753455dcdcc5f9e95d3966cdfffaf4fc7598f75efdc175f401ef759edcf86f89039b5035ca469399b3c67ef6e73387ec5aa53ff2145632e0b0809979d0a2580 -EBUILD xmlada-2019.ebuild 1990 BLAKE2B 79476d8c16f31e8da9a8612d014e573d5da4bcd6404ebf29f059dff764a51527626f509df67ae7add77be21d48c8ce1b52b6c340d216fe5c8795339d220ca49d SHA512 1f0e1627976faec56e5ffedf5ff6005ec01e88e84e21e8d9251072ddda0ee53dae7505f42c5cb2c35bcb7393fc31c477d6135df95d85a553b59343e970ca6fd8 -MISC metadata.xml 1179 BLAKE2B 5f118c6464cb78e444053ab496ccafaa1c3ace2308df8610b4dc624f1a7106eae999a467e83c03da186a20aef9bfe641d29b36eac2c13e7f4bb5c058b0f09676 SHA512 b466d653a77bddcda05688042bc12023303d983c017e50e223c0714bb3985ada394c968e6dd6f04674caeec2e8e2f59f51f76f80768373d97a8be6fbae5989d8 +EBUILD xmlada-2019.ebuild 2007 BLAKE2B 41f019a98cdbc81ac952ed4048de4f9bb9371f24edcbfd60fcf2c1f5cc33f275719a981723bc0542155df065d3c1df5f2dd6f18ccb21512fec7f4883ce67816e SHA512 bba6ad966ebb6ae63668856446b646be6f6a90e33030760f1d9b734084c52663dbf05d2ba096afd18a29772e0b735b76226781b8370b95ddfe5344bd426d5f0f +MISC metadata.xml 907 BLAKE2B c57fbc3e91a6647b5687dc02c78986d161d6a8482119984a420685ce5366a4e0901aca404d066259b1e8384ba45875f15e54810d6d0fe97812ed3fb1983f1a91 SHA512 eb1acaf3359b0ca8544e07e5681ec2ab800581401644f3ee2313dcca9be163e2bdeac16b551aacb19402fd13c18e0787850fb5529382e3e0e77ba4a1b420f53a diff --git a/dev-ada/xmlada/metadata.xml b/dev-ada/xmlada/metadata.xml index ed84ea54db5d..6cc2bfd667c7 100644 --- a/dev-ada/xmlada/metadata.xml +++ b/dev-ada/xmlada/metadata.xml @@ -5,10 +5,6 @@ <email>ada@gentoo.org</email> </maintainer> <use> - <flag name="gnat_2016">Compile with dev-lang/gnat-gpl-2016</flag> - <flag name="gnat_2017">Compile with dev-lang/gnat-gpl-2017</flag> - <flag name="gnat_2018">Compile with dev-lang/gnat-gpl-2018</flag> - <flag name="gnat_2019">Compile with dev-lang/gnat-gpl-2019</flag> <flag name="shared">Build shared library</flag> <flag name="static-pic">Build static library with pic code</flag> </use> diff --git a/dev-ada/xmlada/xmlada-2019.ebuild b/dev-ada/xmlada/xmlada-2019.ebuild index 6469ae21ac3c..b841cf90e04c 100644 --- a/dev-ada/xmlada/xmlada-2019.ebuild +++ b/dev-ada/xmlada/xmlada-2019.ebuild @@ -14,7 +14,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/5cdf916831e87a8f1d4250b5 LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="gnat_2016 gnat_2017 gnat_2018 +gnat_2019 +shared static-libs static-pic" REQUIRED_USE="|| ( shared static-libs static-pic ) ^^ ( gnat_2016 gnat_2017 gnat_2018 gnat_2019 )" @@ -24,7 +24,8 @@ RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) gnat_2019? ( dev-lang/gnat-gpl:8.3.1 )" DEPEND="${RDEPEND} - dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?,gnat_2019(-)?]" + dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?] + dev-ada/gprbuild[gnat_2019(-)?]" S="${WORKDIR}"/${MYP}-src |