dev-ada/gnat_util: use static -> static-libs

Package-Manager: Portage-2.3.19, Repoman-2.3.6

diff --git a/dev-ada/gnat_util/gnat_util-2016.ebuild b/dev-ada/gnat_util/gnat_util-2016.ebuild
index 2fc260b394acc0425da9c3937895c2c2f40ff3c1..4cc279585ec7786e2a703e599ca3c95d91813c24 100644 (file)
--- a/dev-ada/gnat_util/gnat_util-2016.ebuild
+++ b/dev-ada/gnat_util/gnat_util-2016.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,7 +15,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/57399637c7a447658e0affa6
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="+gnat_2016 gnat_2017 +shared static static-pic"
+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 )"
@@ -37,7 +37,10 @@ src_compile() {
        GNATMAKE=${CHOST}-gnatmake-${GCC_PV}
        emake GNATMAKE="${GNATMAKE} ${ADAFLAGS}" \
                BUILDER="gprbuild -j$(makeopts_jobs)" generate_sources
-       for kind in shared static static-pic; do
+       if use ${kind}; 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}
@@ -46,7 +49,10 @@ src_compile() {
 }
 
 src_install() {
-       for kind in shared static static-pic; do
+       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

diff --git a/dev-ada/gnat_util/gnat_util-2017.ebuild b/dev-ada/gnat_util/gnat_util-2017.ebuild
index 6116171b45ceda47995bc8b8ab60dda0544b21c3..88db63ccf09d70081f6bb595dbca6bfc336845df 100644 (file)
--- a/dev-ada/gnat_util/gnat_util-2017.ebuild
+++ b/dev-ada/gnat_util/gnat_util-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,7 +15,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed037
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="gnat_2016 +gnat_2017 +shared static static-pic"
+IUSE="gnat_2016 +gnat_2017 +shared static-libs static-pic"
 
 RDEPEND="dev-lang/gnat-gpl:6.3.0"
 DEPEND="${RDEPEND}
@@ -36,7 +36,10 @@ src_compile() {
        GNATMAKE=${CHOST}-gnatmake-${GCC_PV}
        emake GNATMAKE="${GNATMAKE} ${ADAFLAGS}" \
                BUILDER="gprbuild -j$(makeopts_jobs)" generate_sources
-       for kind in shared static static-pic; do
+       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}
@@ -45,7 +48,10 @@ src_compile() {
 }
 
 src_install() {
-       for kind in shared static static-pic; do
+       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

diff --git a/dev-ada/gnat_util/metadata.xml b/dev-ada/gnat_util/metadata.xml
index 22a3c1f31fe6cbf4b105fdff3fffe1615c7edcfd..031651ccbbdc6e2ddb65291d7c84a1c39482d071 100644 (file)
--- a/dev-ada/gnat_util/metadata.xml
+++ b/dev-ada/gnat_util/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 gnat_util shared library</flag>
-               <flag name="static">Build gnat_util static library</flag>
                <flag name="static-pic">Build gnat_util static library with pic code</flag>
        </use>
        <longdescription lang="en">