[gentoo-commits] repo/gentoo:master commit in: dev-ada/gnatcoll-bindings/

[Alfredo Tupone]

commit:     f777575d54d36c56dea2a7cdd495292efba0c3e7
Author:     Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 28 16:33:53 2019 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Wed Aug 28 16:33:53 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f777575d

dev-ada/gnatcoll-bindings: stable 2018-r1

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>

 .../gnatcoll-bindings-2018-r1.ebuild               |  2 +-
 .../gnatcoll-bindings-2018.ebuild                  | 80 ----------------------
 2 files changed, 1 insertion(+), 81 deletions(-)

diff --git a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2018-r1.ebuild b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2018-r1.ebuild
index 104ed2eaa33..131bd638518 100644
--- a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2018-r1.ebuild
+++ b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2018-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/5b0ce9cfc7a4475261f97ca5
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gnat_2016 gnat_2017 +gnat_2018 gnat_2019 gmp iconv python readline +shared
 	static-libs static-pic syslog"
 

diff --git a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2018.ebuild b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2018.ebuild
deleted file mode 100644
index 5d7f13c2235..00000000000
--- a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2018.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit multilib multiprocessing python-single-r1
-
-MYP=${PN}-gpl-${PV}
-
-DESCRIPTION="GNAT Component Collection"
-HOMEPAGE="http://libre.adacore.com"
-SRC_URI="http://mirrors.cdn.adacore.com/art/5b0ce9cfc7a4475261f97ca5
-	-> ${MYP}-src.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gnat_2016 gnat_2017 +gnat_2018 gmp iconv python readline +shared
-	static-libs static-pic syslog"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )
-	dev-ada/gnatcoll-core[gnat_2016=,gnat_2017=,gnat_2018=]
-	dev-ada/gnatcoll-core[shared?,static-libs?,static-pic?]
-	gmp? ( dev-libs/gmp:* )"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018=]"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}"/${MYP}-src
-
-src_compile() {
-	build () {
-		gprbuild -j$(makeopts_jobs) -m -p -v \
-			-XGPR_BUILD=$2 -XGNATCOLL_CORE_BUILD=$2 \
-			-XLIBRARY_TYPE=$2 -P $1/gnatcoll_$1.gpr -XBUILD="PROD" \
-			-XGNATCOLL_ICONV_OPT= -XGNATCOLL_PYTHON_CFLAGS="-I$(python_get_includedir)" \
-			-XGNATCOLL_PYTHON_LIBS=$(python_get_library_path) \
-			-cargs:Ada ${ADAFLAGS} -cargs:C ${CFLAGS} || die "gprbuild failed"
-	}
-	for kind in shared static-libs static-pic ; do
-		if use $kind; then
-			lib=${kind%-libs}
-			lib=${lib/shared/relocatable}
-			for dir in gmp iconv python readline syslog ; do
-				if use $dir; then
-					build $dir $lib
-				fi
-			done
-		fi
-	done
-}
-
-src_install() {
-	build () {
-		gprinstall -p -f -XBUILD=PROD --prefix="${D}"/usr -XLIBRARY_TYPE=$2 \
-			-XGPR_BUILD=$2 -XGNATCOLL_CORE_BUILD=$2 \
-			-XGNATCOLL_ICONV_OPT= -P $1/gnatcoll_$1.gpr --build-name=$2
-	}
-	for kind in shared static-libs static-pic ; do
-		if use $kind; then
-			lib=${kind%-libs}
-			lib=${lib/shared/relocatable}
-			for dir in gmp iconv python readline syslog ; do
-				if use $dir; then
-					build $dir $lib
-				fi
-			done
-		fi
-	done
-	if use iconv; then
-		sed -i \
-			-e "s:GNATCOLL_ICONV_BUILD:LIBRARY_TYPE:" \
-			"${D}"/usr/share/gpr/gnatcoll_iconv.gpr \
-			|| die
-	fi
-	rm -r "${D}"/usr/share/gpr/manifests || die
-	einstalldocs
-}