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

[Alfredo Tupone]

commit:     49904d5d8c787f1ad7e41a1895356d7410980978
Author:     Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  2 18:25:03 2019 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Wed Jan  2 18:25:03 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49904d5d

dev-ada/gps: Stable

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

 dev-ada/gps/Manifest           |   1 -
 dev-ada/gps/gps-2018-r1.ebuild |   2 +-
 dev-ada/gps/gps-2018.ebuild    | 104 -----------------------------------------
 3 files changed, 1 insertion(+), 106 deletions(-)

diff --git a/dev-ada/gps/Manifest b/dev-ada/gps/Manifest
index 0fa4e43122f..1b976f5d7a2 100644
--- a/dev-ada/gps/Manifest
+++ b/dev-ada/gps/Manifest
@@ -1,6 +1,5 @@
 DIST gnat-gpl-2017-x86_64-linux-bin.tar.gz 496338280 BLAKE2B b3eee6d311fb9c20bc8fa7217c0731ca1e91ced38700df1d63d91a16c3fa28dfd44c7c8e867c3a857b88e4f0c8b2a7200fb6a8a630b8403538c4784f8914d1a5 SHA512 01a8f3be9b7b7e83cc5bd4a45137b1d35c6448bc22a88bcaf5d312cd63e11081b6b2fe9f09ad2a27d8f0b6471fc5c1a99573bf3bcee1589329054074eaeef04f
 DIST gps-gpl-2017-src.tar.gz 41216830 BLAKE2B 51ca89c38fa81888a9cf1831cf97f7e0ad72c444328a29063249a4fe72bbdc8357552d470872e9fbbeaf349ef0427b59fa41a0efb56200a07a9426343c731a57 SHA512 101ecef7f183de1da0c2b09d77f284a5e8c5ae56f34a897c8d471e79fe9a2832742608ff5251197ba2a52b5d9dfee6c6937fc22cd55f6d8f38359b070393cb64
 DIST gps-gpl-2018-src.tar.gz 40541905 BLAKE2B abe38dd23d9afede27b4ec8294e3245c12d52d60491b6e7c1b2d120a6f1e5d808fdcfb648e72da31376e2de176f7a039c5493341ad295db33b6a1ce44bb64096 SHA512 da0eaa85eb753f215354c9765272d85378f36ebe207314bab9211642f9d9b505a3d05cdec9de6964ae9139c4f8942a29e06c72db32b2aeb053a694e9c982e470
-DIST gpsLib.tar.gz 11017404 BLAKE2B b84219322950d5c3a7b202e4b5e423fcb95c528d4e0810f25674e8cfd0e9ca91a155fff500e4d25959cdba42492794fba8cb725e6955bcea8908a8043a387ca1 SHA512 e852285c8b67e5787396dfaa95feaff31e73bd4cd3a731e20c6970c2ade3ef6290ef98d9a6b7553d4daf6f2ae722ca5ff74add3fd4285ce259a1443e6b06a5a1
 DIST gtk+-3.14.15-src.tar.gz 32009863 BLAKE2B 93c6897c431fa8e1c19ea758378bc7e365d486d1decccefbba64876d8c51a488e6bcf932481daa11e7e43a960a328c3db746e41a845e574c6b6070ab71e23188 SHA512 add4607a1758319a938d2be0bbd0dd140c4099accffa9301e3049bc460bf94f395c5a092368214e8b28d53bc25335d1b8329b50c7eb80a1e9a65b2e154135b84
 DIST libadalang-tools-gpl-2018-src.tar.gz 19938182 BLAKE2B 34104f3bc43c165a9b74ba8c0c03ee2f34686bcd06b5ced730f70f654d8b808e129a85566e081830b4f20304c793eefe0af81b56984cf06190302ad2f6a419be SHA512 a1176575944cd88b9da5f4e9f03caa1a4d09358df71e6a91300d0b35c2a843d0ea1a77fbd93e7b7f16cef1b978022ee20991f5c2ff74f7d05878c3de1220f2b5

diff --git a/dev-ada/gps/gps-2018-r1.ebuild b/dev-ada/gps/gps-2018-r1.ebuild
index 6ca3b5d6eaf..b8cd9b2a758 100644
--- a/dev-ada/gps/gps-2018-r1.ebuild
+++ b/dev-ada/gps/gps-2018-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/5b0cf627c7a4475261f97ceb
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gnat_2017 +gnat_2018"
 
 RDEPEND="${PYTHON_DEPS}

diff --git a/dev-ada/gps/gps-2018.ebuild b/dev-ada/gps/gps-2018.ebuild
deleted file mode 100644
index 290f5bf2721..00000000000
--- a/dev-ada/gps/gps-2018.ebuild
+++ /dev/null
@@ -1,104 +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 python-single-r1 autotools desktop llvm
-
-MYP=${PN}-gpl-${PV}-src
-
-DESCRIPTION="The GNAT Programming Studio"
-HOMEPAGE="http://libre.adacore.com/tools/gps/"
-SRC_URI="http://mirrors.cdn.adacore.com/art/5b0cf627c7a4475261f97ceb
-	-> ${MYP}.tar.gz
-	http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a59 ->
-		libadalang-tools-gpl-2018-src.tar.gz
-	https://dev.gentoo.org/~tupone/distfiles/gpsLib.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gnat_2017 +gnat_2018"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-ada/gnatcoll-db[gnat_2017=,gnat_2018=,gnatcoll_db2ada,gnatinspect,xref]
-	dev-ada/gnatcoll-bindings[gnat_2017=,gnat_2018=,python]
-	~dev-ada/gtkada-2018[gnat_2017=,gnat_2017=]
-	dev-ada/libadalang[gnat_2017=,gnat_2018=]
-	dev-libs/gobject-introspection
-	dev-libs/libffi
-	gnat_2017? ( sys-devel/llvm:5 )
-	gnat_2018? (
-		|| (
-			sys-devel/llvm:6
-			sys-devel/llvm:7
-		)
-	)
-	sys-devel/clang:=
-	x11-themes/adwaita-icon-theme
-	x11-themes/hicolor-icon-theme
-	dev-python/pep8[${PYTHON_USEDEP}]
-	dev-python/jedi[${PYTHON_USEDEP}]"
-
-DEPEND="${RDEPEND}"
-
-RESTRICT="test"
-
-S="${WORKDIR}"/${MYP}
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-pkg_setup() {
-	if use gnat_2017; then
-		GCC_PV=6.3.0
-		LLVM_MAX_SLOT=5
-	else
-		GCC_PV=7.3.1
-		LLVM_MAX_SLOT=7
-	fi
-	GNATMAKE=gnatmake-${GCC_PV}
-	GNATDRV=gnat-${GCC_PV}
-	GNATLS=gnatls-${GCC_PV}
-	llvm_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	GCC_PV=7.3.1
-	default
-	sed -i \
-		-e "s:@GNATMAKE@:${CHOST}-${GNATMAKE}:g" \
-		-e "s:@GNAT@:${CHOST}-${GNATDRV}:g" \
-		-e "s:@GNATLS@:${CHOST}-${GNATLS}:g" \
-		share/support/core/toolchains.py \
-		share/support/core/projects.py \
-		|| die
-	mv "${WORKDIR}"/libadalang-tools-src laltools
-	echo "#!/bin/bash" > gps.sh
-	echo "export LD_LIBRARY_PATH=/opt/lib/gps" >> gps.sh
-	echo 'exec /usr/bin/gps_exe "$@"' >> gps.sh
-}
-
-src_configure() {
-	econf \
-		GNATMAKE=/usr/bin/${GNATMAKE} \
-		GNATDRV=/usr/bin/${GNATDRV} \
-		--with-clang=$(llvm-config --libdir)
-}
-
-src_compile() {
-	emake -C gps GPRBUILD_FLAGS="-v ${MAKEOPTS} \
-		-XGPR_BUILD=relocatable" \
-		Build=Production
-	gprbuild -v -p -Pcli/cli.gpr ${MAKEOPTS} -XLIBRARY_TYPE=relocatable \
-		-XGPR_BUILD=relocatable -cargs:Ada ${ADAFLAGS} || die
-}
-
-src_install() {
-	default
-	make_desktop_entry "${PN}" "GPS" "${EPREFIX}/usr/share/gps/icons/hicolor/32x32/apps/gps_32.png" "Development;IDE;"
-	insinto /opt/lib
-	doins -r ../lib/gps
-	mv "${D}"/usr/bin/gps{,_exe}
-	newbin	gps.sh gps
-}