[gentoo-commits] repo/gentoo:master commit in: dev-ada/xmlada/

["Alfredo Tupone" <tupone@gentoo.org>]

commit:     e777ddb38ca92798c46604279846e3bdd8a0e6ad
Author:     Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 18 18:41:40 2017 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sun Jun 18 18:41:40 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e777ddb3

dev-ada/xmlada: Add version 2017

Package-Manager: Portage-2.3.5, Repoman-2.3.1

 dev-ada/xmlada/Manifest                            |  1 +
 dev-ada/xmlada/xmlada-2016.ebuild                  |  2 +-
 .../{xmlada-2016.ebuild => xmlada-2017.ebuild}     | 23 +++++++++++++---------
 dev-ada/xmlada/xmlada-9999.ebuild                  |  2 +-
 4 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/dev-ada/xmlada/Manifest b/dev-ada/xmlada/Manifest
index 63b4b662dc0..65baa5fd4c7 100644
--- a/dev-ada/xmlada/Manifest
+++ b/dev-ada/xmlada/Manifest
@@ -1 +1,2 @@
 DIST xmlada-gpl-2016-src.tar.gz 1440671 SHA256 ea64d8da2c5fb01a257fc5bf474b8d4ec40b01dc15b320b9fe260ff2db668ba4 SHA512 d1d7c3d91731394235aed4b80c91b1babe30d5f184282fae8087ee556318475e3923ed628b805693fc89a4d9bb219b0fb0937bc5024a742226da0245d36ed652 WHIRLPOOL b6ebb927d801394ad0b62d9538142c420ab33627582059466d4f64b12c3a45b1b5b489019aef715a59101370220a78507fe03d97c9e67233dfcc4f3aad1f16d7
+DIST xmlada-gpl-2017-src.tar.gz 1578393 SHA256 9b103157eb3ecd697b597ad4e60f56f39028bc2d6ea513d2dce8a3b0e65ac54b SHA512 371f6adc01550a4bb13204ec0404dc1165438db595f4346813e5a23a155de74c857c40c55adde173919c2fe35b3b91d78b235c9718ee86bc848e62ddfd7fa2b4 WHIRLPOOL 4b2da3fb799f8def6eb6383a9483258340368cc80e96e8ffab207c3c8849c1279a80cf68ca47c8a20ce91c084041bdfa95128a14321454055534d804272ef4dd

diff --git a/dev-ada/xmlada/xmlada-2016.ebuild b/dev-ada/xmlada/xmlada-2016.ebuild
index 793f92040c8..e686d810507 100644
--- a/dev-ada/xmlada/xmlada-2016.ebuild
+++ b/dev-ada/xmlada/xmlada-2016.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="~amd64"
 IUSE="+shared static static-pic"
 REQUIRED_USE="|| ( shared static static-pic )"
 
-RDEPEND="dev-lang/gnat-gpl"
+RDEPEND="dev-lang/gnat-gpl:="
 DEPEND="${RDEPEND}
 	dev-ada/gprbuild"
 

diff --git a/dev-ada/xmlada/xmlada-2016.ebuild b/dev-ada/xmlada/xmlada-2017.ebuild
similarity index 56%
copy from dev-ada/xmlada/xmlada-2016.ebuild
copy to dev-ada/xmlada/xmlada-2017.ebuild
index 793f92040c8..d2d897d203e 100644
--- a/dev-ada/xmlada/xmlada-2016.ebuild
+++ b/dev-ada/xmlada/xmlada-2017.ebuild
@@ -9,7 +9,8 @@ MYP=${PN}-gpl-${PV}
 
 DESCRIPTION="Set of modules that provide a simple manipulation of XML streams"
 HOMEPAGE="http://libre.adacore.com/"
-SRC_URI="http://mirrors.cdn.adacore.com/art/57399978c7a447658e0affc0 -> ${MYP}-src.tar.gz"
+SRC_URI="http://mirrors.cdn.adacore.com/art/591aeb88c7a4473fcbb154f8 ->
+	${MYP}-src.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -17,22 +18,27 @@ KEYWORDS="~amd64"
 IUSE="+shared static static-pic"
 REQUIRED_USE="|| ( shared static static-pic )"
 
-RDEPEND="dev-lang/gnat-gpl"
+RDEPEND="dev-lang/gnat-gpl:="
 DEPEND="${RDEPEND}
 	dev-ada/gprbuild"
 
 S="${WORKDIR}"/${MYP}-src
 
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
 src_configure () {
 	econf --prefix="${D}"/usr
 }
 
 src_compile () {
-	for kind in shared static static-pic; do
+	if use shared; then
+		gprbuild -j$(makeopts_jobs) -m -p -v -XLIBRARY_TYPE=relocatable \
+			-XBUILD=Production -XPROCESSORS=$(makeopts_jobs) xmlada.gpr \
+			-cargs ${ADAFLAGS}
+	fi
+	for kind in static static-pic; do
 		if use ${kind}; then
-			emake PROCESSORS=$(makeopts_jobs) ${kind}
+			gprbuild -j$(makeopts_jobs) -m -p -v -XLIBRARY_TYPE=${kind} \
+				-XBUILD=Production -XPROCESSORS=$(makeopts_jobs) xmlada.gpr \
+				-cargs ${ADAFLAGS}
 		fi
 	done
 }
@@ -40,11 +46,10 @@ src_compile () {
 src_install () {
 	for kind in shared static static-pic; do
 		if use ${kind}; then
-			emake PROCESSORS=$(makeopts_jobs) DESTDIR="${D}" install-${kind}
+			emake PROCESSORS=$(makeopts_jobs) install-${kind}
 		fi
 	done
 	einstalldocs
-	dodoc features-* known-problems-* xmlada-roadmap.txt
+	dodoc xmlada-roadmap.txt
 	rm "${D}"/usr/share/doc/${PN}/.buildinfo || die
-	mv "${D}"/usr/share/doc/${PN} "${D}"/usr/share/doc/${PF}/html || die
 }

diff --git a/dev-ada/xmlada/xmlada-9999.ebuild b/dev-ada/xmlada/xmlada-9999.ebuild
index 5c1f5b3d25b..f5ea599e78f 100644
--- a/dev-ada/xmlada/xmlada-9999.ebuild
+++ b/dev-ada/xmlada/xmlada-9999.ebuild
@@ -18,7 +18,7 @@ KEYWORDS=""
 IUSE="+shared static static-pic"
 REQUIRED_USE="|| ( shared static static-pic )"
 
-RDEPEND="dev-lang/gnat-gpl"
+RDEPEND="dev-lang/gnat-gpl:="
 DEPEND="${RDEPEND}
 	dev-ada/gprbuild"