diff options
| author |   Tupone Alfredo <tupone@gentoo.org> | 2018-02-12 20:21:04 +0100 |
|---|---|---|
| committer | Tupone Alfredo <tupone@gentoo.org> | 2018-02-12 20:21:04 +0100 |
| commit | 704ae110cfdc52c3730a337e4518508eb42825a5 (patch) | |
| tree | 92601763f88bc7f7abbcb5d0e2c2d72d5a53373d /dev-ada | |
| parent | net-firewall/gshield: Drop netmon maintainership. (diff) | |
| download | gentoo-704ae110cfdc52c3730a337e4518508eb42825a5.tar.gz gentoo-704ae110cfdc52c3730a337e4518508eb42825a5.tar.bz2 gentoo-704ae110cfdc52c3730a337e4518508eb42825a5.zip | |
dev-ada/gnatcoll: use static -> static-libs
Package-Manager: Portage-2.3.19, Repoman-2.3.6
Diffstat (limited to 'dev-ada')
| -rw-r--r-- | dev-ada/gnatcoll/gnatcoll-2016.ebuild | 12 | ||||
| -rw-r--r-- | dev-ada/gnatcoll/gnatcoll-2017.ebuild | 12 | ||||
| -rw-r--r-- | dev-ada/gnatcoll/metadata.xml | 1 |
3 files changed, 10 insertions, 15 deletions
diff --git a/dev-ada/gnatcoll/gnatcoll-2016.ebuild b/dev-ada/gnatcoll/gnatcoll-2016.ebuild index 6158847c2fdf..0ccb4224f75c 100644 --- a/dev-ada/gnatcoll/gnatcoll-2016.ebuild +++ b/dev-ada/gnatcoll/gnatcoll-2016.ebuild @@ -16,15 +16,14 @@ LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64" IUSE="gmp +gnat_2016 gnat_2017 gtk iconv postgres pygobject projects readline - +shared sqlite static syslog tools" + +shared sqlite static-libs syslog tools" RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ${PYTHON_DEPS} gmp? ( dev-libs/gmp:* ) gtk? ( - dev-ada/gtkada[gnat_2016=,gnat_2017=,shared?] - static? ( dev-ada/gtkada[static-libs] ) + dev-ada/gtkada[gnat_2016=,gnat_2017=,shared?,static-libs?] dev-libs/atk dev-libs/glib x11-libs/cairo @@ -36,8 +35,7 @@ RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite ) projects? ( - =dev-ada/libgpr-2016[gnat_2016=,gnat_2017=,shared?] - static? ( dev-ada/libgpr[static-libs] ) + =dev-ada/libgpr-2016[gnat_2016=,gnat_2017=,shared?,static-libs?] )" DEPEND="${RDEPEND} dev-ada/gprbuild[gnat_2016=,gnat_2017=]" @@ -99,7 +97,7 @@ src_compile() { emake PROCESSORS=$(makeopts_jobs) GPRBUILD_OPTIONS=-v GCC=${GCC} \ build_library_type/relocatable fi - if use static; then + if use static-libs; then emake PROCESSORS=$(makeopts_jobs) GPRBUILD_OPTIONS=-v GCC=${GCC} \ build_library_type/static fi @@ -110,7 +108,7 @@ src_install() { if use shared; then emake prefix="${D}usr" install_library_type/relocatable fi - if use static; then + if use static-libs; then emake prefix="${D}usr" install_library_type/static fi emake prefix="${D}usr" install_gps_plugin diff --git a/dev-ada/gnatcoll/gnatcoll-2017.ebuild b/dev-ada/gnatcoll/gnatcoll-2017.ebuild index a788f5e58a0c..f67e1a2f877e 100644 --- a/dev-ada/gnatcoll/gnatcoll-2017.ebuild +++ b/dev-ada/gnatcoll/gnatcoll-2017.ebuild @@ -16,14 +16,13 @@ LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64" IUSE="gmp gnat_2016 +gnat_2017 gtk iconv postgres pygobject projects readline - +shared sqlite static syslog tools" + +shared sqlite static-libs syslog tools" RDEPEND="dev-lang/gnat-gpl:6.3.0 ${PYTHON_DEPS} gmp? ( dev-libs/gmp:* ) gtk? ( - dev-ada/gtkada[gnat_2017,shared?] - static? ( dev-ada/gtkada[static-libs] ) + dev-ada/gtkada[gnat_2017,shared?,static-libs?] dev-libs/atk dev-libs/glib x11-libs/cairo @@ -35,8 +34,7 @@ RDEPEND="dev-lang/gnat-gpl:6.3.0 postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite ) projects? ( - >=dev-ada/libgpr-2017[gnat_2017,shared?] - static? ( dev-ada/libgpr[static-libs] ) + >=dev-ada/libgpr-2017[gnat_2017,shared?,static-libs?] )" DEPEND="${RDEPEND} dev-ada/gprbuild[gnat_2017]" @@ -99,7 +97,7 @@ src_compile() { emake PROCESSORS=$(makeopts_jobs) GPRBUILD_OPTIONS=-v GCC=${GCC} \ build_library_type/relocatable fi - if use static; then + if use static-libs; then emake PROCESSORS=$(makeopts_jobs) GPRBUILD_OPTIONS=-v GCC=${GCC} \ build_library_type/static fi @@ -114,7 +112,7 @@ src_install() { if use shared; then emake prefix="${D}usr" install_library_type/relocatable fi - if use static; then + if use static-libs; then emake prefix="${D}usr" install_library_type/static fi if use tools; then diff --git a/dev-ada/gnatcoll/metadata.xml b/dev-ada/gnatcoll/metadata.xml index 5bc4030a3e0e..df4d11fa0b3a 100644 --- a/dev-ada/gnatcoll/metadata.xml +++ b/dev-ada/gnatcoll/metadata.xml @@ -11,7 +11,6 @@ <flag name="projects">Adds support for projects</flag> <flag name="pygobject">Adds support for pygobject</flag> <flag name="shared">Build shared library</flag> - <flag name="static">Build static library</flag> <flag name="tools">Build associated tools</flag> </use> <longdescription lang="en"> |