commit: af07dfcc4686317232af8675a20daf75a7a069f4
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 18 10:11:40 2018 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sun Nov 18 10:11:40 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af07dfcc
dev-ada/libgpr: remove old
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
dev-ada/libgpr/Manifest | 1 -
dev-ada/libgpr/files/libgpr-2016-gentoo.patch | 89 ---------------------------
dev-ada/libgpr/libgpr-2017.ebuild | 58 -----------------
3 files changed, 148 deletions(-)
diff --git a/dev-ada/libgpr/Manifest b/dev-ada/libgpr/Manifest
index 03af8870e7f..6bf49bc1adf 100644
--- a/dev-ada/libgpr/Manifest
+++ b/dev-ada/libgpr/Manifest
@@ -1,2 +1 @@
-DIST gprbuild-gpl-2017-src.tar.gz 2454957 BLAKE2B
890e5aa29e9f8fa8b140988ee8e5d6042640c34fe0877acde959de803bf690bb33c63b1c7e7db486f804882bddd77ab76ffbaa4dd27da327e21ed0376cadb99d
SHA512
12f3682d64ce0718de4940c1e71a4380b20021805d88543842dbf3b5ce5d518c23a6b2d868565579baf81efa1d8cf05c7778253162f0df5d7adc0eb1865c9f88
DIST gprbuild-gpl-2018-src.tar.gz 2479651 BLAKE2B
b0e24f4d97f06fe84569f8f0284e1028fce8e4ae90cfd27ab31ada0988f4f1b37eca4868bc212a21d26fb1a0a7ba6f031062e16d9758ab211e2fee40e25077ab
SHA512
d22c0133baa6a0b626a0c1d145b21865bd0699cd8155ca22727272b0f8988c78163410b432ae148e87099e931df19d51ea867981556c79cb1cceb25456333044
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 0282e60892b..00000000000
--- 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 f143af3dc4f..00000000000
--- 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
-}
