diff options
Diffstat (limited to 'dev-ada/libgpr')
| -rw-r--r-- | dev-ada/libgpr/Manifest | 7 | ||||
| -rw-r--r-- | dev-ada/libgpr/files/libgpr-2019-gentoo.patch (renamed from dev-ada/libgpr/files/libgpr-2018-gentoo.patch) | 16 | ||||
| -rw-r--r-- | dev-ada/libgpr/libgpr-2018-r1.ebuild | 62 | ||||
| -rw-r--r-- | dev-ada/libgpr/libgpr-2019-r1.ebuild | 2 | ||||
| -rw-r--r-- | dev-ada/libgpr/libgpr-2019.ebuild | 60 |
5 files changed, 12 insertions, 135 deletions
diff --git a/dev-ada/libgpr/Manifest b/dev-ada/libgpr/Manifest index f93a457871b1..5f9c2244f6f8 100644 --- a/dev-ada/libgpr/Manifest +++ b/dev-ada/libgpr/Manifest @@ -1,7 +1,4 @@ -AUX libgpr-2018-gentoo.patch 1691 BLAKE2B 4e11098f835d9d0adbd6a4eed0e63f71140eb68d0e350fd52303a0d21c308e483556b31ce84ba97a7fccddfc91e519a6ae8f999d87258c0d4f4ee473597f7267 SHA512 959e4e63c3367fd98878a2004d0fac981a1acc2a29e35960a27f2ca48b4557fc16148aa052cdba590f208c8b23832f3bc2f3959523f6e54eb8dfe2e87812f285 +AUX libgpr-2019-gentoo.patch 1515 BLAKE2B 0641ed287592709ae58f554e14189d7bb44b864d48518198180e060189714ab3de8a18cba0af3ed92f45e7d72ae2029d1ed17a05de656935cd88d8d6910cd372 SHA512 1cd8225e7aec41a01327de1cd1e10e006a0d84c74345979b07157caa7188e4dd0159cf6f015f479452a068074eba76997b4f694f2975f578b34ffd1a4ac22684 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 1484 BLAKE2B a7d8bc4137640c55f24f0d26bea4cbad31aee22b9226402d1ccec485b39730276be75c4f8ec9568d86c4a4bd0e736a9f9b5c71a1197223f7566c4dab5a39ee44 SHA512 47a20f6b42e982f0cbe0f2ac8064c71e8384529f50b1e8e93d9b0a3125d910c7f54ae992e714968313588038bfb9b16b4f8001dbb5ba7457c0742877701c8261 -EBUILD libgpr-2019-r1.ebuild 1362 BLAKE2B 98ca9b0672a128f6e73cb75f3e6d5b39bf0ecc27d0e66cbac3bf2ba3023f45bf3ec8a19a4af3c1393c8001124a5c014c12a323453c3f7c352b4a3d6baabc07bf SHA512 d4ab3a4a13d86bab81dcc109fb67eb667c27dd558982b9ff9634699ccb35bba7b2d5dda289e806e8fbaf305134dff4c3bafe8f267c32953f2ce6437f7bfc1424 -EBUILD libgpr-2019.ebuild 1451 BLAKE2B 974cfb4da43aed484fba18cb88b922d8139dacc1e7d2fd06f32d6c1d2f48ee5eb10fbeade2cd969a91d7fb1d553f61fbd51e47bb24b1ec14b882c044b69d8df9 SHA512 51ac3ce060d096e71faefaf481011592acbd4de25de1c9ee5c3e4a79ce622ab9bed793adf63df3c1dab2541cc72afe0d6379dcdf2221bdace22caebd6043e0a3 +EBUILD libgpr-2019-r1.ebuild 1407 BLAKE2B b3f88bd6116977c382ba3c8164ada748af412c48a51333b7a0a510bdfe4e0ac08b72cb2045ac976a67eef6847cdf84308bcec3dd6430c7a6e5aa74f334e99182 SHA512 a182e1dba2020ad168bd1711afbd55fd8382039f3a23bb09b54afdd3b77c4ff0c5893c064020044354e2148c9b6ca82217f1ee7fccb9f93240c4d0d5e022c630 MISC metadata.xml 939 BLAKE2B a14a037f7b5a45004833b83bd6ef13accff7e1d107873c823f0c42dd663eb638a59fdbedd8ce06aa5c00cb53e2c89bbc9f23f1f0a4dd1a388b0f5f9d5f522617 SHA512 3a09da26b5f736ece53917fbee3939ebff2045297d81043cf282fa0e0b1344be9e551df0a92b35db38b6feeb516e5319a8c65507b2f574971c9f5df66bda8079 diff --git a/dev-ada/libgpr/files/libgpr-2018-gentoo.patch b/dev-ada/libgpr/files/libgpr-2019-gentoo.patch index 013a56b92e78..b7b9a2d3c870 100644 --- a/dev-ada/libgpr/files/libgpr-2018-gentoo.patch +++ b/dev-ada/libgpr/files/libgpr-2019-gentoo.patch @@ -1,5 +1,5 @@ ---- gprbuild-gpl-2016-src/gpr/src/gpr-env.adb.old 2017-11-13 22:16:53.349083426 +0100 -+++ gprbuild-gpl-2016-src/gpr/src/gpr-env.adb 2017-11-13 22:17:22.692590351 +0100 +--- a/gpr/src/gpr-env.adb 2017-11-13 22:16:53.349083426 +0100 ++++ b/gpr/src/gpr-env.adb 2017-11-13 22:17:22.692590351 +0100 @@ -1948,6 +1948,8 @@ end if; @@ -9,8 +9,8 @@ if Gpr_Prj_Path.all /= "" then Add_Directories (Self, Gpr_Prj_Path.all); end if; ---- gprbuild-gpl-2017-src/gpr/src/gpr-names.ads.old 2017-11-19 13:09:18.947527738 +0100 -+++ gprbuild-gpl-2017-src/gpr/src/gpr-names.ads 2017-11-19 13:10:08.125654595 +0100 +--- 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; @@ -20,8 +20,8 @@ procedure Get_Name_String (Id : Name_Id); procedure Get_Name_String (Id : Unit_Name_Type); procedure Get_Name_String (Id : File_Name_Type); ---- gprbuild-gpl-2017-src/gpr/src/gpr-names.adb.old 2017-11-19 13:10:27.674316703 +0100 -+++ gprbuild-gpl-2017-src/gpr/src/gpr-names.adb 2017-11-19 13:14:38.360963627 +0100 +--- 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); @@ -40,8 +40,8 @@ return Name_Entries.Last; end Name_Find; ---- gprbuild-gpl-2017-src/gpr/src/gpr-snames.adb.old 2017-11-19 13:12:41.592995718 +0100 -+++ gprbuild-gpl-2017-src/gpr/src/gpr-snames.adb 2017-11-19 13:16:31.980979696 +0100 +--- 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; diff --git a/dev-ada/libgpr/libgpr-2018-r1.ebuild b/dev-ada/libgpr/libgpr-2018-r1.ebuild deleted file mode 100644 index fdd4077231da..000000000000 --- a/dev-ada/libgpr/libgpr-2018-r1.ebuild +++ /dev/null @@ -1,62 +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=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 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(-)?] - dev-ada/gprbuild[gnat_2019(-)?]" - -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-r1.ebuild b/dev-ada/libgpr/libgpr-2019-r1.ebuild index 08adbdbfde3f..7906a8d27d4f 100644 --- a/dev-ada/libgpr/libgpr-2019-r1.ebuild +++ b/dev-ada/libgpr/libgpr-2019-r1.ebuild @@ -25,6 +25,8 @@ REQUIRED_USE="${ADA_REQUIRED_USE}" S="${WORKDIR}"/${MYP}-src +PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) + src_configure() { emake prefix="${D}"/usr setup } diff --git a/dev-ada/libgpr/libgpr-2019.ebuild b/dev-ada/libgpr/libgpr-2019.ebuild deleted file mode 100644 index c493b2839717..000000000000 --- a/dev-ada/libgpr/libgpr-2019.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs multiprocessing - -MYP=gprbuild-${PV}-20190517-194D8 - -DESCRIPTION="Ada library to handle GPRbuild project files" -HOMEPAGE="http://libre.adacore.com/" -SRC_URI="http://mirrors.cdn.adacore.com/art/5cdf8e8031e87a8f1d425093 - -> ${MYP}-src.tar.gz" -LICENSE="GPL-3" -SLOT="0" -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(-)?] - dev-ada/gprbuild[gnat_2019(-)?]" - -S="${WORKDIR}"/${MYP}-src - -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 -} |