1 |
commit: af07dfcc4686317232af8675a20daf75a7a069f4 |
2 |
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Nov 18 10:11:40 2018 +0000 |
4 |
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Nov 18 10:11:40 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af07dfcc |
7 |
|
8 |
dev-ada/libgpr: remove old |
9 |
|
10 |
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org> |
11 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
12 |
|
13 |
dev-ada/libgpr/Manifest | 1 - |
14 |
dev-ada/libgpr/files/libgpr-2016-gentoo.patch | 89 --------------------------- |
15 |
dev-ada/libgpr/libgpr-2017.ebuild | 58 ----------------- |
16 |
3 files changed, 148 deletions(-) |
17 |
|
18 |
diff --git a/dev-ada/libgpr/Manifest b/dev-ada/libgpr/Manifest |
19 |
index 03af8870e7f..6bf49bc1adf 100644 |
20 |
--- a/dev-ada/libgpr/Manifest |
21 |
+++ b/dev-ada/libgpr/Manifest |
22 |
@@ -1,2 +1 @@ |
23 |
-DIST gprbuild-gpl-2017-src.tar.gz 2454957 BLAKE2B 890e5aa29e9f8fa8b140988ee8e5d6042640c34fe0877acde959de803bf690bb33c63b1c7e7db486f804882bddd77ab76ffbaa4dd27da327e21ed0376cadb99d SHA512 12f3682d64ce0718de4940c1e71a4380b20021805d88543842dbf3b5ce5d518c23a6b2d868565579baf81efa1d8cf05c7778253162f0df5d7adc0eb1865c9f88 |
24 |
DIST gprbuild-gpl-2018-src.tar.gz 2479651 BLAKE2B b0e24f4d97f06fe84569f8f0284e1028fce8e4ae90cfd27ab31ada0988f4f1b37eca4868bc212a21d26fb1a0a7ba6f031062e16d9758ab211e2fee40e25077ab SHA512 d22c0133baa6a0b626a0c1d145b21865bd0699cd8155ca22727272b0f8988c78163410b432ae148e87099e931df19d51ea867981556c79cb1cceb25456333044 |
25 |
|
26 |
diff --git a/dev-ada/libgpr/files/libgpr-2016-gentoo.patch b/dev-ada/libgpr/files/libgpr-2016-gentoo.patch |
27 |
deleted file mode 100644 |
28 |
index 0282e60892b..00000000000 |
29 |
--- a/dev-ada/libgpr/files/libgpr-2016-gentoo.patch |
30 |
+++ /dev/null |
31 |
@@ -1,89 +0,0 @@ |
32 |
---- gprbuild-gpl-2016-src/Makefile.in.old 2017-01-19 19:52:41.242907252 +0100 |
33 |
-+++ gprbuild-gpl-2016-src/Makefile.in 2017-01-19 19:54:45.822646333 +0100 |
34 |
-@@ -25,12 +25,12 @@ |
35 |
- host=@host@ |
36 |
- target=@target@ |
37 |
- build=@build@ |
38 |
--prefix=@prefix@ |
39 |
-+prefix=$(DESTDIR)@prefix@ |
40 |
- srcdir=@srcdir@ |
41 |
- objdir=@objdir@ |
42 |
- exec_prefix=@exec_prefix@ |
43 |
- datarootdir=@datarootdir@ |
44 |
--datadir=@datadir@ |
45 |
-+datadir=$(DESTDIR)@datadir@ |
46 |
- bindir=@bindir@ |
47 |
- libdir=@libdir@ |
48 |
- libexecdir=@libexecdir@ |
49 |
-@@ -173,13 +173,13 @@ |
50 |
- libgpr.build: $(foreach t, $(LIBGPR_TYPES), libgpr.build.$(t)) |
51 |
- |
52 |
- libgpr.build.shared: |
53 |
-- ${BUILDER} -XLIBRARY_TYPE=relocatable -P$(srcdir)/gpr/gpr.gpr |
54 |
-+ ${BUILDER} -v -XLIBRARY_TYPE=relocatable -P$(srcdir)/gpr/gpr.gpr -cargs:Ada $(ADAFLAGS) |
55 |
- |
56 |
- libgpr.build.static: |
57 |
-- ${BUILDER} -XLIBRARY_TYPE=static -P$(srcdir)/gpr/gpr.gpr |
58 |
-+ ${BUILDER} -v -XLIBRARY_TYPE=static -P$(srcdir)/gpr/gpr.gpr -cargs:Ada $(ADAFLAGS) |
59 |
- |
60 |
- libgpr.build.static-pic: |
61 |
-- ${BUILDER} -XLIBRARY_TYPE=static-pic -P$(srcdir)/gpr/gpr.gpr |
62 |
-+ ${BUILDER} -v -XLIBRARY_TYPE=static-pic -P$(srcdir)/gpr/gpr.gpr -cargs:Ada $(ADAFLAGS) |
63 |
- |
64 |
- libgpr.install: $(foreach t, $(LIBGPR_TYPES), libgpr.install.$(t)) |
65 |
- |
66 |
---- gprbuild-gpl-2016-src/gpr/src/gpr-env.adb.old 2017-11-13 22:16:53.349083426 +0100 |
67 |
-+++ gprbuild-gpl-2016-src/gpr/src/gpr-env.adb 2017-11-13 22:17:22.692590351 +0100 |
68 |
-@@ -1948,6 +1948,8 @@ |
69 |
- |
70 |
- end if; |
71 |
- |
72 |
-+ Add_Directories (Self, "/usr/share/gpr"); |
73 |
-+ |
74 |
- if Gpr_Prj_Path.all /= "" then |
75 |
- Add_Directories (Self, Gpr_Prj_Path.all); |
76 |
- end if; |
77 |
---- gprbuild-gpl-2017-src/gpr/src/gpr-names.ads.old 2017-11-19 13:09:18.947527738 +0100 |
78 |
-+++ gprbuild-gpl-2017-src/gpr/src/gpr-names.ads 2017-11-19 13:10:08.125654595 +0100 |
79 |
-@@ -27,6 +27,8 @@ |
80 |
- Name_Buffer : String (1 .. 1_000_000); |
81 |
- Name_Len : Natural := 0; |
82 |
- |
83 |
-+ Last_Id : Name_Id := Name_Id'First; |
84 |
-+ |
85 |
- procedure Get_Name_String (Id : Name_Id); |
86 |
- procedure Get_Name_String (Id : Unit_Name_Type); |
87 |
- procedure Get_Name_String (Id : File_Name_Type); |
88 |
---- gprbuild-gpl-2017-src/gpr/src/gpr-names.adb.old 2017-11-19 13:10:27.674316703 +0100 |
89 |
-+++ gprbuild-gpl-2017-src/gpr/src/gpr-names.adb 2017-11-19 13:14:38.360963627 +0100 |
90 |
-@@ -354,6 +354,8 @@ |
91 |
- |
92 |
- Name_Chars.Append (ASCII.NUL); |
93 |
- |
94 |
-+ Last_Id := Name_Entries.Last; |
95 |
-+ |
96 |
- return Name_Entries.Last; |
97 |
- end Name_Enter; |
98 |
- |
99 |
-@@ -427,6 +429,8 @@ |
100 |
- |
101 |
- Name_Chars.Append (ASCII.NUL); |
102 |
- |
103 |
-+ Last_Id := Name_Entries.Last; |
104 |
-+ |
105 |
- return Name_Entries.Last; |
106 |
- end Name_Find; |
107 |
- |
108 |
---- gprbuild-gpl-2017-src/gpr/src/gpr-snames.adb.old 2017-11-19 13:12:41.592995718 +0100 |
109 |
-+++ gprbuild-gpl-2017-src/gpr/src/gpr-snames.adb 2017-11-19 13:16:31.980979696 +0100 |
110 |
-@@ -53,6 +53,10 @@ |
111 |
- return; |
112 |
- end if; |
113 |
- |
114 |
-+ if Last_Id = Name_Id'First then |
115 |
-+ Add_Name (""); |
116 |
-+ end if; |
117 |
-+ |
118 |
- Add_Name ("a"); |
119 |
- Add_Name ("b"); |
120 |
- Add_Name ("c"); |
121 |
|
122 |
diff --git a/dev-ada/libgpr/libgpr-2017.ebuild b/dev-ada/libgpr/libgpr-2017.ebuild |
123 |
deleted file mode 100644 |
124 |
index f143af3dc4f..00000000000 |
125 |
--- a/dev-ada/libgpr/libgpr-2017.ebuild |
126 |
+++ /dev/null |
127 |
@@ -1,58 +0,0 @@ |
128 |
-# Copyright 1999-2018 Gentoo Authors |
129 |
-# Distributed under the terms of the GNU General Public License v2 |
130 |
- |
131 |
-EAPI=6 |
132 |
- |
133 |
-inherit toolchain-funcs multiprocessing |
134 |
- |
135 |
-MYP=gprbuild-gpl-${PV} |
136 |
- |
137 |
-DESCRIPTION="Ada library to handle GPRbuild project files" |
138 |
-HOMEPAGE="http://libre.adacore.com/" |
139 |
-SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deecff7 |
140 |
- -> ${MYP}-src.tar.gz" |
141 |
-LICENSE="GPL-3" |
142 |
-SLOT="0" |
143 |
-KEYWORDS="amd64 x86" |
144 |
-IUSE="gnat_2016 +gnat_2017 +shared static-libs static-pic" |
145 |
- |
146 |
-RDEPEND="dev-ada/xmlada[static-libs,gnat_2016=,gnat_2017=]" |
147 |
-DEPEND="${RDEPEND} |
148 |
- dev-ada/gprbuild" |
149 |
- |
150 |
-S="${WORKDIR}"/${MYP}-src |
151 |
- |
152 |
-REQUIRED_USE="|| ( shared static-libs static-pic )" |
153 |
-PATCHES=( "${FILESDIR}"/${PN}-2018-gentoo.patch ) |
154 |
- |
155 |
-src_configure() { |
156 |
- emake prefix="${D}"usr setup |
157 |
-} |
158 |
- |
159 |
-src_compile() { |
160 |
- build () { |
161 |
- gprbuild -p -m -j$(makeopts_jobs) -XBUILD=production -v \ |
162 |
- -XLIBRARY_TYPE=$1 -XXMLADA_BUILD=$1 \ |
163 |
- gpr/gpr.gpr -cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} || die |
164 |
- } |
165 |
- if use shared; then |
166 |
- build relocatable |
167 |
- fi |
168 |
- if use static-libs; then |
169 |
- build static |
170 |
- fi |
171 |
- if use static-pic; then |
172 |
- build static-pic |
173 |
- fi |
174 |
-} |
175 |
- |
176 |
-src_install() { |
177 |
- if use static-libs; then |
178 |
- emake DESTDIR="${D}" libgpr.install.static |
179 |
- fi |
180 |
- for kind in shared static-pic; do |
181 |
- if use ${kind}; then |
182 |
- emake DESTDIR="${D}" libgpr.install.${kind} |
183 |
- fi |
184 |
- done |
185 |
-} |