gentoo resync : 24.12.2018

6 files changed, 14 insertions, 189 deletions

diff --git a/dev-ada/gnat_util/Manifest b/dev-ada/gnat_util/Manifest
index a794df771b59..74a2a70a53a9 100644
--- a/dev-ada/gnat_util/Manifest
+++ b/dev-ada/gnat_util/Manifest
@@ -1,9 +1,6 @@
-AUX gnat_util-2016-gentoo.patch 3197 BLAKE2B e5a15c5becd1882fa7649c7b18d628dd38c7c7c621e34152110b20b658464ca98fcdffaa9ee90224f7d828f7e935d090f47cb446ceb6f898fac76cac6ce19cf4 SHA512 599d3c2cb1d22513c9ef2200d100a80b55d2efe8d8bf7b541cfb845da2a40d1a8d24234208b92a3fcfeba305cb0157b01576d16129e3979e8869ab4b098bb9f7
-AUX gnat_util-2017-gentoo.patch 2840 BLAKE2B 95e39f8c054cefb2ddc879e44b9e11e49fa91bb3e521440e25ca050e276d3ff067f0d407be29826f550d960cc729f3adabb7d81134906af39c1fb0ce668edec3 SHA512 6fb7c9fd3ac282fd0571aec55acfcafc5a72e8814dd9c158751f36f6bab29d682da9b6e89eca774f424831c2985776b07f6749c97bff4ee1baa423a9ed142846
-DIST gnat_util-gpl-2016-src.tar.gz 1126296 BLAKE2B e1e7c2628b6a012ca3ad5809d4ea785a9fa68ed5e7f67a80475ece80161f53d611eb9a383591167d30f2a1125de48299123cc0c0b4807b6bcb4bca197bda78ed SHA512 1edb67e762637e9e951356c7be402d7b2b903a05abdc93eadaf5ba98bc7bfa936b4fa2a2ae7eb986200dec755020e53d312d42769512fba2e290099f6030bbd0
+AUX gnat_util-2017-gentoo.patch 2419 BLAKE2B e8085e6a6cb65c5ffe6054aa360e90042a0dbba2280ecee060a690f8c06104a7224192045bf4b43d2028cb25d9b336e085968169b3d79d10767ce0694ec8b042 SHA512 b1ba5dbbfa86c943143e570a3ac871935e1e6f6104883abc56d1f8b9395d0e2b5e6317356b309497c6fa942e30f25f2f2f1b8cfd7cf801f40b5b1b64b036154b
 DIST gnat_util-gpl-2017-src.tar.gz 868496 BLAKE2B d105a59f0533428a4d57b3c81c0818f4d1bd457b113d775fe97f35f7352e03b602ac0e6d7b970e408fb3dd6d30f0d4e60feffccf42dbdc0723a76855b0164ee0 SHA512 d5e48c6fafc870f36094d2dfd5f45f2d5b5729c97596afff7475b7838c1c7c029ef57395ca1011ee74d8a4195597ea1f502732e654a02561a7abc72c8a7d3a6a
 DIST gnat_util-gpl-2018-src.tar.gz 883945 BLAKE2B e30ee379f4ea9525337b0794d4fc91c80458b3b1dd3d10cbc455c6f566d4d073b6753c171ffbbabd85995717de249cdee7c094b7ba00d752a13e18d0f54da192 SHA512 490b0fa944f4b9fee2a4e78c1181658eb8f95262314455c41beb3ebe9db5dd540090d1f9840357572969721966fa11085dc680f3498dc539631ef3f4dbf56426
-EBUILD gnat_util-2016.ebuild 1477 BLAKE2B 2b9e5cc94fee078cf11c870198668ef563507bfbeecc8da8553967e2a261685fa8affa89a56ba85a9522c894c263040eacfce0790fb5e11a89b4a3c9a70cf683 SHA512 b314664a35c77809172a8ac8fb6d07e565d98877ce9847b082d5386aff279cd87527b199881e84795254e68cde6fcd06f69ace8a3dcb016bc614def523f60957
-EBUILD gnat_util-2017.ebuild 1404 BLAKE2B 7f66ffa00fd9cfc9d4af3e0bafc945582f720d134b9b56ac2939cd9e05423dd944103d1004b7b7bab93a499d40ae7922cd93084f531ab79f5bedd39407b8fac4 SHA512 4c056592777aeaab9f908ee39c6d1f27be12900b73626db628225b4ca6575c3821d51239f75ee15f931dc41a1c55ccef4a772c58a3c96022a4fdd196fcf57c6c
-EBUILD gnat_util-2018.ebuild 1383 BLAKE2B 4d0dc5cf21c7c4505197f7fb564b51adcf06f852b79119ba363483e7561dc8fe75b53385ca3a4f4bafc4e1f9693bac140ace09b567e5454a1c58f86d8a759417 SHA512 d83632a99afb02d389d80da648dcd56bf78b40dafa35e0583ae2ef57024d60fafca94fd31a1da549db2ed15db5022d6c33dabe09cbc5339f4a9840bb9685dd4f
+EBUILD gnat_util-2017.ebuild 1422 BLAKE2B b69c22ede488f993d0efeb7e66846c33f20f15e10b5344ff02252fb6d037910fc4bc24fd0421a08504164796bc50481bae6109e2d3ebd21a4425ff6d969fc918 SHA512 d3a1ebb59b8a31162349bc40027f5cb36f8e7ed4de8190fc336f4ad930792b8263bd0c47909d909245c348823a57d05bfe26fabce0938c4e292c7b7f70154cd4
+EBUILD gnat_util-2018.ebuild 1326 BLAKE2B 336432396b5b98f7d59704f30a7063873651c296eb8a63700025c5c37cda497baf1caac3d4097ed95b99cfb1aee9e8402a1e75293560b7db1e12bb40b1a5aaf6 SHA512 8014d612eb4e2fcd1599aa6262f6afc131ca5dea70b40f096aa22c95a94bcb0ecc38a94c705254085b84c56e89fb21a034f082a5606885f58231dfe37738b247
 MISC metadata.xml 1157 BLAKE2B e747ed9b4c63bd802debbc784ca3aed291382259989a1ca3c5622a8058e407df3133d05635ba7442038dd78d5627bb37a9f16af278aa9bb490244884532a00c2 SHA512 b7dad53debfedd16f6192d7632557b4a65580bae8a47bef0d6138958b91ac329c96e629713c3274707a70846f332834081755fbb77c12842e75da966a39ec6ad
diff --git a/dev-ada/gnat_util/files/gnat_util-2016-gentoo.patch b/dev-ada/gnat_util/files/gnat_util-2016-gentoo.patch
deleted file mode 100644
index 7559894c6d00..000000000000
--- a/dev-ada/gnat_util/files/gnat_util-2016-gentoo.patch
+++ /dev/null
@@ -1,100 +0,0 @@
---- gnat_util-gpl-2014-src/Makefile.old	2016-12-28 09:56:49.378950217 +0100
-+++ gnat_util-gpl-2014-src/Makefile	2016-12-28 09:57:12.301562519 +0100
-@@ -19,17 +19,26 @@
- MKDIR=mkdir -p
- SRC=gen_src
- 
--.PHONY: all
--all: generate_sources
-+build-static:
- 	${BUILDER} -m -XOS=$(OS_TYPE) -XBUILD=$(BUILD_TYPE) \
--		-XLIBRARY_TYPE=static -Pgnat_util -p
-+		-XLIBRARY_TYPE=static -Pgnat_util -p \
-+		-cargs:ada $(ADAFLAGS) -cargs:C $(CFLAGS)
--ifeq ($(ENABLE_SHARED), yes)
-+build-shared:
- 	${BUILDER} -m -XOS=$(OS_TYPE) -XBUILD=$(BUILD_TYPE) \
--		-XLIBRARY_TYPE=relocatable -Pgnat_util -p
-+		-XLIBRARY_TYPE=relocatable -Pgnat_util -p \
-+		-cargs:ada $(ADAFLAGS) -cargs:C $(CFLAGS)
--endif
--ifeq ($(ENABLE_PIC), yes)
-+build-static-pic:
- 	${BUILDER} -m -XOS=$(OS_TYPE) -XBUILD=$(BUILD_TYPE) \
--		-XLIBRARY_TYPE=static-pic -Pgnat_util -p
-+		-XLIBRARY_TYPE=static-pic -Pgnat_util -p \
-+		-cargs:ada $(ADAFLAGS) -cargs:C $(CFLAGS)
-+.PHONY: all
-+all: generate_sources
-+	$(MAKE) build-static
-+ifeq ($(ENABLE_SHARED), yes)
-+	$(MAKE) build-shared
-+endif
-+ifeq ($(ENABLE_PIC), yes)
-+	$(MAKE) build-static-pic
- endif
- 
- .PHONY: generate_sources
-@@ -48,7 +48,7 @@
- 	$(MKDIR) $(SRC)
- 	$(CP) xsnamest.adb xutil.* snames.adb-tmpl snames.ads-tmpl snames.h-tmpl $(SRC)
- 	(cd $(SRC) && \
--	   gnatmake -gnatf -gnatwae -gnatyg -gnatyS xsnamest && \
-+	   ${GNATMAKE} -gnatf -gnatwae -gnatyg -gnatyS xsnamest && \
- 	   ./xsnamest && mv snames.ns snames.ads && mv snames.nb snames.adb)
- 	$(CP) sdefault_adb.gnat_util $(SRC)/sdefault.adb
- 
-@@ -58,8 +58,7 @@
- 		--prefix=$(prefix) --project-subdir=lib/gnat gnat_util
- endif
- 
--.PHONY: install
--install: install-clean
-+install-static:
- 	${INSTALLER} -p -f -m -XOS=$(OS_TYPE) -XBUILD=$(BUILD_TYPE) \
- 		-XLIBRARY_TYPE=static \
- 		--prefix=$(prefix) \
-@@ -67,7 +66,7 @@
- 		--lib-subdir=lib/gnat_util/static \
- 		--project-subdir=lib/gnat \
- 		--build-var=LIBRARY_TYPE --build-name=static -Pgnat_util
--ifeq ($(ENABLE_SHARED), yes)
-+install-shared:
- 	${INSTALLER} -p -f -m -XOS=$(OS_TYPE) -XBUILD=$(BUILD_TYPE) \
- 		-XLIBRARY_TYPE=relocatable \
- 		--prefix=$(prefix) \
-@@ -75,8 +74,7 @@
- 		--lib-subdir=lib/gnat_util/relocatable \
- 		--project-subdir=lib/gnat \
- 		--build-var=LIBRARY_TYPE --build-name=relocatable -Pgnat_util
--endif
--ifeq ($(ENABLE_PIC), yes)
-+install-static-pic:
- 	${INSTALLER} -p -f -m -XOS=$(OS_TYPE) -XBUILD=$(BUILD_TYPE) \
- 		-XLIBRARY_TYPE=static-pic \
- 		--prefix=$(prefix) \
-@@ -84,6 +82,14 @@
- 		--lib-subdir=lib/gnat_util/static-pic \
- 		--project-subdir=lib/gnat \
- 		--build-var=LIBRARY_TYPE --build-name=static-pic -Pgnat_util
-+.PHONY: install
-+install: install-clean
-+	$(MAKE) install-static
-+ifeq ($(ENABLE_SHARED), yes)
-+	$(MAKE) install-shared
-+endif
-+ifeq ($(ENABLE_PIC), yes)
-+	$(MAKE) install-static-pic
- endif
- 
- .PHONY: clean
---- gnat_util-gpl-2016-src/gnat_util.gpr.old	2017-02-09 22:15:27.153827164 +0100
-+++ gnat_util-gpl-2016-src/gnat_util.gpr	2017-02-09 22:15:38.307627480 +0100
-@@ -31,6 +31,7 @@
-             for Default_Switches ("Ada") use ("-O0", "-gnato", "-g", "-gnata");
-             for Default_Switches ("C") use ("-g");
-       end case;
-+      for Driver ("C") use External ("CC", "gcc");
-    end Compiler;
- 
-    package Builder is
diff --git a/dev-ada/gnat_util/files/gnat_util-2017-gentoo.patch b/dev-ada/gnat_util/files/gnat_util-2017-gentoo.patch
index 50f74d3a1381..59cb7cf66467 100644
--- a/dev-ada/gnat_util/files/gnat_util-2017-gentoo.patch
+++ b/dev-ada/gnat_util/files/gnat_util-2017-gentoo.patch
@@ -68,13 +68,3 @@
  	${INSTALLER} -p -f -m -XOS=$(OS_TYPE) -XBUILD=$(BUILD_TYPE) \
  		-XLIBRARY_TYPE=static-pic \
  		--prefix=$(prefix) \
---- gnat_util-gpl-2016-src/gnat_util.gpr.old	2017-02-09 22:15:27.153827164 +0100
-+++ gnat_util-gpl-2016-src/gnat_util.gpr	2017-02-09 22:15:38.307627480 +0100
-@@ -31,6 +31,7 @@
-             for Default_Switches ("Ada") use ("-O0", "-gnato", "-g", "-gnata");
-             for Default_Switches ("C") use ("-g");
-       end case;
-+      for Driver ("C") use External ("CC", "gcc");
-    end Compiler;
- 
-    package Builder is
diff --git a/dev-ada/gnat_util/gnat_util-2016.ebuild b/dev-ada/gnat_util/gnat_util-2016.ebuild
deleted file mode 100644
index e9a5d9effb9d..000000000000
--- a/dev-ada/gnat_util/gnat_util-2016.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs multiprocessing
-
-MYP=${PN}-gpl-${PV}
-
-DESCRIPTION="Provides access to GNAT compiler internals for AdaCore utilities"
-HOMEPAGE="http://libre.adacore.com"
-SRC_URI="http://mirrors.cdn.adacore.com/art/57399637c7a447658e0affa6
-	-> ${MYP}-src.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+gnat_2016 gnat_2017 +shared static-libs static-pic"
-
-RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
-	gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2016=,gnat_2017=]"
-REQUIRED_USE="^^ ( gnat_2016 gnat_2017 )"
-
-S="${WORKDIR}"/${MYP}-src
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_compile() {
-	if use gnat_2016; then
-		GCC_PV=4.9.4
-	else
-		GCC_PV=6.3.0
-	fi
-	GCC=${CHOST}-gcc-${GCC_PV}
-	GNATMAKE=${CHOST}-gnatmake-${GCC_PV}
-	emake GNATMAKE="${GNATMAKE} ${ADAFLAGS}" \
-		BUILDER="gprbuild -j$(makeopts_jobs)" generate_sources
-	if use static-libs; then
-		emake CC="${GCC}" BUILDER="gprbuild -v -j$(makeopts_jobs)" build-static
-	fi
-	for kind in shared static-pic; do
-		if use ${kind}; then
-			emake CC="${GCC}" BUILDER="gprbuild -v -j$(makeopts_jobs)" \
-				build-${kind}
-		fi
-	done
-}
-
-src_install() {
-	if use static-libs; then
-		emake prefix="${D}"/usr install-static
-	fi
-	for kind in shared static-pic; do
-		if use ${kind}; then
-			emake prefix="${D}"/usr install-${kind}
-		fi
-	done
-	einstalldocs
-}
diff --git a/dev-ada/gnat_util/gnat_util-2017.ebuild b/dev-ada/gnat_util/gnat_util-2017.ebuild
index 28c0e6ebb868..de225724a4e8 100644
--- a/dev-ada/gnat_util/gnat_util-2017.ebuild
+++ b/dev-ada/gnat_util/gnat_util-2017.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,10 +17,11 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="gnat_2016 +gnat_2017 +shared static-libs static-pic"
 
-RDEPEND="dev-lang/gnat-gpl:6.3.0"
+RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
+	gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )"
 DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2017]"
-REQUIRED_USE="!gnat_2016 gnat_2017"
+	dev-ada/gprbuild[gnat_2016=,gnat_2017=]"
+REQUIRED_USE="^^ ( gnat_2016 gnat_2017 )"
 
 S="${WORKDIR}"/${MYP}-src
 
@@ -32,16 +33,15 @@ src_compile() {
 	else
 		GCC_PV=6.3.0
 	fi
-	GCC=${CHOST}-gcc-${GCC_PV}
 	GNATMAKE=${CHOST}-gnatmake-${GCC_PV}
 	emake GNATMAKE="${GNATMAKE} ${ADAFLAGS}" \
 		BUILDER="gprbuild -j$(makeopts_jobs)" generate_sources
 	if use static-libs; then
-		emake CC="${GCC}" BUILDER="gprbuild -v -j$(makeopts_jobs)" build-static
+		emake BUILDER="gprbuild -v -j$(makeopts_jobs)" build-static
 	fi
 	for kind in shared static-pic; do
 		if use ${kind}; then
-			emake CC="${GCC}" BUILDER="gprbuild -v -j$(makeopts_jobs)" \
+			emake BUILDER="gprbuild -v -j$(makeopts_jobs)" \
 				build-${kind}
 		fi
 	done
diff --git a/dev-ada/gnat_util/gnat_util-2018.ebuild b/dev-ada/gnat_util/gnat_util-2018.ebuild
index a60bab1f3254..c7b5206b2a5d 100644
--- a/dev-ada/gnat_util/gnat_util-2018.ebuild
+++ b/dev-ada/gnat_util/gnat_util-2018.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a6b
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gnat_2016 gnat_2017 +gnat_2018 +shared static-libs static-pic"
 
 RDEPEND="dev-lang/gnat-gpl:7.3.1"
@@ -28,16 +28,15 @@ PATCHES=( "${FILESDIR}"/${PN}-2017-gentoo.patch )
 
 src_compile() {
 	GCC_PV=7.3.1
-	GCC=${CHOST}-gcc-${GCC_PV}
 	GNATMAKE=${CHOST}-gnatmake-${GCC_PV}
 	emake GNATMAKE="${GNATMAKE} ${ADAFLAGS}" \
 		BUILDER="gprbuild -j$(makeopts_jobs)" generate_sources
 	if use static-libs; then
-		emake CC="${GCC}" BUILDER="gprbuild -v -j$(makeopts_jobs)" build-static
+		emake BUILDER="gprbuild -v -j$(makeopts_jobs)" build-static
 	fi
 	for kind in shared static-pic; do
 		if use ${kind}; then
-			emake CC="${GCC}" BUILDER="gprbuild -v -j$(makeopts_jobs)" \
+			emake BUILDER="gprbuild -v -j$(makeopts_jobs)" \
 				build-${kind}
 		fi
 	done