dev-ada/gps-bin: use only (gnat)gcc-4.9.4

Package-Manager: Portage-2.3.13, Repoman-2.3.3

3 files changed, 18 insertions, 20 deletions

diff --git a/dev-ada/gps-bin/Manifest b/dev-ada/gps-bin/Manifest
index 70e439d44a0a..7def8be9a44d 100644
--- a/dev-ada/gps-bin/Manifest
+++ b/dev-ada/gps-bin/Manifest
@@ -1 +1 @@
-DIST gnat-gpl-2016-x86_64-linux-bin.tar.gz 372813330 SHA256 d083c01e054d0aeda7c67967306cfa5a8df12268664f9098a2d9b331aa24dfe7 SHA512 5115ac3be0badc5125ee048a98230f18363d72107da3325ce602c0e618cee2e3646a0decc00a2388f14bc61bfed51dd0622f365f5f7ee8b0cec2187ebcf8e075 WHIRLPOOL 7802a81533e5faad9c6913a2feae4e57fa4ce54ad7b561b23fbb64fdd9fa4bf3753e3c89e8d8fe15dce7a1294def8a5a4252f6aa66b4aef98d5669c2d08e0dd5
+DIST gnat-gpl-2016-x86_64-linux-bin.tar.gz 372813330 BLAKE2B a0374ad730ae275aaedcf5663c30f8e0221af32f14391fe87a3ce0630d4498a1e90671c02830d62f78857571a5a521af91f6db409a7b3c367c7b0f059571eefd SHA512 5115ac3be0badc5125ee048a98230f18363d72107da3325ce602c0e618cee2e3646a0decc00a2388f14bc61bfed51dd0622f365f5f7ee8b0cec2187ebcf8e075
diff --git a/dev-ada/gps-bin/gps-bin-2016.ebuild b/dev-ada/gps-bin/gps-bin-2016.ebuild
index 25fd9b696789..c8fcc1c78b71 100644
--- a/dev-ada/gps-bin/gps-bin-2016.ebuild
+++ b/dev-ada/gps-bin/gps-bin-2016.ebuild
@@ -17,10 +17,7 @@ IUSE=""
 
 DEPEND=""
 RDEPEND="${DEPEND}
-	dev-ada/gnatcoll[iconv,postgresql,projects,readline,sqlite]
-	dev-ada/gprbuild[shared]
-	dev-db/sqlite
-	dev-lang/gnat-gpl
+	dev-ada/gnatcoll[gnat_2016,iconv,postgresql,projects,readline,sqlite]
 	dev-libs/atk
 	dev-libs/glib
 	dev-libs/gobject-introspection
@@ -38,24 +35,16 @@ RDEPEND="${DEPEND}
 
 S="${WORKDIR}"/${MY_P}
 
-pkg_setup() {
-	GCC=${ADA:-$(tc-getCC)}
-	GNATLS="${GCC/gcc/gnatls}"
-	GNAT="${GCC/gcc/gnat}"
-	GNATMAKE="${GCC/gcc/gnatmake}"
-	if [[ -z "$(type ${GNATLS} 2>/dev/null)" ]] ; then
-		eerror "You need a gcc compiler that provides the Ada Compiler:"
-		eerror "1) use gcc-config to select the right compiler or"
-		eerror "2) set ADA=gcc-4.9.4 in make.conf"
-		die "ada compiler not available"
-	fi
-}
-
 src_compile() {
 	:
 }
 
 src_install() {
+	GCC_PV=4.9.4
+	GCC=gcc-${GCC_PV}
+	GNATLS=gnatls-${GCC_PV}
+	GNAT=gnatt-${GCC_PV}
+	GNATMAKE=gnatmake-${GCC_PV}
 	into /opt/${P}
 	dobin bin/gps_exe
 	dobin bin/gps_cli
diff --git a/dev-ada/gps-bin/metadata.xml b/dev-ada/gps-bin/metadata.xml
index ebe9a3559c56..5c70b5a1629a 100644
--- a/dev-ada/gps-bin/metadata.xml
+++ b/dev-ada/gps-bin/metadata.xml
@@ -6,8 +6,17 @@
 		<name>Tupone Alfredo</name>
 	</maintainer>
 	<longdescription lang="en">
-		 GPS, the GNAT Programming Studio, is a cutting-edge Free Software IDE that streamlines the interaction between developers and their software. With its intuitive interface, GPS is easy to use, simplifying source navigation and highlighting the fundamental ideas in the program.
+		GPS, the GNAT Programming Studio, is a cutting-edge Free Software IDE
+		that streamlines the interaction between developers and their software.
+		With its intuitive interface, GPS is easy to use, simplifying source
+		navigation and highlighting the fundamental ideas in the program.
 
-By displaying core application structures, such as call graphs, program entity graphs, and project dependencies, GPS facilitates the development of systems. GPS helps construct reliable code while providing the same interface and behavior across a variety of platforms. Designed by programmers for programmers, GPS is a new kind of IDE that offers the experience of designing software in a uniquely comfortable environment.
+		By displaying core application structures, such as call graphs, program
+		entity graphs, and project dependencies, GPS facilitates the
+		development of systems. GPS helps construct reliable code while
+		providing the same interface and behavior across a variety of
+		platforms. Designed by programmers for programmers, GPS is a new kind
+		of IDE that offers the experience of designing software in a uniquely
+		comfortable environment.
 	</longdescription>
 </pkgmetadata>