gentoo resync : 26.11.2017

3 files changed, 20 insertions, 22 deletions

diff --git a/dev-ada/gps-bin/Manifest b/dev-ada/gps-bin/Manifest
index 30df2a9a83e9..08bf1b265e1d 100644
--- a/dev-ada/gps-bin/Manifest
+++ b/dev-ada/gps-bin/Manifest
@@ -1,3 +1,3 @@
-DIST gnat-gpl-2016-x86_64-linux-bin.tar.gz 372813330 SHA256 d083c01e054d0aeda7c67967306cfa5a8df12268664f9098a2d9b331aa24dfe7 SHA512 5115ac3be0badc5125ee048a98230f18363d72107da3325ce602c0e618cee2e3646a0decc00a2388f14bc61bfed51dd0622f365f5f7ee8b0cec2187ebcf8e075 WHIRLPOOL 7802a81533e5faad9c6913a2feae4e57fa4ce54ad7b561b23fbb64fdd9fa4bf3753e3c89e8d8fe15dce7a1294def8a5a4252f6aa66b4aef98d5669c2d08e0dd5
-EBUILD gps-bin-2016.ebuild 1833 SHA256 5a1dbbf2b5aaae1794a732562ee6bef9886c9b92c42e94851f03ac59ed409160 SHA512 4b5c41fa1755570920e91bb2224ce9007656f55b46df3b425dcefd8ffbebdab9ef0814a0214a6d9b197984b5649b30c8858ea69ca66e678cf588544090aeab17 WHIRLPOOL ebc506466f19597f212aa67a7f22f9ecee65a0d9426dcf1b61d3dc9c3eeaaada7739653aedacad2a52a58515b78255d385a4b3dfcc67edd8669a7e31f22a4a02
-MISC metadata.xml 1001 SHA256 75c363fd37ab0a74106e9bbbc284f8d291589736b8a843259965d1fcba9df329 SHA512 5dbed34739c5dd8d3900285af76acf0c0029ace65789be6e94ccee6f67514f8de1c21dfcb7a0ee2990bd9427f5360672367ca865d572363147cf8f586fa25499 WHIRLPOOL d2e359dbe47d55826148e2971a5794807c34cc75992451a23fe09543bf285eb381d00bc732f593f6775a4d4433c3308a6ebaf664b5fe7c6663c2c4aac60ab338
+DIST gnat-gpl-2016-x86_64-linux-bin.tar.gz 372813330 BLAKE2B a0374ad730ae275aaedcf5663c30f8e0221af32f14391fe87a3ce0630d4498a1e90671c02830d62f78857571a5a521af91f6db409a7b3c367c7b0f059571eefd SHA512 5115ac3be0badc5125ee048a98230f18363d72107da3325ce602c0e618cee2e3646a0decc00a2388f14bc61bfed51dd0622f365f5f7ee8b0cec2187ebcf8e075
+EBUILD gps-bin-2016.ebuild 1502 BLAKE2B 9a916b04fdc22f26be3bf7c30daf74bbd9962a717a17268586d481bfe7927e84109a16e162cf24d54e7d39b3bc6e6bbe8417331d0ee22cb23218e28d6fb40199 SHA512 7b90c805cb4b9c66daf018d5bd075c29d9c0e48eb0542d798e1b0fe78e6e007e9571d63d3d4886eeb706ffb8e1a0a6018121913258489343582a298cd9dbd163
+MISC metadata.xml 1020 BLAKE2B 31b305e3aa3f0c87a449779685bc366e34b4c8f63989f5180feaa26df90322b276081b4bb2e10c23c3e7d139dc9b96e48c42ef7145646bcd1ef0ec6c106a06fb SHA512 b5c9fcae1f4d37762f6bb0457b245c60b3b96449f68b9fbd0f4c1d919174c18d3c2a82c26e1d0ca02177cbc2480125aac3ff47b61c2404571e85d0588ca9644e
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>