diff options
| -rw-r--r-- | dev-ada/aws/aws-2016.ebuild | 4 | ||||
| -rw-r--r-- | dev-ada/aws/aws-2017.ebuild | 4 | ||||
| -rw-r--r-- | dev-ada/libgpr/libgpr-2017.ebuild | 4 | ||||
| -rw-r--r-- | dev-ada/xmlada/metadata.xml | 1 | ||||
| -rw-r--r-- | dev-ada/xmlada/xmlada-2017.ebuild | 33 |
5 files changed, 25 insertions, 21 deletions
diff --git a/dev-ada/aws/aws-2016.ebuild b/dev-ada/aws/aws-2016.ebuild index e0d114382774..61bfe3b8ff8c 100644 --- a/dev-ada/aws/aws-2016.ebuild +++ b/dev-ada/aws/aws-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 @@ -16,7 +16,7 @@ SLOT="0" KEYWORDS="~amd64" IUSE="+gnat_2016 gnat_2017" -RDEPEND="dev-ada/xmlada[gnat_2016=,gnat_2017=,static]" +RDEPEND="dev-ada/xmlada[gnat_2016=,gnat_2017=,static-libs]" DEPEND="${RDEPEND} dev-ada/gnat_util[gnat_2016=,gnat_2017=,static] dev-ada/asis[gnat_2016=,gnat_2017=] diff --git a/dev-ada/aws/aws-2017.ebuild b/dev-ada/aws/aws-2017.ebuild index 919248e920a4..ddae3fbd89b2 100644 --- a/dev-ada/aws/aws-2017.ebuild +++ b/dev-ada/aws/aws-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 @@ -17,7 +17,7 @@ SLOT="0" KEYWORDS="~amd64" IUSE="gnat_2016 +gnat_2017" -RDEPEND="dev-ada/xmlada[gnat_2016=,gnat_2017=,static]" +RDEPEND="dev-ada/xmlada[gnat_2016=,gnat_2017=,static-libs]" DEPEND="${RDEPEND} dev-ada/gnat_util[gnat_2016=,gnat_2017=,static] dev-ada/asis[gnat_2016=,gnat_2017=] diff --git a/dev-ada/libgpr/libgpr-2017.ebuild b/dev-ada/libgpr/libgpr-2017.ebuild index 333c21736a07..1c5295b68c91 100644 --- a/dev-ada/libgpr/libgpr-2017.ebuild +++ b/dev-ada/libgpr/libgpr-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 @@ -17,7 +17,7 @@ SLOT="0" KEYWORDS="~amd64" IUSE="gnat_2016 +gnat_2017 +shared static static-pic" -RDEPEND="dev-ada/xmlada[static,gnat_2016=,gnat_2017=] +RDEPEND="dev-ada/xmlada[static-libs,gnat_2016=,gnat_2017=] gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )" DEPEND="${RDEPEND} 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 |