| 1 |
commit: 38a3cb7e8532c1368e6fe3712b4dc3b30d6fca45 |
| 2 |
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Nov 18 21:09:27 2018 +0000 |
| 4 |
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Nov 18 21:09:27 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38a3cb7e |
| 7 |
|
| 8 |
dev-ada/gnat_util: Remove old version |
| 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/gnat_util/Manifest | 1 - |
| 14 |
.../gnat_util/files/gnat_util-2016-gentoo.patch | 100 --------------------- |
| 15 |
.../gnat_util/files/gnat_util-2017-gentoo.patch | 10 --- |
| 16 |
dev-ada/gnat_util/gnat_util-2016.ebuild | 61 ------------- |
| 17 |
dev-ada/gnat_util/gnat_util-2017.ebuild | 14 +-- |
| 18 |
5 files changed, 7 insertions(+), 179 deletions(-) |
| 19 |
|
| 20 |
diff --git a/dev-ada/gnat_util/Manifest b/dev-ada/gnat_util/Manifest |
| 21 |
index cfcd6cc8d38..3c7968b65cc 100644 |
| 22 |
--- a/dev-ada/gnat_util/Manifest |
| 23 |
+++ b/dev-ada/gnat_util/Manifest |
| 24 |
@@ -1,3 +1,2 @@ |
| 25 |
-DIST gnat_util-gpl-2016-src.tar.gz 1126296 BLAKE2B e1e7c2628b6a012ca3ad5809d4ea785a9fa68ed5e7f67a80475ece80161f53d611eb9a383591167d30f2a1125de48299123cc0c0b4807b6bcb4bca197bda78ed SHA512 1edb67e762637e9e951356c7be402d7b2b903a05abdc93eadaf5ba98bc7bfa936b4fa2a2ae7eb986200dec755020e53d312d42769512fba2e290099f6030bbd0 |
| 26 |
DIST gnat_util-gpl-2017-src.tar.gz 868496 BLAKE2B d105a59f0533428a4d57b3c81c0818f4d1bd457b113d775fe97f35f7352e03b602ac0e6d7b970e408fb3dd6d30f0d4e60feffccf42dbdc0723a76855b0164ee0 SHA512 d5e48c6fafc870f36094d2dfd5f45f2d5b5729c97596afff7475b7838c1c7c029ef57395ca1011ee74d8a4195597ea1f502732e654a02561a7abc72c8a7d3a6a |
| 27 |
DIST gnat_util-gpl-2018-src.tar.gz 883945 BLAKE2B e30ee379f4ea9525337b0794d4fc91c80458b3b1dd3d10cbc455c6f566d4d073b6753c171ffbbabd85995717de249cdee7c094b7ba00d752a13e18d0f54da192 SHA512 490b0fa944f4b9fee2a4e78c1181658eb8f95262314455c41beb3ebe9db5dd540090d1f9840357572969721966fa11085dc680f3498dc539631ef3f4dbf56426 |
| 28 |
|
| 29 |
diff --git a/dev-ada/gnat_util/files/gnat_util-2016-gentoo.patch b/dev-ada/gnat_util/files/gnat_util-2016-gentoo.patch |
| 30 |
deleted file mode 100644 |
| 31 |
index 7559894c6d0..00000000000 |
| 32 |
--- a/dev-ada/gnat_util/files/gnat_util-2016-gentoo.patch |
| 33 |
+++ /dev/null |
| 34 |
@@ -1,100 +0,0 @@ |
| 35 |
---- gnat_util-gpl-2014-src/Makefile.old 2016-12-28 09:56:49.378950217 +0100 |
| 36 |
-+++ gnat_util-gpl-2014-src/Makefile 2016-12-28 09:57:12.301562519 +0100 |
| 37 |
-@@ -19,17 +19,26 @@ |
| 38 |
- MKDIR=mkdir -p |
| 39 |
- SRC=gen_src |
| 40 |
- |
| 41 |
--.PHONY: all |
| 42 |
--all: generate_sources |
| 43 |
-+build-static: |
| 44 |
- ${BUILDER} -m -XOS=$(OS_TYPE) -XBUILD=$(BUILD_TYPE) \ |
| 45 |
-- -XLIBRARY_TYPE=static -Pgnat_util -p |
| 46 |
-+ -XLIBRARY_TYPE=static -Pgnat_util -p \ |
| 47 |
-+ -cargs:ada $(ADAFLAGS) -cargs:C $(CFLAGS) |
| 48 |
--ifeq ($(ENABLE_SHARED), yes) |
| 49 |
-+build-shared: |
| 50 |
- ${BUILDER} -m -XOS=$(OS_TYPE) -XBUILD=$(BUILD_TYPE) \ |
| 51 |
-- -XLIBRARY_TYPE=relocatable -Pgnat_util -p |
| 52 |
-+ -XLIBRARY_TYPE=relocatable -Pgnat_util -p \ |
| 53 |
-+ -cargs:ada $(ADAFLAGS) -cargs:C $(CFLAGS) |
| 54 |
--endif |
| 55 |
--ifeq ($(ENABLE_PIC), yes) |
| 56 |
-+build-static-pic: |
| 57 |
- ${BUILDER} -m -XOS=$(OS_TYPE) -XBUILD=$(BUILD_TYPE) \ |
| 58 |
-- -XLIBRARY_TYPE=static-pic -Pgnat_util -p |
| 59 |
-+ -XLIBRARY_TYPE=static-pic -Pgnat_util -p \ |
| 60 |
-+ -cargs:ada $(ADAFLAGS) -cargs:C $(CFLAGS) |
| 61 |
-+.PHONY: all |
| 62 |
-+all: generate_sources |
| 63 |
-+ $(MAKE) build-static |
| 64 |
-+ifeq ($(ENABLE_SHARED), yes) |
| 65 |
-+ $(MAKE) build-shared |
| 66 |
-+endif |
| 67 |
-+ifeq ($(ENABLE_PIC), yes) |
| 68 |
-+ $(MAKE) build-static-pic |
| 69 |
- endif |
| 70 |
- |
| 71 |
- .PHONY: generate_sources |
| 72 |
-@@ -48,7 +48,7 @@ |
| 73 |
- $(MKDIR) $(SRC) |
| 74 |
- $(CP) xsnamest.adb xutil.* snames.adb-tmpl snames.ads-tmpl snames.h-tmpl $(SRC) |
| 75 |
- (cd $(SRC) && \ |
| 76 |
-- gnatmake -gnatf -gnatwae -gnatyg -gnatyS xsnamest && \ |
| 77 |
-+ ${GNATMAKE} -gnatf -gnatwae -gnatyg -gnatyS xsnamest && \ |
| 78 |
- ./xsnamest && mv snames.ns snames.ads && mv snames.nb snames.adb) |
| 79 |
- $(CP) sdefault_adb.gnat_util $(SRC)/sdefault.adb |
| 80 |
- |
| 81 |
-@@ -58,8 +58,7 @@ |
| 82 |
- --prefix=$(prefix) --project-subdir=lib/gnat gnat_util |
| 83 |
- endif |
| 84 |
- |
| 85 |
--.PHONY: install |
| 86 |
--install: install-clean |
| 87 |
-+install-static: |
| 88 |
- ${INSTALLER} -p -f -m -XOS=$(OS_TYPE) -XBUILD=$(BUILD_TYPE) \ |
| 89 |
- -XLIBRARY_TYPE=static \ |
| 90 |
- --prefix=$(prefix) \ |
| 91 |
-@@ -67,7 +66,7 @@ |
| 92 |
- --lib-subdir=lib/gnat_util/static \ |
| 93 |
- --project-subdir=lib/gnat \ |
| 94 |
- --build-var=LIBRARY_TYPE --build-name=static -Pgnat_util |
| 95 |
--ifeq ($(ENABLE_SHARED), yes) |
| 96 |
-+install-shared: |
| 97 |
- ${INSTALLER} -p -f -m -XOS=$(OS_TYPE) -XBUILD=$(BUILD_TYPE) \ |
| 98 |
- -XLIBRARY_TYPE=relocatable \ |
| 99 |
- --prefix=$(prefix) \ |
| 100 |
-@@ -75,8 +74,7 @@ |
| 101 |
- --lib-subdir=lib/gnat_util/relocatable \ |
| 102 |
- --project-subdir=lib/gnat \ |
| 103 |
- --build-var=LIBRARY_TYPE --build-name=relocatable -Pgnat_util |
| 104 |
--endif |
| 105 |
--ifeq ($(ENABLE_PIC), yes) |
| 106 |
-+install-static-pic: |
| 107 |
- ${INSTALLER} -p -f -m -XOS=$(OS_TYPE) -XBUILD=$(BUILD_TYPE) \ |
| 108 |
- -XLIBRARY_TYPE=static-pic \ |
| 109 |
- --prefix=$(prefix) \ |
| 110 |
-@@ -84,6 +82,14 @@ |
| 111 |
- --lib-subdir=lib/gnat_util/static-pic \ |
| 112 |
- --project-subdir=lib/gnat \ |
| 113 |
- --build-var=LIBRARY_TYPE --build-name=static-pic -Pgnat_util |
| 114 |
-+.PHONY: install |
| 115 |
-+install: install-clean |
| 116 |
-+ $(MAKE) install-static |
| 117 |
-+ifeq ($(ENABLE_SHARED), yes) |
| 118 |
-+ $(MAKE) install-shared |
| 119 |
-+endif |
| 120 |
-+ifeq ($(ENABLE_PIC), yes) |
| 121 |
-+ $(MAKE) install-static-pic |
| 122 |
- endif |
| 123 |
- |
| 124 |
- .PHONY: clean |
| 125 |
---- gnat_util-gpl-2016-src/gnat_util.gpr.old 2017-02-09 22:15:27.153827164 +0100 |
| 126 |
-+++ gnat_util-gpl-2016-src/gnat_util.gpr 2017-02-09 22:15:38.307627480 +0100 |
| 127 |
-@@ -31,6 +31,7 @@ |
| 128 |
- for Default_Switches ("Ada") use ("-O0", "-gnato", "-g", "-gnata"); |
| 129 |
- for Default_Switches ("C") use ("-g"); |
| 130 |
- end case; |
| 131 |
-+ for Driver ("C") use External ("CC", "gcc"); |
| 132 |
- end Compiler; |
| 133 |
- |
| 134 |
- package Builder is |
| 135 |
|
| 136 |
diff --git a/dev-ada/gnat_util/files/gnat_util-2017-gentoo.patch b/dev-ada/gnat_util/files/gnat_util-2017-gentoo.patch |
| 137 |
index 50f74d3a138..59cb7cf6646 100644 |
| 138 |
--- a/dev-ada/gnat_util/files/gnat_util-2017-gentoo.patch |
| 139 |
+++ b/dev-ada/gnat_util/files/gnat_util-2017-gentoo.patch |
| 140 |
@@ -68,13 +68,3 @@ |
| 141 |
${INSTALLER} -p -f -m -XOS=$(OS_TYPE) -XBUILD=$(BUILD_TYPE) \ |
| 142 |
-XLIBRARY_TYPE=static-pic \ |
| 143 |
--prefix=$(prefix) \ |
| 144 |
---- gnat_util-gpl-2016-src/gnat_util.gpr.old 2017-02-09 22:15:27.153827164 +0100 |
| 145 |
-+++ gnat_util-gpl-2016-src/gnat_util.gpr 2017-02-09 22:15:38.307627480 +0100 |
| 146 |
-@@ -31,6 +31,7 @@ |
| 147 |
- for Default_Switches ("Ada") use ("-O0", "-gnato", "-g", "-gnata"); |
| 148 |
- for Default_Switches ("C") use ("-g"); |
| 149 |
- end case; |
| 150 |
-+ for Driver ("C") use External ("CC", "gcc"); |
| 151 |
- end Compiler; |
| 152 |
- |
| 153 |
- package Builder is |
| 154 |
|
| 155 |
diff --git a/dev-ada/gnat_util/gnat_util-2016.ebuild b/dev-ada/gnat_util/gnat_util-2016.ebuild |
| 156 |
deleted file mode 100644 |
| 157 |
index e9a5d9effb9..00000000000 |
| 158 |
--- a/dev-ada/gnat_util/gnat_util-2016.ebuild |
| 159 |
+++ /dev/null |
| 160 |
@@ -1,61 +0,0 @@ |
| 161 |
-# Copyright 1999-2018 Gentoo Foundation |
| 162 |
-# Distributed under the terms of the GNU General Public License v2 |
| 163 |
- |
| 164 |
-EAPI=6 |
| 165 |
- |
| 166 |
-inherit toolchain-funcs multiprocessing |
| 167 |
- |
| 168 |
-MYP=${PN}-gpl-${PV} |
| 169 |
- |
| 170 |
-DESCRIPTION="Provides access to GNAT compiler internals for AdaCore utilities" |
| 171 |
-HOMEPAGE="http://libre.adacore.com" |
| 172 |
-SRC_URI="http://mirrors.cdn.adacore.com/art/57399637c7a447658e0affa6 |
| 173 |
- -> ${MYP}-src.tar.gz" |
| 174 |
- |
| 175 |
-LICENSE="GPL-3" |
| 176 |
-SLOT="0" |
| 177 |
-KEYWORDS="amd64 x86" |
| 178 |
-IUSE="+gnat_2016 gnat_2017 +shared static-libs static-pic" |
| 179 |
- |
| 180 |
-RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) |
| 181 |
- gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )" |
| 182 |
-DEPEND="${RDEPEND} |
| 183 |
- dev-ada/gprbuild[gnat_2016=,gnat_2017=]" |
| 184 |
-REQUIRED_USE="^^ ( gnat_2016 gnat_2017 )" |
| 185 |
- |
| 186 |
-S="${WORKDIR}"/${MYP}-src |
| 187 |
- |
| 188 |
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) |
| 189 |
- |
| 190 |
-src_compile() { |
| 191 |
- if use gnat_2016; then |
| 192 |
- GCC_PV=4.9.4 |
| 193 |
- else |
| 194 |
- GCC_PV=6.3.0 |
| 195 |
- fi |
| 196 |
- GCC=${CHOST}-gcc-${GCC_PV} |
| 197 |
- GNATMAKE=${CHOST}-gnatmake-${GCC_PV} |
| 198 |
- emake GNATMAKE="${GNATMAKE} ${ADAFLAGS}" \ |
| 199 |
- BUILDER="gprbuild -j$(makeopts_jobs)" generate_sources |
| 200 |
- if use static-libs; then |
| 201 |
- emake CC="${GCC}" BUILDER="gprbuild -v -j$(makeopts_jobs)" build-static |
| 202 |
- fi |
| 203 |
- for kind in shared static-pic; do |
| 204 |
- if use ${kind}; then |
| 205 |
- emake CC="${GCC}" BUILDER="gprbuild -v -j$(makeopts_jobs)" \ |
| 206 |
- build-${kind} |
| 207 |
- fi |
| 208 |
- done |
| 209 |
-} |
| 210 |
- |
| 211 |
-src_install() { |
| 212 |
- if use static-libs; then |
| 213 |
- emake prefix="${D}"/usr install-static |
| 214 |
- fi |
| 215 |
- for kind in shared static-pic; do |
| 216 |
- if use ${kind}; then |
| 217 |
- emake prefix="${D}"/usr install-${kind} |
| 218 |
- fi |
| 219 |
- done |
| 220 |
- einstalldocs |
| 221 |
-} |
| 222 |
|
| 223 |
diff --git a/dev-ada/gnat_util/gnat_util-2017.ebuild b/dev-ada/gnat_util/gnat_util-2017.ebuild |
| 224 |
index 28c0e6ebb86..de225724a4e 100644 |
| 225 |
--- a/dev-ada/gnat_util/gnat_util-2017.ebuild |
| 226 |
+++ b/dev-ada/gnat_util/gnat_util-2017.ebuild |
| 227 |
@@ -1,4 +1,4 @@ |
| 228 |
-# Copyright 1999-2018 Gentoo Foundation |
| 229 |
+# Copyright 1999-2018 Gentoo Authors |
| 230 |
# Distributed under the terms of the GNU General Public License v2 |
| 231 |
|
| 232 |
EAPI=6 |
| 233 |
@@ -17,10 +17,11 @@ SLOT="0" |
| 234 |
KEYWORDS="amd64 x86" |
| 235 |
IUSE="gnat_2016 +gnat_2017 +shared static-libs static-pic" |
| 236 |
|
| 237 |
-RDEPEND="dev-lang/gnat-gpl:6.3.0" |
| 238 |
+RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) |
| 239 |
+ gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )" |
| 240 |
DEPEND="${RDEPEND} |
| 241 |
- dev-ada/gprbuild[gnat_2017]" |
| 242 |
-REQUIRED_USE="!gnat_2016 gnat_2017" |
| 243 |
+ dev-ada/gprbuild[gnat_2016=,gnat_2017=]" |
| 244 |
+REQUIRED_USE="^^ ( gnat_2016 gnat_2017 )" |
| 245 |
|
| 246 |
S="${WORKDIR}"/${MYP}-src |
| 247 |
|
| 248 |
@@ -32,16 +33,15 @@ src_compile() { |
| 249 |
else |
| 250 |
GCC_PV=6.3.0 |
| 251 |
fi |
| 252 |
- GCC=${CHOST}-gcc-${GCC_PV} |
| 253 |
GNATMAKE=${CHOST}-gnatmake-${GCC_PV} |
| 254 |
emake GNATMAKE="${GNATMAKE} ${ADAFLAGS}" \ |
| 255 |
BUILDER="gprbuild -j$(makeopts_jobs)" generate_sources |
| 256 |
if use static-libs; then |
| 257 |
- emake CC="${GCC}" BUILDER="gprbuild -v -j$(makeopts_jobs)" build-static |
| 258 |
+ emake BUILDER="gprbuild -v -j$(makeopts_jobs)" build-static |
| 259 |
fi |
| 260 |
for kind in shared static-pic; do |
| 261 |
if use ${kind}; then |
| 262 |
- emake CC="${GCC}" BUILDER="gprbuild -v -j$(makeopts_jobs)" \ |
| 263 |
+ emake BUILDER="gprbuild -v -j$(makeopts_jobs)" \ |
| 264 |
build-${kind} |
| 265 |
fi |
| 266 |
done |
Archives