commit: 01a02fef4a924aa4df64953271f20ad8800957d9 Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org> AuthorDate: Thu Aug 29 06:41:15 2019 +0000 Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> CommitDate: Thu Aug 29 06:41:15 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01a02fef
dev-ada/gtkada: stable 2018-r1, fix MissingUseDepDefault Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org> dev-ada/gtkada/gtkada-2017.ebuild | 4 +-- dev-ada/gtkada/gtkada-2018-r1.ebuild | 2 +- dev-ada/gtkada/gtkada-2018.ebuild | 69 ------------------------------------ 3 files changed, 3 insertions(+), 72 deletions(-) diff --git a/dev-ada/gtkada/gtkada-2017.ebuild b/dev-ada/gtkada/gtkada-2017.ebuild index f64be7a6ac0..f6edaf0546c 100644 --- a/dev-ada/gtkada/gtkada-2017.ebuild +++ b/dev-ada/gtkada/gtkada-2017.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -28,7 +28,7 @@ RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) x11-libs/gtk+:3 x11-libs/pango" DEPEND="${RDEPEND} - dev-ada/gprbuild[gnat_2016=,gnat_2017=]" + dev-ada/gprbuild[gnat_2016(-)?,gnat_2017(-)?]" REQUIRED_USE="^^ ( gnat_2016 gnat_2017 )" diff --git a/dev-ada/gtkada/gtkada-2018-r1.ebuild b/dev-ada/gtkada/gtkada-2018-r1.ebuild index a93733247c7..a4f93c664a1 100644 --- a/dev-ada/gtkada/gtkada-2018-r1.ebuild +++ b/dev-ada/gtkada/gtkada-2018-r1.ebuild @@ -14,7 +14,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/5b0cf840c7a4475261f97ced LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="gnat_2016 gnat_2017 +gnat_2018 gnat_2019 +shared static-libs" RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) diff --git a/dev-ada/gtkada/gtkada-2018.ebuild b/dev-ada/gtkada/gtkada-2018.ebuild deleted file mode 100644 index 63d33a60a95..00000000000 --- a/dev-ada/gtkada/gtkada-2018.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools multiprocessing - -MYP=${PN}-gpl-${PV} - -DESCRIPTION="A complete Ada graphical toolkit" -HOMEPAGE="http://libre.adacore.com//tools/gtkada/" -SRC_URI="http://mirrors.cdn.adacore.com/art/5b0cf840c7a4475261f97ced - -> ${MYP}-src.tgz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="gnat_2016 gnat_2017 +gnat_2018 +shared static-libs" - -RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) - gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) - gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) - dev-libs/atk - dev-libs/glib:2 - media-libs/fontconfig - media-libs/freetype - x11-libs/cairo - x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:3 - x11-libs/pango" -DEPEND="${RDEPEND} - dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018(-)=]" - -REQUIRED_USE="^^ ( gnat_2016 gnat_2017 gnat_2018 )" - -S="${WORKDIR}"/${MYP}-src - -PATCHES=( "${FILESDIR}"/${PN}-2017-gentoo.patch ) - -src_prepare() { - default - mv configure.{in,ac} - eautoreconf -} - -src_configure() { - if use gnat_2018; then - GCC_PV=7.3.1 - elif use gnat_2017; then - GCC_PV=6.3.0 - else - GCC_PV=4.9.4 - fi - econf \ - --prefix="${D}/usr" \ - $(use_enable static-libs static) \ - $(use_enable shared) \ - --without-GL -} - -src_compile() { - GNATPREP=${CHOST}-gnatprep-${GCC_PV} - emake -j1 GNATPREP=${GNATPREP} PROCESSORS=$(makeopts_jobs) -} - -src_install() { - emake -j1 install - einstalldocs -}