From 38b7258d086dd5e263c3bbe3880c8c956676bc71 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Fri, 26 Jan 2018 15:48:02 +0000
Subject: gentoo resync : 25.01.2018

---
 dev-ada/xmlada/Manifest           |  4 ++--
 dev-ada/xmlada/metadata.xml       |  1 -
 dev-ada/xmlada/xmlada-2017.ebuild | 33 +++++++++++++++++++--------------
 3 files changed, 21 insertions(+), 17 deletions(-)

(limited to 'dev-ada/xmlada')

diff --git a/dev-ada/xmlada/Manifest b/dev-ada/xmlada/Manifest
index 1dd5088f0fea..acc35af7804c 100644
--- a/dev-ada/xmlada/Manifest
+++ b/dev-ada/xmlada/Manifest
@@ -1,4 +1,4 @@
 AUX xmlada-2017-gentoo.patch 1133 BLAKE2B 6b15f8225c8d4094417f20b61261fc247a4c9290831265b15cf1a3f865d532c6e685cebf5c8cf635fc51ae0a44386428ee8b9300738a5fe0c2951e4a68cb7bb8 SHA512 47d383b18c6c46653c5369b691af47d8b7ea333d32d7ddcc5cb6831dea08dbfeec353ffa0e4de279baff4fedf911c39e28a6608529357ad70b9c1ce0a9a42b49
 DIST xmlada-gpl-2017-src.tar.gz 1578393 BLAKE2B 7b4894040b6044e86c96cbd530ebda5c0cfc4ad0e2b472d46798a93f535aca0916b03385a3aef49bd4e59d508a9665c856360e9cab0a4f67b15091228b629d81 SHA512 371f6adc01550a4bb13204ec0404dc1165438db595f4346813e5a23a155de74c857c40c55adde173919c2fe35b3b91d78b235c9718ee86bc848e62ddfd7fa2b4
-EBUILD xmlada-2017.ebuild 2005 BLAKE2B ef14d181496c26de1ebe71cf496830ea75015c816ee6b28fcb8d60c40cb8c8cc78ba6ae446f79ab8ff16abb47801ce4830142af0b603f53e0fd365161c0e9d99 SHA512 81a6efd7a7959958f496e8d3e5a73bdcce62c995f2bdbeb11d6b95c424421317492feb6f028355336e991052366074e609550184882da73bc98b4d812cf69ff4
-MISC metadata.xml 1125 BLAKE2B 83c42db46eee7113a19c4cabb92e2f2b4607609e3ee4b624a5cf680c9a5d0b8394f31f9f99b973cd563b04a268aaab2f74f4bc2c1209179235f9f4814363087d SHA512 ab8a13a6e09513797895a7966adf026a21aa5f738853b039ec15d7091e32a8dd747c1c179ef92a24f2eb83f0a381c819f891bf35e6b4a90e1085aced8606f14d
+EBUILD xmlada-2017.ebuild 2117 BLAKE2B 663d3c4733de28834c2d88a4bab9e0ce2ae481c2413cbf20c434b7da3cfc54ab5353bd04e59f4db64c6e74bb4370355817857b090e82445406727a13d746abb2 SHA512 5ae386913ad0a71d7b69768ef566d831ba2e8a432eebbcc3138c91133fb408e7c5b9167671d4244967a38e3e4c28e4fea04bf88a48fab74eea785cba6afc61e7
+MISC metadata.xml 1075 BLAKE2B f22c55f2e3e81e0284911b281ae3db216682681bada1b3fe2756bf1e3ef85ebf82dfbbfc302657da1914078c56197f179d9f2d0dfe74bd6e61206057543950d2 SHA512 8a290180597185d3f42ecbb09d4d18512a88ffccbc413e5346bf310ab340d927f90db35c574de1eebb87431c8892a04cf96d731a9ab20846a2343ada24e40797
diff --git a/dev-ada/xmlada/metadata.xml b/dev-ada/xmlada/metadata.xml
index 6a0e93a661fe..a31a912b0055 100644
--- a/dev-ada/xmlada/metadata.xml
+++ b/dev-ada/xmlada/metadata.xml
@@ -9,7 +9,6 @@
 		<flag name="gnat_2016">Compile with dev-lang/gnat-gpl-2016</flag>
 		<flag name="gnat_2017">Compile with dev-lang/gnat-gpl-2017</flag>
 		<flag name="shared">Build shared library</flag>
-		<flag name="static">Build static library</flag>
 		<flag name="static-pic">Build static library with pic code</flag>
 	</use>
 	<longdescription lang="en">
diff --git a/dev-ada/xmlada/xmlada-2017.ebuild b/dev-ada/xmlada/xmlada-2017.ebuild
index 04b53bcdf500..c13e8f5859ba 100644
--- a/dev-ada/xmlada/xmlada-2017.ebuild
+++ b/dev-ada/xmlada/xmlada-2017.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,8 +15,8 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/591aeb88c7a4473fcbb154f8 ->
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="gnat_2016 +gnat_2017 +shared static static-pic"
-REQUIRED_USE="|| ( shared static static-pic )
+IUSE="gnat_2016 +gnat_2017 +shared static-libs static-pic"
+REQUIRED_USE="|| ( shared static-libs static-pic )
 	^^ ( gnat_2016 gnat_2017 )"
 
 RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
@@ -41,11 +41,12 @@ src_compile () {
 	if use shared; then
 		build relocatable
 	fi
-	for kind in static static-pic; do
-		if use ${kind}; then
-			build ${kind}
-		fi
-	done
+	if use static-libs; then
+		build static
+	fi
+	if use static-pic; then
+		build static-pic
+	fi
 }
 
 src_test() {
@@ -64,7 +65,10 @@ src_install () {
 		done
 	}
 
-	for kind in shared static static-pic; do
+	if use static-libs; then
+		emake PROCESSORS=$(makeopts_jobs) install-static
+	fi
+	for kind in shared static-pic; do
 		if use ${kind}; then
 			emake PROCESSORS=$(makeopts_jobs) install-${kind}
 		fi
@@ -75,11 +79,12 @@ src_install () {
 		if use shared; then
 			fix_install ${dir} relocatable
 		fi
-		for kind in static static-pic; do
-			if use ${kind}; then
-				fix_install ${dir} ${kind}
-			fi
-		done
+		if use static-libs; then
+			fix_install ${dir} static
+		fi
+		if use static-pic; then
+			fix_install ${dir} static-pic
+		fi
 	done
 	einstalldocs
 	dodoc xmlada-roadmap.txt
-- 
cgit v1.2.3