1 |
commit: d5b84bcf4a63b754c0b1ab040468431b0e635aa6 |
2 |
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed May 26 19:08:28 2021 +0000 |
4 |
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed May 26 19:08:28 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5b84bcf |
7 |
|
8 |
dev-ada/gtkada: enable gnat_2020, fix VariableScope |
9 |
|
10 |
Package-Manager: Portage-3.0.18, Repoman-3.0.2 |
11 |
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org> |
12 |
|
13 |
dev-ada/gtkada/Manifest | 2 - |
14 |
dev-ada/gtkada/gtkada-2018-r2.ebuild | 60 ---------------------- |
15 |
dev-ada/gtkada/gtkada-2019-r1.ebuild | 5 +- |
16 |
...gtkada-2017-r1.ebuild => gtkada-2019-r2.ebuild} | 18 ++++--- |
17 |
4 files changed, 12 insertions(+), 73 deletions(-) |
18 |
|
19 |
diff --git a/dev-ada/gtkada/Manifest b/dev-ada/gtkada/Manifest |
20 |
index 2af49593e9a..22e98a52f7a 100644 |
21 |
--- a/dev-ada/gtkada/Manifest |
22 |
+++ b/dev-ada/gtkada/Manifest |
23 |
@@ -1,3 +1 @@ |
24 |
DIST gtkada-2019-20190424-19D98-src.tgz 12273911 BLAKE2B e2d0f3c410973d0412bf433f2e1cc60a5b00e9f34ad0471cb583596587e6073fdeb9b6441aa50dfa81894ce692101fe51c7714090477d585721571261737a823 SHA512 aed0758b42ee8eac752c2c83a0974ee0c7cddfa15149879472ff2fb8ee7565456a225ce783739ede76bc0f47340e97af5b5d1149e244611bcd3b3760e20f8cf5 |
25 |
-DIST gtkada-gpl-2017-src.tgz 11952333 BLAKE2B 2a333452ff271bba0521235598afdb1abebc4ceeab0f915f173862329ae0986b0fc4f654d3df28eac73af075db224c0b12340c3acd1e4ed0ffc965e4365f8b40 SHA512 f5bbb9ebdd966e70b3edcaaf359cb9e75edba3c3f4f8febfa7de9f634f8e96cd0dd1482fb16ad852b1c9f9b0e2c16eb3a437120d37f0638d90af666620f09f3f |
26 |
-DIST gtkada-gpl-2018-src.tgz 11958880 BLAKE2B 4946918b52de5e15efc77411927812910d84d13cea66b86b1162b987c7849ba7fbb6da487881762f64005dc32a74fa73c9d759d25bb9ac0241d1d76cd4becbfb SHA512 9000de7675f8ee688b1c9cd93cf35b32f698aca8fc22d3b4e695d7c6b34feb60118cc687cf35432cd5ed9af7825eda7e20575a9fad4523a7b59cb0322bce0762 |
27 |
|
28 |
diff --git a/dev-ada/gtkada/gtkada-2018-r2.ebuild b/dev-ada/gtkada/gtkada-2018-r2.ebuild |
29 |
deleted file mode 100644 |
30 |
index eab34d509ac..00000000000 |
31 |
--- a/dev-ada/gtkada/gtkada-2018-r2.ebuild |
32 |
+++ /dev/null |
33 |
@@ -1,60 +0,0 @@ |
34 |
-# Copyright 1999-2019 Gentoo Authors |
35 |
-# Distributed under the terms of the GNU General Public License v2 |
36 |
- |
37 |
-EAPI=7 |
38 |
- |
39 |
-ADA_COMPAT=( gnat_201{6,7,8,9} ) |
40 |
-inherit ada autotools multiprocessing |
41 |
- |
42 |
-MYP=${PN}-gpl-${PV} |
43 |
- |
44 |
-DESCRIPTION="A complete Ada graphical toolkit" |
45 |
-HOMEPAGE="http://libre.adacore.com//tools/gtkada/" |
46 |
-SRC_URI="http://mirrors.cdn.adacore.com/art/5b0cf840c7a4475261f97ced |
47 |
- -> ${MYP}-src.tgz" |
48 |
- |
49 |
-LICENSE="GPL-3" |
50 |
-SLOT="0" |
51 |
-KEYWORDS="amd64 x86" |
52 |
-IUSE="+shared static-libs" |
53 |
- |
54 |
-RDEPEND="${ADA_DEPS} |
55 |
- dev-libs/atk |
56 |
- dev-libs/glib:2 |
57 |
- media-libs/fontconfig |
58 |
- media-libs/freetype |
59 |
- x11-libs/cairo |
60 |
- x11-libs/gdk-pixbuf:2 |
61 |
- x11-libs/gtk+:3 |
62 |
- x11-libs/pango" |
63 |
-DEPEND="${RDEPEND} |
64 |
- dev-ada/gprbuild[${ADA_USEDEP}]" |
65 |
- |
66 |
-REQUIRED_USE="${ADA_REQUIRED_USE}" |
67 |
- |
68 |
-S="${WORKDIR}"/${MYP}-src |
69 |
- |
70 |
-PATCHES=( "${FILESDIR}"/${PN}-2017-r1-gentoo.patch ) |
71 |
- |
72 |
-src_prepare() { |
73 |
- default |
74 |
- mv configure.{in,ac} |
75 |
- eautoreconf |
76 |
-} |
77 |
- |
78 |
-src_configure() { |
79 |
- econf \ |
80 |
- --prefix="${D}/usr" \ |
81 |
- $(use_enable static-libs static) \ |
82 |
- $(use_enable shared) \ |
83 |
- --without-GL |
84 |
-} |
85 |
- |
86 |
-src_compile() { |
87 |
- emake -j1 PROCESSORS=$(makeopts_jobs) |
88 |
-} |
89 |
- |
90 |
-src_install() { |
91 |
- emake -j1 install |
92 |
- einstalldocs |
93 |
-} |
94 |
|
95 |
diff --git a/dev-ada/gtkada/gtkada-2019-r1.ebuild b/dev-ada/gtkada/gtkada-2019-r1.ebuild |
96 |
index 036d2b05dd8..fe02b028c8b 100644 |
97 |
--- a/dev-ada/gtkada/gtkada-2019-r1.ebuild |
98 |
+++ b/dev-ada/gtkada/gtkada-2019-r1.ebuild |
99 |
@@ -1,4 +1,4 @@ |
100 |
-# Copyright 1999-2019 Gentoo Authors |
101 |
+# Copyright 1999-2021 Gentoo Authors |
102 |
# Distributed under the terms of the GNU General Public License v2 |
103 |
|
104 |
EAPI=7 |
105 |
@@ -47,7 +47,6 @@ src_prepare() { |
106 |
|
107 |
src_configure() { |
108 |
econf \ |
109 |
- --prefix="${D}/usr" \ |
110 |
$(use_enable static-libs static) \ |
111 |
$(use_enable shared) \ |
112 |
--without-GL |
113 |
@@ -58,6 +57,6 @@ src_compile() { |
114 |
} |
115 |
|
116 |
src_install() { |
117 |
- emake -j1 install |
118 |
+ emake -j1 DESTDIR="${D}" |
119 |
einstalldocs |
120 |
} |
121 |
|
122 |
diff --git a/dev-ada/gtkada/gtkada-2017-r1.ebuild b/dev-ada/gtkada/gtkada-2019-r2.ebuild |
123 |
similarity index 73% |
124 |
rename from dev-ada/gtkada/gtkada-2017-r1.ebuild |
125 |
rename to dev-ada/gtkada/gtkada-2019-r2.ebuild |
126 |
index 8c14fbefe83..d6f59528879 100644 |
127 |
--- a/dev-ada/gtkada/gtkada-2017-r1.ebuild |
128 |
+++ b/dev-ada/gtkada/gtkada-2019-r2.ebuild |
129 |
@@ -1,21 +1,21 @@ |
130 |
-# Copyright 1999-2019 Gentoo Authors |
131 |
+# Copyright 1999-2021 Gentoo Authors |
132 |
# Distributed under the terms of the GNU General Public License v2 |
133 |
|
134 |
EAPI=7 |
135 |
|
136 |
-ADA_COMPAT=( gnat_201{6,7} ) |
137 |
+ADA_COMPAT=( gnat_201{6..9} gnat_2020 ) |
138 |
inherit ada autotools multiprocessing |
139 |
|
140 |
-MYP=${PN}-gpl-${PV} |
141 |
+MYP=${P}-20190424-19D98 |
142 |
|
143 |
DESCRIPTION="A complete Ada graphical toolkit" |
144 |
HOMEPAGE="http://libre.adacore.com//tools/gtkada/" |
145 |
-SRC_URI="http://mirrors.cdn.adacore.com/art/591ae7a8c7a4473fcbb154c9 |
146 |
+SRC_URI="http://mirrors.cdn.adacore.com/art/5ce7f58931e87adb2d312c53 |
147 |
-> ${MYP}-src.tgz" |
148 |
|
149 |
LICENSE="GPL-3" |
150 |
SLOT="0" |
151 |
-KEYWORDS="amd64 x86" |
152 |
+KEYWORDS="~amd64 ~x86" |
153 |
IUSE="+shared static-libs" |
154 |
|
155 |
RDEPEND="${ADA_DEPS} |
156 |
@@ -34,7 +34,10 @@ REQUIRED_USE="${ADA_REQUIRED_USE}" |
157 |
|
158 |
S="${WORKDIR}"/${MYP}-src |
159 |
|
160 |
-PATCHES=( "${FILESDIR}"/${P}-r1-gentoo.patch ) |
161 |
+PATCHES=( |
162 |
+ "${FILESDIR}"/${PN}-2017-r1-gentoo.patch |
163 |
+ "${FILESDIR}"/${P}-gentoo.patch |
164 |
+) |
165 |
|
166 |
src_prepare() { |
167 |
default |
168 |
@@ -44,7 +47,6 @@ src_prepare() { |
169 |
|
170 |
src_configure() { |
171 |
econf \ |
172 |
- --prefix="${D}/usr" \ |
173 |
$(use_enable static-libs static) \ |
174 |
$(use_enable shared) \ |
175 |
--without-GL |
176 |
@@ -55,6 +57,6 @@ src_compile() { |
177 |
} |
178 |
|
179 |
src_install() { |
180 |
- emake -j1 install |
181 |
+ emake -j1 DESTDIR="${D}" |
182 |
einstalldocs |
183 |
} |