[gentoo-commits] repo/gentoo:master commit in: dev-ada/asis/, dev-ada/asis/files/

[Alfredo Tupone]

commit:     ca4d16a923b0e69d5561ca68673bb8ac7da47452
Author:     Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  1 19:55:30 2017 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sat Jul  1 19:55:30 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca4d16a9

dev-ada/asis: Add version 2017

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 dev-ada/asis/Manifest                              |  1 +
 dev-ada/asis/asis-2016.ebuild                      | 16 ++++---
 .../asis/{asis-2016.ebuild => asis-2017.ebuild}    | 18 ++++----
 dev-ada/asis/files/asis-2017-gentoo.patch          | 50 ++++++++++++++++++++++
 dev-ada/asis/metadata.xml                          | 11 +++++
 5 files changed, 81 insertions(+), 15 deletions(-)

diff --git a/dev-ada/asis/Manifest b/dev-ada/asis/Manifest
index 8e8a0b3e131..1b08d9e8d1a 100644
--- a/dev-ada/asis/Manifest
+++ b/dev-ada/asis/Manifest
@@ -1 +1,2 @@
 DIST asis-gpl-2016-src.tar.gz 5240554 SHA256 3e36e0835e291dafe6dd2246748ed12b449d33044c32209d3af012c83064c38e SHA512 439195d4cb5d58328dcc8c815cb6a32c5f8ed1d6581246dfa5dcca7c212ffad38dd63df25e490c4ac628eaf8c8e6d286f8ea036b7f39499704565b60c1bba8ee WHIRLPOOL 12ded099fdf510be75d67795f990b0044ba701595c4a2c858c46cc5dc97d5c380bd9d51c654a18183a77f9cbc1a9bb7a5dea344da471e6a136154da9d7cb558d
+DIST asis-gpl-2017-src.tar.gz 5909758 SHA256 ca84ab53418930e79c54566b2377253d5d557e5a2d6e9d2be00aef0c1d921627 SHA512 dee6b8e0851a4b3181d50256697865f7a6a613eef7b59e43cb1a0b066e794d927db9f60df33f7e1af343d41801a6b66feb1f7a963523b2442c85ca506d7e112f WHIRLPOOL 5c179e1b4682fee465e4ac3a32afcd97fd7e88f32488a1f9ad45dadfe14ed5bedd662bae0c8728e9e812adff1ff5d66814f9edc34420b6b81d6de4ec1468e73d

diff --git a/dev-ada/asis/asis-2016.ebuild b/dev-ada/asis/asis-2016.ebuild
index cc5d008b083..68c09bcff36 100644
--- a/dev-ada/asis/asis-2016.ebuild
+++ b/dev-ada/asis/asis-2016.ebuild
@@ -14,14 +14,16 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/57399029c7a447658e0aff71
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="dev-ada/gnat_util
-	dev-ada/gnatcoll[projects,shared]
-	dev-ada/gprbuild
-	dev-ada/xmlada
-	dev-lang/gnat-gpl"
+IUSE="gnat_2016 gnat_2017"
+
+DEPEND="dev-ada/gnat_util[gnat_2016=,gnat_2017=]
+	dev-ada/gnatcoll[gnat_2016=,gnat_2017=,projects,shared]
+	dev-ada/gprbuild[gnat_2016=,gnat_2017=]
+	dev-ada/xmlada[gnat_2016=,gnat_2017=]
+	gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
+	gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )"
 RDEPEND="${RDEPEND}"
+REQUIRED_USE="^^ ( gnat_2016 gnat_2017 )"
 
 S="${WORKDIR}"/${MYP}
 

diff --git a/dev-ada/asis/asis-2016.ebuild b/dev-ada/asis/asis-2017.ebuild
similarity index 59%
copy from dev-ada/asis/asis-2016.ebuild
copy to dev-ada/asis/asis-2017.ebuild
index cc5d008b083..eea7c448a3f 100644
--- a/dev-ada/asis/asis-2016.ebuild
+++ b/dev-ada/asis/asis-2017.ebuild
@@ -8,20 +8,22 @@ MYP=${PN}-gpl-${PV}-src
 
 DESCRIPTION="To develop tools for Ada software"
 HOMEPAGE="http://libre.adacore.com/"
-SRC_URI="http://mirrors.cdn.adacore.com/art/57399029c7a447658e0aff71
+SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deecffb
 	-> ${MYP}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="dev-ada/gnat_util
-	dev-ada/gnatcoll[projects,shared]
-	dev-ada/gprbuild
-	dev-ada/xmlada
-	dev-lang/gnat-gpl"
+IUSE="gnat_2016 gnat_2017"
+
+DEPEND="dev-ada/gnat_util[gnat_2016=,gnat_2017=]
+	dev-ada/gnatcoll[gnat_2016=,gnat_2017=,projects,shared]
+	dev-ada/gprbuild[gnat_2016=,gnat_2017=]
+	dev-ada/xmlada[gnat_2016=,gnat_2017=]
+	gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
+	gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )"
 RDEPEND="${RDEPEND}"
+REQUIRED_USE="^^ ( gnat_2016 gnat_2017 )"
 
 S="${WORKDIR}"/${MYP}
 

diff --git a/dev-ada/asis/files/asis-2017-gentoo.patch b/dev-ada/asis/files/asis-2017-gentoo.patch
new file mode 100644
index 00000000000..3c3ab73618f
--- /dev/null
+++ b/dev-ada/asis/files/asis-2017-gentoo.patch
@@ -0,0 +1,50 @@
+--- asis-gpl-2015-src/Makefile.old	2017-01-03 13:59:38.106788092 +0000
++++ asis-gpl-2015-src/Makefile	2017-01-03 14:01:43.735605615 +0000
+@@ -10,18 +10,21 @@
+ 
+ .PHONY: all
+ all: setup-snames
+-	$(GPRBUILD) -p -j0 -XBLD=$(BLD) -XOPSYS=$(OPSYS) -XGNSA=$(GNSA) \
+-		$(GPRBUILD_FLAGS) -XASIS_COMPONENTS=$(COMPS) build_asis.gpr
++	$(GPRBUILD) -p -j$(PROCESSORS) -XBLD=$(BLD) -XOPSYS=$(OPSYS) -XGNSA=$(GNSA) \
++		$(GPRBUILD_FLAGS) -XASIS_COMPONENTS=$(COMPS) build_asis.gpr \
++		-cargs $(ADAFLAGS)
+ 
+ .PHONY: tools
+ tools: setup
+-	$(GPRBUILD) -p -j0 -XBLD=$(BLD) -XOPSYS=$(OPSYS) \
+-		$(GPRBUILD_FLAGS) -XASIS_COMPONENTS=tools build_asis.gpr
++	$(GPRBUILD) -p -j$(PROCESSORS) -XBLD=$(BLD) -XOPSYS=$(OPSYS) \
++		$(GPRBUILD_FLAGS) -XASIS_COMPONENTS=tools build_asis.gpr \
++		-cargs $(ADAFLAGS)
+ 
+ .PHONY: toolsdev
+ toolsdev: setup
+-	$(GPRBUILD) -p -j0 -XBLD=$(BLD) -XOPSYS=$(OPSYS) \
+-		$(GPRBUILD_FLAGS) -XASIS_COMPONENTS=toolsdev build_asis.gpr
++	$(GPRBUILD) -p -j$(PROCESSORS) -XBLD=$(BLD) -XOPSYS=$(OPSYS) \
++		$(GPRBUILD_FLAGS) -XASIS_COMPONENTS=toolsdev build_asis.gpr \
++		-cargs $(ADAFLAGS)
+ 
+ # The setup target re-generates 4 generated Ada files. We avoid changing the
+ # timestamps of unchanged files, to avoid triggering recompilation of
+@@ -34,7 +37,8 @@
+ 
+ .PHONY: setup-snames
+ setup-snames: gnat/snames.ads-tmpl gnat/snames.adb-tmpl gnat/xutil.ads gnat/xutil.adb
+-	$(GPRBUILD) -p  -XBLD=$(BLD) $(GPRBUILD_FLAGS) gnat/snames.gpr
++	$(GPRBUILD) -p  -XBLD=$(BLD) $(GPRBUILD_FLAGS) gnat/snames.gpr \
++		-cargs $(ADAFLAGS)
+ 	cd gnat ; ./xsnamest$(exe_ext)
+ 	if cmp --quiet gnat/snames.ns gnat/snames.ads; then \
+ 	  echo "snames.ads unchanged"; \
+@@ -52,7 +56,8 @@
+ .PHONY: setup-factory
+ setup-factory:
+ 	$(GPRBUILD) -p  -XBLD=$(BLD) $(GPRBUILD_FLAGS) \
+-		tools/tool_utils/generate_factory.gpr
++		tools/tool_utils/generate_factory.gpr \
++		-cargs $(ADAFLAGS)
+ 	cd tools/tool_utils ; \
+ 		./ada_trees-generate_factory$(exe_ext)
+ 	if cmp --quiet tools/tool_utils/ada_trees-factory.ns tools/tool_utils/ada_trees-factory.ads; then \

diff --git a/dev-ada/asis/metadata.xml b/dev-ada/asis/metadata.xml
index d0e866f244f..f4734803a24 100644
--- a/dev-ada/asis/metadata.xml
+++ b/dev-ada/asis/metadata.xml
@@ -5,4 +5,15 @@
 		<email>tupone@g.o</email>
 		<name>Tupone Alfredo</name>
 	</maintainer>
+	<use>
+		<flag name="gnat_2016">Compile with dev-lang/gnat-gpl-2016</flag>
+		<flag name="gnat_2017">Compile with dev-lang/gnat-gpl-2017</flag>
+
+	</use>
+	<longdescription lang="en">
+		ASIS is a library that gives applications access to the complete
+		syntactic and semantic structure of an Ada compilation unit. This
+		library is typically used by tools that need to perform some sort of
+		static analysis on an Ada program.
+	</longdescription>
 </pkgmetadata>