From 12dc193801fc938bb00bfe3b6a215383fa877532 Mon Sep 17 00:00:00 2001 From: George Shapovalov Date: Mon, 31 Aug 2015 14:24:34 +0200 Subject: [PATCH] cleaned up ebuild to correspond to latest requirements; added EAPI in prep for gnatbuild.eclass cleanup Package-Manager: portage-2.2.20.1 --- dev-lang/gnat-gcc/gnat-gcc-3.4.6.ebuild | 3 ++- dev-lang/gnat-gcc/gnat-gcc-4.1.2.ebuild | 3 ++- dev-lang/gnat-gcc/gnat-gcc-4.2.3.ebuild | 3 ++- dev-lang/gnat-gcc/gnat-gcc-4.3.5.ebuild | 7 ++++--- dev-lang/gnat-gcc/gnat-gcc-4.3.6.ebuild | 7 ++++--- dev-lang/gnat-gcc/gnat-gcc-4.4.7.ebuild | 3 ++- dev-lang/gnat-gcc/gnat-gcc-4.5.4.ebuild | 3 ++- dev-lang/gnat-gcc/gnat-gcc-4.6.4.ebuild | 3 ++- 8 files changed, 20 insertions(+), 12 deletions(-) diff --git a/dev-lang/gnat-gcc/gnat-gcc-3.4.6.ebuild b/dev-lang/gnat-gcc/gnat-gcc-3.4.6.ebuild index 46fa3d4eb6e5..596ca12eb60f 100644 --- a/dev-lang/gnat-gcc/gnat-gcc-3.4.6.ebuild +++ b/dev-lang/gnat-gcc/gnat-gcc-3.4.6.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ +EAPI=5 WANT_AUTOCONF=2.1 inherit gnatbuild diff --git a/dev-lang/gnat-gcc/gnat-gcc-4.1.2.ebuild b/dev-lang/gnat-gcc/gnat-gcc-4.1.2.ebuild index b5f55042f368..025d74ab6d7d 100644 --- a/dev-lang/gnat-gcc/gnat-gcc-4.1.2.ebuild +++ b/dev-lang/gnat-gcc/gnat-gcc-4.1.2.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ +EAPI=5 inherit gnatbuild DESCRIPTION="GNAT Ada Compiler - gcc version" diff --git a/dev-lang/gnat-gcc/gnat-gcc-4.2.3.ebuild b/dev-lang/gnat-gcc/gnat-gcc-4.2.3.ebuild index 8d7053021436..03ee0e9d87be 100644 --- a/dev-lang/gnat-gcc/gnat-gcc-4.2.3.ebuild +++ b/dev-lang/gnat-gcc/gnat-gcc-4.2.3.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ +EAPI=5 inherit gnatbuild DESCRIPTION="GNAT Ada Compiler - gcc version" diff --git a/dev-lang/gnat-gcc/gnat-gcc-4.3.5.ebuild b/dev-lang/gnat-gcc/gnat-gcc-4.3.5.ebuild index 2a452cc92492..dbe6749b9236 100644 --- a/dev-lang/gnat-gcc/gnat-gcc-4.3.5.ebuild +++ b/dev-lang/gnat-gcc/gnat-gcc-4.3.5.ebuild @@ -1,10 +1,11 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ # Need to let configure know where to find stddef.h #EXTRA_CONFGCC="${WORKDIR}/usr/lib/include/" +EAPI=5 inherit gnatbuild DESCRIPTION="GNAT Ada Compiler - gcc version" @@ -28,9 +29,9 @@ SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/gcc-${PV}/gcc-core-${PV}.tar.bz2 KEYWORDS="amd64 ~ppc x86" # starting with 4.3.0 gnat needs these libs -DEPEND=">=dev-libs/mpfr-2.3.1 +DEPEND=">=dev-libs/mpfr-2.3.1:* =dev-libs/gmp-4.2.2" + >=dev-libs/gmp-4.2.2:*" RDEPEND="${DEPEND}" #QA_EXECSTACK="${BINPATH:1}/gnatls ${BINPATH:1}/gnatbind ${BINPATH:1}/gnatmake diff --git a/dev-lang/gnat-gcc/gnat-gcc-4.3.6.ebuild b/dev-lang/gnat-gcc/gnat-gcc-4.3.6.ebuild index 4c74fe934d7d..c71fa02c55bd 100644 --- a/dev-lang/gnat-gcc/gnat-gcc-4.3.6.ebuild +++ b/dev-lang/gnat-gcc/gnat-gcc-4.3.6.ebuild @@ -2,6 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ +EAPI=5 inherit gnatbuild DESCRIPTION="GNAT Ada Compiler - gcc version" @@ -22,10 +23,10 @@ SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/gcc-${PV}/gcc-core-${PV}.tar.bz2 KEYWORDS="amd64 ~ppc x86" # starting with 4.3.0 gnat needs these libs -RDEPEND=">=dev-libs/mpfr-2.3.1 - >=dev-libs/gmp-4.2.2 +RDEPEND=">=dev-libs/mpfr-2.3.1:* + >=dev-libs/gmp-4.2.2:* >=sys-libs/zlib-1.1.4 - >=sys-libs/ncurses-5.2-r2" + >=sys-libs/ncurses-5.2-r2:*" DEPEND="${RDEPEND} =sys-libs/ncurses-5.7:*" DEPEND="${RDEPEND} =sys-libs/ncurses-5.7:*" DEPEND="${RDEPEND} doc? ( sys-apps/texinfo ) diff --git a/dev-lang/gnat-gcc/gnat-gcc-4.6.4.ebuild b/dev-lang/gnat-gcc/gnat-gcc-4.6.4.ebuild index b987907d818a..43466238d0b7 100644 --- a/dev-lang/gnat-gcc/gnat-gcc-4.6.4.ebuild +++ b/dev-lang/gnat-gcc/gnat-gcc-4.6.4.ebuild @@ -2,6 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ +EAPI=5 inherit gnatbuild DESCRIPTION="GNAT Ada Compiler - gcc version" @@ -28,7 +29,7 @@ RDEPEND=">=dev-libs/mpfr-3.1.2 >=dev-libs/gmp-5.1.3 >=dev-libs/mpc-1.0.1 >=sys-libs/zlib-1.2 - >=sys-libs/ncurses-5.7" + >=sys-libs/ncurses-5.7:*" DEPEND="${RDEPEND} doc? ( >=sys-apps/texinfo-5 ) -- 2.26.2