| 1 |
commit: d83667d298ae7cc83f9bfb8bcc4bdad55245952b |
| 2 |
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jul 2 11:39:26 2017 +0000 |
| 4 |
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jul 2 11:39:26 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d83667d2 |
| 7 |
|
| 8 |
dev-ada/gnatcoll: Add use flag gnat_* to 2017 version |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.1 |
| 11 |
|
| 12 |
dev-ada/gnatcoll/gnatcoll-2016.ebuild | 4 ++-- |
| 13 |
dev-ada/gnatcoll/gnatcoll-2017.ebuild | 27 +++++++++++++++++---------- |
| 14 |
2 files changed, 19 insertions(+), 12 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-ada/gnatcoll/gnatcoll-2016.ebuild b/dev-ada/gnatcoll/gnatcoll-2016.ebuild |
| 17 |
index 77e71b22795..9ceb0858a42 100644 |
| 18 |
--- a/dev-ada/gnatcoll/gnatcoll-2016.ebuild |
| 19 |
+++ b/dev-ada/gnatcoll/gnatcoll-2016.ebuild |
| 20 |
@@ -23,7 +23,7 @@ RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) |
| 21 |
${PYTHON_DEPS} |
| 22 |
gmp? ( dev-libs/gmp:* ) |
| 23 |
gtk? ( |
| 24 |
- dev-ada/gtkada |
| 25 |
+ dev-ada/gtkada[gnat_2016=,gnat_2017=] |
| 26 |
dev-libs/atk |
| 27 |
dev-libs/glib |
| 28 |
x11-libs/cairo |
| 29 |
@@ -35,7 +35,7 @@ RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) |
| 30 |
postgresql? ( dev-db/postgresql:* ) |
| 31 |
sqlite? ( dev-db/sqlite ) |
| 32 |
projects? ( |
| 33 |
- =dev-ada/gprbuild-2016[static?,shared?] |
| 34 |
+ =dev-ada/gprbuild-2016[gnat_2016=,gnat_2017=,static?,shared?] |
| 35 |
)" |
| 36 |
DEPEND="${RDEPEND} |
| 37 |
dev-ada/gprbuild[gnat_2016=,gnat_2017=]" |
| 38 |
|
| 39 |
diff --git a/dev-ada/gnatcoll/gnatcoll-2017.ebuild b/dev-ada/gnatcoll/gnatcoll-2017.ebuild |
| 40 |
index e62932cebe4..21b6e39c137 100644 |
| 41 |
--- a/dev-ada/gnatcoll/gnatcoll-2017.ebuild |
| 42 |
+++ b/dev-ada/gnatcoll/gnatcoll-2017.ebuild |
| 43 |
@@ -15,14 +15,15 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed016 |
| 44 |
LICENSE="GPL-3" |
| 45 |
SLOT="0" |
| 46 |
KEYWORDS="~amd64" |
| 47 |
-IUSE="gmp gtk iconv postgresql pygobject projects readline +shared sqlite |
| 48 |
- static syslog" |
| 49 |
+IUSE="gmp gnat_2016 gnat_2017 gtk iconv postgresql pygobject projects readline |
| 50 |
+ +shared sqlite static syslog" |
| 51 |
|
| 52 |
-RDEPEND="dev-lang/gnat-gpl:6.3.0 |
| 53 |
+RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) |
| 54 |
+ gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) |
| 55 |
${PYTHON_DEPS} |
| 56 |
gmp? ( dev-libs/gmp:* ) |
| 57 |
gtk? ( |
| 58 |
- dev-ada/gtkada |
| 59 |
+ dev-ada/gtkada[gnat_2016=,gnat_2017=] |
| 60 |
dev-libs/atk |
| 61 |
dev-libs/glib |
| 62 |
x11-libs/cairo |
| 63 |
@@ -34,13 +35,14 @@ RDEPEND="dev-lang/gnat-gpl:6.3.0 |
| 64 |
postgresql? ( dev-db/postgresql:* ) |
| 65 |
sqlite? ( dev-db/sqlite ) |
| 66 |
projects? ( |
| 67 |
- >=dev-ada/gprbuild-2017[static?,shared?] |
| 68 |
+ >=dev-ada/gprbuild-2017[gnat_2016=,gnat_2017=,static?,shared?] |
| 69 |
)" |
| 70 |
DEPEND="${RDEPEND} |
| 71 |
- dev-ada/gprbuild[gnat_2017]" |
| 72 |
+ dev-ada/gprbuild[gnat_2016=,gnat_2017=]" |
| 73 |
|
| 74 |
REQUIRED_USE="${PYTHON_REQUIRED_USE} |
| 75 |
- pygobject? ( gtk )" |
| 76 |
+ pygobject? ( gtk ) |
| 77 |
+ !gnat_2016 gnat_2017" |
| 78 |
|
| 79 |
S="${WORKDIR}"/${MYP}-src |
| 80 |
|
| 81 |
@@ -53,9 +55,14 @@ src_prepare() { |
| 82 |
} |
| 83 |
|
| 84 |
src_configure() { |
| 85 |
- GCC=${CHOST}-gcc-6.3.0 |
| 86 |
- GNATMAKE=${CHOST}-gnatmake-6.3.0 |
| 87 |
- GNATCHOP=${CHOST}-gnatchop-6.3.0 |
| 88 |
+ if use gnat_2016; then |
| 89 |
+ GCC_PV=4.9.4 |
| 90 |
+ else |
| 91 |
+ GCC_PV=6.3.0 |
| 92 |
+ fi |
| 93 |
+ GCC=${CHOST}-gcc-${GCC_PV} |
| 94 |
+ GNATMAKE=${CHOST}-gnatmake-${GCC_PV} |
| 95 |
+ GNATCHOP=${CHOST}-gnatchop-${GCC_PV} |
| 96 |
if use sqlite; then |
| 97 |
myConf="--with-sqlite=$(get_libdir)" |
| 98 |
else |
Archives