From 7ce18ab525ecd2761135cf3786e3d5ea393df2a2 Mon Sep 17 00:00:00 2001 From: Tupone Alfredo Date: Sat, 10 Nov 2018 19:01:20 +0100 Subject: [PATCH] dev-ada/gtkada: Stabilize 2018 version Signed-off-by: Alfredo Tupone Package-Manager: Portage-2.3.51, Repoman-2.3.11 --- dev-ada/gtkada/files/gtkada-2017-gentoo.patch | 11 ----------- dev-ada/gtkada/gtkada-2017.ebuild | 5 ++--- dev-ada/gtkada/gtkada-2018.ebuild | 7 +++---- 3 files changed, 5 insertions(+), 18 deletions(-) diff --git a/dev-ada/gtkada/files/gtkada-2017-gentoo.patch b/dev-ada/gtkada/files/gtkada-2017-gentoo.patch index ec8ebdf8f601..25a018e0d31e 100644 --- a/dev-ada/gtkada/files/gtkada-2017-gentoo.patch +++ b/dev-ada/gtkada/files/gtkada-2017-gentoo.patch @@ -1,14 +1,3 @@ ---- gtkada-gpl-2015-src/shared.gpr.in.old 2017-01-05 23:28:35.838073270 +0100 -+++ gtkada-gpl-2015-src/shared.gpr.in 2017-01-05 23:30:17.752255709 +0100 -@@ -44,6 +44,8 @@ - for Switches ("C") use ("-O2"); - end case; - -+ for Driver ("C") use External ("GCC", "gcc"); -+ for PIC_Option ("C") use ("-fPIC"); - for Switches ("C") use Compiler'Switches ("C") & Gtk_Include; - for Switches ("Objective-C") use Compiler'Switches ("Objective-C") & Gtk_Include; - end Compiler; --- gtkada-gpl-2016-src/Makefile.in.old 2017-01-21 22:42:18.319969095 +0100 +++ gtkada-gpl-2016-src/Makefile.in 2017-01-21 22:42:33.989700236 +0100 @@ -60,30 +60,33 @@ diff --git a/dev-ada/gtkada/gtkada-2017.ebuild b/dev-ada/gtkada/gtkada-2017.ebuild index 967c1a26d68f..f64be7a6ac09 100644 --- a/dev-ada/gtkada/gtkada-2017.ebuild +++ b/dev-ada/gtkada/gtkada-2017.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -48,7 +48,6 @@ src_configure() { else GCC_PV=6.3.0 fi - GCC=${CHOST}-gcc-${GCC_PV} econf \ --prefix="${D}/usr" \ $(use_enable static-libs static) \ @@ -58,7 +57,7 @@ src_configure() { src_compile() { GNATPREP=${CHOST}-gnatprep-${GCC_PV} - GCC=${GCC} emake -j1 GNATPREP=${GNATPREP} PROCESSORS=$(makeopts_jobs) + emake -j1 GNATPREP=${GNATPREP} PROCESSORS=$(makeopts_jobs) } src_install() { diff --git a/dev-ada/gtkada/gtkada-2018.ebuild b/dev-ada/gtkada/gtkada-2018.ebuild index 1a6fabc18667..63d33a60a954 100644 --- a/dev-ada/gtkada/gtkada-2018.ebuild +++ b/dev-ada/gtkada/gtkada-2018.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -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 +shared static-libs" RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) @@ -51,7 +51,6 @@ src_configure() { else GCC_PV=4.9.4 fi - GCC=${CHOST}-gcc-${GCC_PV} econf \ --prefix="${D}/usr" \ $(use_enable static-libs static) \ @@ -61,7 +60,7 @@ src_configure() { src_compile() { GNATPREP=${CHOST}-gnatprep-${GCC_PV} - GCC=${GCC} emake -j1 GNATPREP=${GNATPREP} PROCESSORS=$(makeopts_jobs) + emake -j1 GNATPREP=${GNATPREP} PROCESSORS=$(makeopts_jobs) } src_install() { -- 2.26.2