| 1 |
commit: 704ae110cfdc52c3730a337e4518508eb42825a5 |
| 2 |
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Feb 12 19:21:04 2018 +0000 |
| 4 |
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Feb 12 19:21:04 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=704ae110 |
| 7 |
|
| 8 |
dev-ada/gnatcoll: use static -> static-libs |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
| 11 |
|
| 12 |
dev-ada/gnatcoll/gnatcoll-2016.ebuild | 12 +++++------- |
| 13 |
dev-ada/gnatcoll/gnatcoll-2017.ebuild | 12 +++++------- |
| 14 |
dev-ada/gnatcoll/metadata.xml | 1 - |
| 15 |
3 files changed, 10 insertions(+), 15 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-ada/gnatcoll/gnatcoll-2016.ebuild b/dev-ada/gnatcoll/gnatcoll-2016.ebuild |
| 18 |
index 6158847c2fd..0ccb4224f75 100644 |
| 19 |
--- a/dev-ada/gnatcoll/gnatcoll-2016.ebuild |
| 20 |
+++ b/dev-ada/gnatcoll/gnatcoll-2016.ebuild |
| 21 |
@@ -16,15 +16,14 @@ LICENSE="GPL-3" |
| 22 |
SLOT="0" |
| 23 |
KEYWORDS="~amd64" |
| 24 |
IUSE="gmp +gnat_2016 gnat_2017 gtk iconv postgres pygobject projects readline |
| 25 |
- +shared sqlite static syslog tools" |
| 26 |
+ +shared sqlite static-libs syslog tools" |
| 27 |
|
| 28 |
RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) |
| 29 |
gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) |
| 30 |
${PYTHON_DEPS} |
| 31 |
gmp? ( dev-libs/gmp:* ) |
| 32 |
gtk? ( |
| 33 |
- dev-ada/gtkada[gnat_2016=,gnat_2017=,shared?] |
| 34 |
- static? ( dev-ada/gtkada[static-libs] ) |
| 35 |
+ dev-ada/gtkada[gnat_2016=,gnat_2017=,shared?,static-libs?] |
| 36 |
dev-libs/atk |
| 37 |
dev-libs/glib |
| 38 |
x11-libs/cairo |
| 39 |
@@ -36,8 +35,7 @@ RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) |
| 40 |
postgres? ( dev-db/postgresql:* ) |
| 41 |
sqlite? ( dev-db/sqlite ) |
| 42 |
projects? ( |
| 43 |
- =dev-ada/libgpr-2016[gnat_2016=,gnat_2017=,shared?] |
| 44 |
- static? ( dev-ada/libgpr[static-libs] ) |
| 45 |
+ =dev-ada/libgpr-2016[gnat_2016=,gnat_2017=,shared?,static-libs?] |
| 46 |
)" |
| 47 |
DEPEND="${RDEPEND} |
| 48 |
dev-ada/gprbuild[gnat_2016=,gnat_2017=]" |
| 49 |
@@ -99,7 +97,7 @@ src_compile() { |
| 50 |
emake PROCESSORS=$(makeopts_jobs) GPRBUILD_OPTIONS=-v GCC=${GCC} \ |
| 51 |
build_library_type/relocatable |
| 52 |
fi |
| 53 |
- if use static; then |
| 54 |
+ if use static-libs; then |
| 55 |
emake PROCESSORS=$(makeopts_jobs) GPRBUILD_OPTIONS=-v GCC=${GCC} \ |
| 56 |
build_library_type/static |
| 57 |
fi |
| 58 |
@@ -110,7 +108,7 @@ src_install() { |
| 59 |
if use shared; then |
| 60 |
emake prefix="${D}usr" install_library_type/relocatable |
| 61 |
fi |
| 62 |
- if use static; then |
| 63 |
+ if use static-libs; then |
| 64 |
emake prefix="${D}usr" install_library_type/static |
| 65 |
fi |
| 66 |
emake prefix="${D}usr" install_gps_plugin |
| 67 |
|
| 68 |
diff --git a/dev-ada/gnatcoll/gnatcoll-2017.ebuild b/dev-ada/gnatcoll/gnatcoll-2017.ebuild |
| 69 |
index a788f5e58a0..f67e1a2f877 100644 |
| 70 |
--- a/dev-ada/gnatcoll/gnatcoll-2017.ebuild |
| 71 |
+++ b/dev-ada/gnatcoll/gnatcoll-2017.ebuild |
| 72 |
@@ -16,14 +16,13 @@ LICENSE="GPL-3" |
| 73 |
SLOT="0" |
| 74 |
KEYWORDS="~amd64" |
| 75 |
IUSE="gmp gnat_2016 +gnat_2017 gtk iconv postgres pygobject projects readline |
| 76 |
- +shared sqlite static syslog tools" |
| 77 |
+ +shared sqlite static-libs syslog tools" |
| 78 |
|
| 79 |
RDEPEND="dev-lang/gnat-gpl:6.3.0 |
| 80 |
${PYTHON_DEPS} |
| 81 |
gmp? ( dev-libs/gmp:* ) |
| 82 |
gtk? ( |
| 83 |
- dev-ada/gtkada[gnat_2017,shared?] |
| 84 |
- static? ( dev-ada/gtkada[static-libs] ) |
| 85 |
+ dev-ada/gtkada[gnat_2017,shared?,static-libs?] |
| 86 |
dev-libs/atk |
| 87 |
dev-libs/glib |
| 88 |
x11-libs/cairo |
| 89 |
@@ -35,8 +34,7 @@ RDEPEND="dev-lang/gnat-gpl:6.3.0 |
| 90 |
postgres? ( dev-db/postgresql:* ) |
| 91 |
sqlite? ( dev-db/sqlite ) |
| 92 |
projects? ( |
| 93 |
- >=dev-ada/libgpr-2017[gnat_2017,shared?] |
| 94 |
- static? ( dev-ada/libgpr[static-libs] ) |
| 95 |
+ >=dev-ada/libgpr-2017[gnat_2017,shared?,static-libs?] |
| 96 |
)" |
| 97 |
DEPEND="${RDEPEND} |
| 98 |
dev-ada/gprbuild[gnat_2017]" |
| 99 |
@@ -99,7 +97,7 @@ src_compile() { |
| 100 |
emake PROCESSORS=$(makeopts_jobs) GPRBUILD_OPTIONS=-v GCC=${GCC} \ |
| 101 |
build_library_type/relocatable |
| 102 |
fi |
| 103 |
- if use static; then |
| 104 |
+ if use static-libs; then |
| 105 |
emake PROCESSORS=$(makeopts_jobs) GPRBUILD_OPTIONS=-v GCC=${GCC} \ |
| 106 |
build_library_type/static |
| 107 |
fi |
| 108 |
@@ -114,7 +112,7 @@ src_install() { |
| 109 |
if use shared; then |
| 110 |
emake prefix="${D}usr" install_library_type/relocatable |
| 111 |
fi |
| 112 |
- if use static; then |
| 113 |
+ if use static-libs; then |
| 114 |
emake prefix="${D}usr" install_library_type/static |
| 115 |
fi |
| 116 |
if use tools; then |
| 117 |
|
| 118 |
diff --git a/dev-ada/gnatcoll/metadata.xml b/dev-ada/gnatcoll/metadata.xml |
| 119 |
index 5bc4030a3e0..df4d11fa0b3 100644 |
| 120 |
--- a/dev-ada/gnatcoll/metadata.xml |
| 121 |
+++ b/dev-ada/gnatcoll/metadata.xml |
| 122 |
@@ -11,7 +11,6 @@ |
| 123 |
<flag name="projects">Adds support for projects</flag> |
| 124 |
<flag name="pygobject">Adds support for pygobject</flag> |
| 125 |
<flag name="shared">Build shared library</flag> |
| 126 |
- <flag name="static">Build static library</flag> |
| 127 |
<flag name="tools">Build associated tools</flag> |
| 128 |
</use> |
| 129 |
<longdescription lang="en"> |
Archives