From de49812990871e1705b64051c35161d5e6400269 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 24 Dec 2018 14:11:38 +0000 Subject: gentoo resync : 24.12.2018 --- dev-ada/libgpr/Manifest | 5 +- dev-ada/libgpr/files/libgpr-2016-gentoo.patch | 89 --------------------------- dev-ada/libgpr/libgpr-2017.ebuild | 58 ----------------- dev-ada/libgpr/libgpr-2018.ebuild | 2 +- 4 files changed, 2 insertions(+), 152 deletions(-) delete mode 100644 dev-ada/libgpr/files/libgpr-2016-gentoo.patch delete mode 100644 dev-ada/libgpr/libgpr-2017.ebuild (limited to 'dev-ada/libgpr') diff --git a/dev-ada/libgpr/Manifest b/dev-ada/libgpr/Manifest index d05da8d64096..71ae0a8d2181 100644 --- a/dev-ada/libgpr/Manifest +++ b/dev-ada/libgpr/Manifest @@ -1,7 +1,4 @@ -AUX libgpr-2016-gentoo.patch 2831 BLAKE2B 2f9083ab7e9b75662b224527def3033f1f9f2bd5836fc7812e3c551865e4c3eaab4ef9abdb3c0c06d19aa9aad6ab63a61153ea6fefccc3556ed5587bc5761cb0 SHA512 e807bbccbd5514e9f2919937de657cac306b063ece2d87e0defd41e1dcbbf00faca488699f3c2cfa99118da4b569baaee1610b5aaa65a5bdf6c0859bd06c1b9a AUX libgpr-2018-gentoo.patch 1691 BLAKE2B 4e11098f835d9d0adbd6a4eed0e63f71140eb68d0e350fd52303a0d21c308e483556b31ce84ba97a7fccddfc91e519a6ae8f999d87258c0d4f4ee473597f7267 SHA512 959e4e63c3367fd98878a2004d0fac981a1acc2a29e35960a27f2ca48b4557fc16148aa052cdba590f208c8b23832f3bc2f3959523f6e54eb8dfe2e87812f285 -DIST gprbuild-gpl-2017-src.tar.gz 2454957 BLAKE2B 890e5aa29e9f8fa8b140988ee8e5d6042640c34fe0877acde959de803bf690bb33c63b1c7e7db486f804882bddd77ab76ffbaa4dd27da327e21ed0376cadb99d SHA512 12f3682d64ce0718de4940c1e71a4380b20021805d88543842dbf3b5ce5d518c23a6b2d868565579baf81efa1d8cf05c7778253162f0df5d7adc0eb1865c9f88 DIST gprbuild-gpl-2018-src.tar.gz 2479651 BLAKE2B b0e24f4d97f06fe84569f8f0284e1028fce8e4ae90cfd27ab31ada0988f4f1b37eca4868bc212a21d26fb1a0a7ba6f031062e16d9758ab211e2fee40e25077ab SHA512 d22c0133baa6a0b626a0c1d145b21865bd0699cd8155ca22727272b0f8988c78163410b432ae148e87099e931df19d51ea867981556c79cb1cceb25456333044 -EBUILD libgpr-2017.ebuild 1299 BLAKE2B c152fef9cef6867ec0b3b04c3756ec3b2c247a72e1c4bf4e5933d817cda35720a729a9fd0d29705bf994ec5d18681501eed752b58d04a9cd161cf6f03b826509 SHA512 dff8e1a99b64f347a1aa1ba5d2675608d1b86a2ff3c5dc125a5b800fd3350278e444573eeb0e272334f28aead87d088e9983604329c6ba628657503e1d6b7861 -EBUILD libgpr-2018.ebuild 1425 BLAKE2B b3e1b294e1028b9a975b75f8b634ef878ef9ae3525c24b0fd4870d36230763106e1caacbfd4e8b09ceac1b9c2f8612b6aca65ad302750fddbf517afd8a23ab15 SHA512 38c68f42fdfa6286668efb0ca7cd2c75e102d92eb26985d28bb34480e3a972025c0263c5f8f42e9cb0c982ae4405157bec6a9295b857870319271aa0dcd224b1 +EBUILD libgpr-2018.ebuild 1418 BLAKE2B ea2cd84edd7c32b6094559a9de24d8ac0ff84806b6f90fa393f07e48d984ad4f79be53211198952456b2695dc2d1af2e0bc46a0e6cf30ecbb36cccc9e64430d1 SHA512 77c55ea1e0d33b2f4ced11e495390bbccc30425fd1842361306b92aa21eff2be446837d6100977deb1ea174a1415d6de9e8c5a195a95bbbba6386bce89f0e4f1 MISC metadata.xml 1175 BLAKE2B 8b512fd5efae4481d319fc52a11f3730af081d5c3ff12f6c6d62768e905e0651e3b4792765f65edbf659862b56372f32ba3aa7ae51c12b2911b711cb12a013e1 SHA512 edd6bb889abfe036d2509e56f350cf058e249e398811fdb2890bd001b75143b8d9df28bb64acba195852d01d484b7e6381e82ce972aad6d8cf1e0c961b3ade72 diff --git a/dev-ada/libgpr/files/libgpr-2016-gentoo.patch b/dev-ada/libgpr/files/libgpr-2016-gentoo.patch deleted file mode 100644 index 0282e60892bf..000000000000 --- a/dev-ada/libgpr/files/libgpr-2016-gentoo.patch +++ /dev/null @@ -1,89 +0,0 @@ ---- gprbuild-gpl-2016-src/Makefile.in.old 2017-01-19 19:52:41.242907252 +0100 -+++ gprbuild-gpl-2016-src/Makefile.in 2017-01-19 19:54:45.822646333 +0100 -@@ -25,12 +25,12 @@ - host=@host@ - target=@target@ - build=@build@ --prefix=@prefix@ -+prefix=$(DESTDIR)@prefix@ - srcdir=@srcdir@ - objdir=@objdir@ - exec_prefix=@exec_prefix@ - datarootdir=@datarootdir@ --datadir=@datadir@ -+datadir=$(DESTDIR)@datadir@ - bindir=@bindir@ - libdir=@libdir@ - libexecdir=@libexecdir@ -@@ -173,13 +173,13 @@ - libgpr.build: $(foreach t, $(LIBGPR_TYPES), libgpr.build.$(t)) - - libgpr.build.shared: -- ${BUILDER} -XLIBRARY_TYPE=relocatable -P$(srcdir)/gpr/gpr.gpr -+ ${BUILDER} -v -XLIBRARY_TYPE=relocatable -P$(srcdir)/gpr/gpr.gpr -cargs:Ada $(ADAFLAGS) - - libgpr.build.static: -- ${BUILDER} -XLIBRARY_TYPE=static -P$(srcdir)/gpr/gpr.gpr -+ ${BUILDER} -v -XLIBRARY_TYPE=static -P$(srcdir)/gpr/gpr.gpr -cargs:Ada $(ADAFLAGS) - - libgpr.build.static-pic: -- ${BUILDER} -XLIBRARY_TYPE=static-pic -P$(srcdir)/gpr/gpr.gpr -+ ${BUILDER} -v -XLIBRARY_TYPE=static-pic -P$(srcdir)/gpr/gpr.gpr -cargs:Ada $(ADAFLAGS) - - libgpr.install: $(foreach t, $(LIBGPR_TYPES), libgpr.install.$(t)) - ---- gprbuild-gpl-2016-src/gpr/src/gpr-env.adb.old 2017-11-13 22:16:53.349083426 +0100 -+++ gprbuild-gpl-2016-src/gpr/src/gpr-env.adb 2017-11-13 22:17:22.692590351 +0100 -@@ -1948,6 +1948,8 @@ - - end if; - -+ Add_Directories (Self, "/usr/share/gpr"); -+ - if Gpr_Prj_Path.all /= "" then - Add_Directories (Self, Gpr_Prj_Path.all); - end if; ---- gprbuild-gpl-2017-src/gpr/src/gpr-names.ads.old 2017-11-19 13:09:18.947527738 +0100 -+++ gprbuild-gpl-2017-src/gpr/src/gpr-names.ads 2017-11-19 13:10:08.125654595 +0100 -@@ -27,6 +27,8 @@ - Name_Buffer : String (1 .. 1_000_000); - Name_Len : Natural := 0; - -+ Last_Id : Name_Id := Name_Id'First; -+ - procedure Get_Name_String (Id : Name_Id); - procedure Get_Name_String (Id : Unit_Name_Type); - procedure Get_Name_String (Id : File_Name_Type); ---- gprbuild-gpl-2017-src/gpr/src/gpr-names.adb.old 2017-11-19 13:10:27.674316703 +0100 -+++ gprbuild-gpl-2017-src/gpr/src/gpr-names.adb 2017-11-19 13:14:38.360963627 +0100 -@@ -354,6 +354,8 @@ - - Name_Chars.Append (ASCII.NUL); - -+ Last_Id := Name_Entries.Last; -+ - return Name_Entries.Last; - end Name_Enter; - -@@ -427,6 +429,8 @@ - - Name_Chars.Append (ASCII.NUL); - -+ Last_Id := Name_Entries.Last; -+ - return Name_Entries.Last; - end Name_Find; - ---- gprbuild-gpl-2017-src/gpr/src/gpr-snames.adb.old 2017-11-19 13:12:41.592995718 +0100 -+++ gprbuild-gpl-2017-src/gpr/src/gpr-snames.adb 2017-11-19 13:16:31.980979696 +0100 -@@ -53,6 +53,10 @@ - return; - end if; - -+ if Last_Id = Name_Id'First then -+ Add_Name (""); -+ end if; -+ - Add_Name ("a"); - Add_Name ("b"); - Add_Name ("c"); diff --git a/dev-ada/libgpr/libgpr-2017.ebuild b/dev-ada/libgpr/libgpr-2017.ebuild deleted file mode 100644 index f143af3dc4f8..000000000000 --- a/dev-ada/libgpr/libgpr-2017.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs multiprocessing - -MYP=gprbuild-gpl-${PV} - -DESCRIPTION="Ada library to handle GPRbuild project files" -HOMEPAGE="http://libre.adacore.com/" -SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deecff7 - -> ${MYP}-src.tar.gz" -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="gnat_2016 +gnat_2017 +shared static-libs static-pic" - -RDEPEND="dev-ada/xmlada[static-libs,gnat_2016=,gnat_2017=]" -DEPEND="${RDEPEND} - dev-ada/gprbuild" - -S="${WORKDIR}"/${MYP}-src - -REQUIRED_USE="|| ( shared static-libs static-pic )" -PATCHES=( "${FILESDIR}"/${PN}-2018-gentoo.patch ) - -src_configure() { - emake prefix="${D}"usr setup -} - -src_compile() { - build () { - gprbuild -p -m -j$(makeopts_jobs) -XBUILD=production -v \ - -XLIBRARY_TYPE=$1 -XXMLADA_BUILD=$1 \ - gpr/gpr.gpr -cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} || die - } - if use shared; then - build relocatable - fi - if use static-libs; then - build static - fi - if use static-pic; then - build static-pic - fi -} - -src_install() { - if use static-libs; then - emake DESTDIR="${D}" libgpr.install.static - fi - for kind in shared static-pic; do - if use ${kind}; then - emake DESTDIR="${D}" libgpr.install.${kind} - fi - done -} diff --git a/dev-ada/libgpr/libgpr-2018.ebuild b/dev-ada/libgpr/libgpr-2018.ebuild index ae6c33a82bbb..6041a1d9e70e 100644 --- a/dev-ada/libgpr/libgpr-2018.ebuild +++ b/dev-ada/libgpr/libgpr-2018.ebuild @@ -20,7 +20,7 @@ RDEPEND="dev-ada/xmlada[shared?,static-libs?,static-pic?] dev-ada/xmlada[gnat_2016=,gnat_2017=,gnat_2018=] !net-libs/grpc" DEPEND="${RDEPEND} - >=dev-ada/gprbuild-2018[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?]" + dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?,gnat_2018(-)?]" S="${WORKDIR}"/${MYP}-src -- cgit v1.2.3