dev-ada/gnatcoll: Add use flag gnat_* to 2017 version

Package-Manager: Portage-2.3.6, Repoman-2.3.1
hanetzer · Jul 2, 2017 · d83667d · d83667d
1 parent f95a682
commit d83667d
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 12 deletions.
diff --git a/dev-ada/gnatcoll/gnatcoll-2016.ebuild b/dev-ada/gnatcoll/gnatcoll-2016.ebuild
@@ -23,7 +23,7 @@ RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
  ${PYTHON_DEPS}
  gmp? ( dev-libs/gmp:* )
  gtk? (
- dev-ada/gtkada
+ dev-ada/gtkada[gnat_2016=,gnat_2017=]
  dev-libs/atk
  dev-libs/glib
  x11-libs/cairo
@@ -35,7 +35,7 @@ RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
  postgresql? ( dev-db/postgresql:* )
  sqlite? ( dev-db/sqlite )
  projects? (
- =dev-ada/gprbuild-2016[static?,shared?]
+ =dev-ada/gprbuild-2016[gnat_2016=,gnat_2017=,static?,shared?]
  )"
 DEPEND="${RDEPEND}
  dev-ada/gprbuild[gnat_2016=,gnat_2017=]"

diff --git a/dev-ada/gnatcoll/gnatcoll-2017.ebuild b/dev-ada/gnatcoll/gnatcoll-2017.ebuild
@@ -15,14 +15,15 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed016
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="gmp gtk iconv postgresql pygobject projects readline +shared sqlite
- static syslog"
+IUSE="gmp gnat_2016 gnat_2017 gtk iconv postgresql pygobject projects readline
+ +shared sqlite static syslog"
 
-RDEPEND="dev-lang/gnat-gpl:6.3.0
+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
+ dev-ada/gtkada[gnat_2016=,gnat_2017=]
  dev-libs/atk
  dev-libs/glib
  x11-libs/cairo
@@ -34,13 +35,14 @@ RDEPEND="dev-lang/gnat-gpl:6.3.0
  postgresql? ( dev-db/postgresql:* )
  sqlite? ( dev-db/sqlite )
  projects? (
- >=dev-ada/gprbuild-2017[static?,shared?]
+ >=dev-ada/gprbuild-2017[gnat_2016=,gnat_2017=,static?,shared?]
  )"
 DEPEND="${RDEPEND}
- dev-ada/gprbuild[gnat_2017]"
+ dev-ada/gprbuild[gnat_2016=,gnat_2017=]"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
- pygobject? ( gtk )"
+ pygobject? ( gtk )
+ !gnat_2016 gnat_2017"
 
 S="${WORKDIR}"/${MYP}-src
 
@@ -53,9 +55,14 @@ src_prepare() {
 }
 
 src_configure() {
- GCC=${CHOST}-gcc-6.3.0
- GNATMAKE=${CHOST}-gnatmake-6.3.0
- GNATCHOP=${CHOST}-gnatchop-6.3.0
+ if use gnat_2016; then
+ GCC_PV=4.9.4
+ else
+ GCC_PV=6.3.0
+ fi
+ GCC=${CHOST}-gcc-${GCC_PV}
+ GNATMAKE=${CHOST}-gnatmake-${GCC_PV}
+ GNATCHOP=${CHOST}-gnatchop-${GCC_PV}
  if use sqlite; then
  myConf="--with-sqlite=$(get_libdir)"
  else