dev-ada/gtkada: Add version 2017. Purge 17 and 9999 versions

Package-Manager: Portage-2.3.6, Repoman-2.3.1

8 files changed, 42 insertions, 214 deletions

diff --git a/dev-ada/gtkada/Manifest b/dev-ada/gtkada/Manifest
index afbfcbfb1865..f5ce2c9907ac 100644
--- a/dev-ada/gtkada/Manifest
+++ b/dev-ada/gtkada/Manifest
@@ -1,2 +1,2 @@
-DIST gtkada-17.0.tar.gz 5358097 SHA256 65298b7ce604963ab389d5577a2c71c0f0276b176d7387ac55195dc644b87449 SHA512 d2970d9cfb2c1a893e5fc146e41683583bcc70cfb744ba19e953fd00916488b39d96c59170c1d5272eb0b45deebcc906ec1be4a31d1141540a8feceb7b2cb034 WHIRLPOOL fd30280050ca42570509660c5afda2fbd3c463f016a0d8bee62f8d3e88e553600801fae00c97dd3a57ae0dc955fe1e3804250cdaa553a94d5316bb35b3f4cab8
 DIST gtkada-gpl-2016-src.tgz 11944697 SHA256 263cc8323e726ae22946508792dd719ff266a9e847a4f7c95e27bd13d3fb4d8f SHA512 90912e15d9e22574a3d86e8bd052d4ce0a0d8018386f699dc1ce3c345978e9b3ddc7bdd3e4247a264496c5da7cff6ae68589a02f43193fc957c418e2a8ef63c7 WHIRLPOOL fc12f151c65ccef5d23b520cfc0625606ece06e56ed2d5b28e39bd65e51850d9b5c40e7382207f1d9186f93ce9232f6024bec977af6973163eb6603178dc1a30
+DIST gtkada-gpl-2017-src.tgz 11952333 SHA256 545a125dd41cce2a5e4aeeefbd9538e9e8c7aecbe39c106d27078eb5a649b5f0 SHA512 f5bbb9ebdd966e70b3edcaaf359cb9e75edba3c3f4f8febfa7de9f634f8e96cd0dd1482fb16ad852b1c9f9b0e2c16eb3a437120d37f0638d90af666620f09f3f WHIRLPOOL 69a05d9e8cd956681951a7adeb5eedd5b13f8d403f5fd0f2473e1f2f4579676314cfa7aac81631fe0e8f68362cdb09dde685b8b2bf30801c38f82ae7ba484b88
diff --git a/dev-ada/gtkada/files/gtkada-17.0-gentoo.patch b/dev-ada/gtkada/files/gtkada-17.0-gentoo.patch
deleted file mode 100644
index fbc2cefac533..000000000000
--- a/dev-ada/gtkada/files/gtkada-17.0-gentoo.patch
+++ /dev/null
@@ -1,85 +0,0 @@
---- gtkada-gpl-2015-src/shared.gpr.in.old	2017-01-05 23:28:35.838073270 +0100
-+++ gtkada-gpl-2015-src/shared.gpr.in	2017-01-05 23:30:17.752255709 +0100
-@@ -44,6 +44,8 @@
-              for Switches ("C") use ("-O2");
-       end case;
- 
-+      for Driver ("C") use External ("CC", "gcc");
-+      for PIC_Option ("C") use ("-fPIC");
-       for Switches ("C") use Compiler'Switches ("C") & Gtk_Include;
-       for Switches ("Objective-C") use Compiler'Switches ("Objective-C") & Gtk_Include;
-    end Compiler;
---- gtkada-gpl-2016-src/Makefile.in.old	2017-01-21 22:42:18.319969095 +0100
-+++ gtkada-gpl-2016-src/Makefile.in	2017-01-21 22:42:33.989700236 +0100
-@@ -39,7 +39,7 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
- libdir=@libdir@
--datadir=@datadir@
-+datadir=$(DESTDIR)@datadir@
- datarootdir=@datarootdir@
- exampledir=${datadir}/examples/gtkada/testgtk
- 
-@@ -60,30 +60,33 @@
- LIBRARY_TYPE_FOR_TOOLS=static
- endif
- 
--all: tools tests
-+all: tools
- static: build_library_type/static
- relocatable: build_library_type/relocatable
- 
- tools:
- 	@echo "====== Building tools ====="
--	${GPRBUILD_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) -Psrc/tools/tools.gpr
-+	${GPRBUILD_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) \
-+	  -Psrc/tools/tools.gpr -cargs:Ada $(ADAFLAGS)
- 
- build_library_type/%:  src/gtkada-intl.adb
- 	@echo "====== Building $(@F) libraries ====="
--	${GPRBUILD_FULL} -XLIBRARY_TYPE=$(@F) -Psrc/gtkada.gpr
-+	${GPRBUILD_FULL} -XLIBRARY_TYPE=$(@F) -Psrc/gtkada.gpr \
-+	  -cargs:Ada $(ADAFLAGS) -cargs:C $(CFLAGS)
- ifeq (${HAVE_OPENGL}, True)
- 	${GPRBUILD_FULL} -XLIBRARY_TYPE=$(@F) -Psrc/opengl/gtkada_gl.gpr
- endif
- 
- src/gtkada-intl.adb: src/gtkada-intl.gpb Makefile
--	gnatprep -DGETTEXT_INTL=$(GETTEXT_INTL) -DHAVE_GETTEXT=$(HAVE_GETTEXT) src/gtkada-intl.gpb $@
-+	$(GNATPREP) -DGETTEXT_INTL=$(GETTEXT_INTL) -DHAVE_GETTEXT=$(HAVE_GETTEXT) src/gtkada-intl.gpb $@
- 
- testgtk/opengl/view_gl.adb: testgtk/opengl/view_gl.gpb Makefile
--	gnatprep -r -c -DHAVE_GL=${HAVE_OPENGL} -DWIN32=False testgtk/opengl/view_gl.gpb $@
-+	$(GNATPREP) -r -c -DHAVE_GL=${HAVE_OPENGL} -DWIN32=False testgtk/opengl/view_gl.gpb $@
- 
- tests: testgtk/opengl/view_gl.adb
- 	@echo "====== Building tests ====="
--	cd testgtk; ${GPRBUILD_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) -Ptestgtk.gpr -aP ../src
-+	cd testgtk; ${GPRBUILD_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) \
-+	  -Ptestgtk.gpr -aP ../src -cargs:Ada $(ADAFLAGS)
- 
- install/%: force
- 	${GPRINSTALL_FULL} -XLIBRARY_TYPE=$(@F) --build-name=$(@F) \
-@@ -96,7 +96,7 @@
- ifeq (${HAVE_OPENGL}, True)
- 	${GPRINSTALL_FULL} -XLIBRARY_TYPE=$(@F) --build-name=$(@F) \
- 		--sources-subdir=include/gtkada/gtkada_gl.$(@F) \
--		--lib-subdir=${libdir}/gtkada/gtkada_gl.$(@F) \
-+		--lib-subdir=lib/gtkada/gtkada_gl.$(@F) \
- 		-Psrc/opengl/gtkada_gl.gpr
- endif
- 
-@@ -118,12 +118,9 @@
- 		--project-subdir=lib/gnat gtkada
- endif
- 
--install: install-clean
-+install:
- 	${GPRINSTALL_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) \
- 		--mode=usage -Psrc/tools/tools.gpr
--	cd testgtk; ${GPRINSTALL_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) \
--		--mode=usage --exec-subdir=${DESTDIR}${exampledir} \
--		-Ptestgtk.gpr -aP ../src
- 
- 	@echo '-----------------------------------------------------------------------'
- 	@echo '--  GtkAda has now been installed.                                   --'
diff --git a/dev-ada/gtkada/files/gtkada-2016-gentoo.patch b/dev-ada/gtkada/files/gtkada-2016-gentoo.patch
index a9550fe883f3..808b07dfdfaf 100644
--- a/dev-ada/gtkada/files/gtkada-2016-gentoo.patch
+++ b/dev-ada/gtkada/files/gtkada-2016-gentoo.patch
@@ -11,15 +11,6 @@
     end Compiler;
 --- gtkada-gpl-2016-src/Makefile.in.old	2017-01-21 22:42:18.319969095 +0100
 +++ gtkada-gpl-2016-src/Makefile.in	2017-01-21 22:42:33.989700236 +0100
-@@ -39,7 +39,7 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
- libdir=@libdir@
--datadir=@datadir@
-+datadir=$(DESTDIR)@datadir@
- datarootdir=@datarootdir@
- exampledir=${datadir}/examples/gtkada/testgtk
- 
 @@ -60,30 +60,33 @@
  LIBRARY_TYPE_FOR_TOOLS=static
  endif
diff --git a/dev-ada/gtkada/files/gtkada-9999-gentoo.patch b/dev-ada/gtkada/files/gtkada-2017-gentoo.patch
index 8b0f82e95728..ec8ebdf8f601 100644
--- a/dev-ada/gtkada/files/gtkada-9999-gentoo.patch
+++ b/dev-ada/gtkada/files/gtkada-2017-gentoo.patch
@@ -4,22 +4,13 @@
               for Switches ("C") use ("-O2");
        end case;
  
-+      for Driver ("C") use External ("CC", "gcc");
++      for Driver ("C") use External ("GCC", "gcc");
 +      for PIC_Option ("C") use ("-fPIC");
        for Switches ("C") use Compiler'Switches ("C") & Gtk_Include;
        for Switches ("Objective-C") use Compiler'Switches ("Objective-C") & Gtk_Include;
     end Compiler;
 --- gtkada-gpl-2016-src/Makefile.in.old	2017-01-21 22:42:18.319969095 +0100
 +++ gtkada-gpl-2016-src/Makefile.in	2017-01-21 22:42:33.989700236 +0100
-@@ -39,7 +39,7 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
- libdir=@libdir@
--datadir=@datadir@
-+datadir=$(DESTDIR)@datadir@
- datarootdir=@datarootdir@
- exampledir=${datadir}/examples/gtkada/testgtk
- 
 @@ -60,30 +60,33 @@
  LIBRARY_TYPE_FOR_TOOLS=static
  endif
@@ -32,13 +23,13 @@
  tools:
  	@echo "====== Building tools ====="
 -	${GPRBUILD_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) -Psrc/tools/tools.gpr
-+	${GPRBUILD_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) \
++	${GPRBUILD_FULL} -v -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) \
 +	  -Psrc/tools/tools.gpr -cargs:Ada $(ADAFLAGS)
  
  build_library_type/%:  src/gtkada-intl.adb
  	@echo "====== Building $(@F) libraries ====="
 -	${GPRBUILD_FULL} -XLIBRARY_TYPE=$(@F) -Psrc/gtkada.gpr
-+	${GPRBUILD_FULL} -XLIBRARY_TYPE=$(@F) -Psrc/gtkada.gpr \
++	${GPRBUILD_FULL} -v -XLIBRARY_TYPE=$(@F) -Psrc/gtkada.gpr \
 +	  -cargs:Ada $(ADAFLAGS) -cargs:C $(CFLAGS)
  ifeq (${HAVE_OPENGL}, True)
  	${GPRBUILD_FULL} -XLIBRARY_TYPE=$(@F) -Psrc/opengl/gtkada_gl.gpr
@@ -55,17 +46,13 @@
  tests: testgtk/opengl/view_gl.adb
  	@echo "====== Building tests ====="
 -	cd testgtk; ${GPRBUILD_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) -Ptestgtk.gpr -aP ../src
-+	cd testgtk; ${GPRBUILD_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) \
++	cd testgtk; ${GPRBUILD_FULL} -v -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) \
 +	  -Ptestgtk.gpr -aP ../src -cargs:Ada $(ADAFLAGS)
  
  install/%: force
  	${GPRINSTALL_FULL} -XLIBRARY_TYPE=$(@F) --build-name=$(@F) \
-@@ -118,12 +118,9 @@
- 		--project-subdir=lib/gnat gtkada
- endif
- 
--install: install-clean
-+install:
+@@ -121,9 +121,6 @@
+ install: install-clean
  	${GPRINSTALL_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) \
  		--mode=usage -Psrc/tools/tools.gpr
 -	cd testgtk; ${GPRINSTALL_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) \
diff --git a/dev-ada/gtkada/gtkada-2016.ebuild b/dev-ada/gtkada/gtkada-2016.ebuild
index 8f9e4adc92c9..6ca105eb3655 100644
--- a/dev-ada/gtkada/gtkada-2016.ebuild
+++ b/dev-ada/gtkada/gtkada-2016.ebuild
@@ -15,9 +15,10 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/5739985fc7a447658e0affae
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="+shared static"
+IUSE="gnat_2016 gnat_2017 +shared static"
 
-RDEPEND="dev-lang/gnat-gpl:*
+RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
+	gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )
 	dev-libs/atk
 	dev-libs/glib:2
 	media-libs/fontconfig
@@ -27,23 +28,12 @@ RDEPEND="dev-lang/gnat-gpl:*
 	x11-libs/gtk+:3
 	x11-libs/pango"
 DEPEND="${RDEPEND}
-	dev-ada/gprbuild"
+	dev-ada/gprbuild[gnat_2016=,gnat_2017=]"
 
 S="${WORKDIR}"/${MYP}-src
 
 PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
 
-pkg_setup() {
-	GCC=${ADA:-$(tc-getCC)}
-	export GNATPREP="${GCC/gcc/gnatprep}"
-	if [[ -z "$(type ${GNATPREP} 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_prepare() {
 	default
 	mv configure.{in,ac}
@@ -51,19 +41,25 @@ src_prepare() {
 }
 
 src_configure() {
+	if use gnat_2016; then
+		GCC_PV=4.9.4
+	else
+		GCC_PV=6.3.0
+	fi
+	GCC=${CHOST}-gcc-${GCC_PV}
 	econf \
+		--prefix="${D}/usr" \
 		$(use_enable static) \
 		$(use_enable shared) \
 		--without-GL
 }
 
 src_compile() {
-	GCC=${GCC} emake -j1 PROCESSORS=$(makeopts_jobs)
+	GNATPREP=${CHOST}-gnatprep-${GCC_PV}
+	GCC=${GCC} emake -j1 GNATPREP=${GNATPREP} PROCESSORS=$(makeopts_jobs)
 }
 
 src_install() {
-	emake -j1 DESTDIR="${D}" install
+	emake -j1 install
 	einstalldocs
-	mv "${D}"usr/share/doc/${PN}/* "${D}"usr/share/doc/${PF} || die
-	rmdir "${D}"usr/share/doc/${PN}
 }
diff --git a/dev-ada/gtkada/gtkada-17.0.ebuild b/dev-ada/gtkada/gtkada-2017.ebuild
index 850f59599370..659aacbe7b77 100644
--- a/dev-ada/gtkada/gtkada-17.0.ebuild
+++ b/dev-ada/gtkada/gtkada-2017.ebuild
@@ -5,16 +5,20 @@ EAPI=6
 
 inherit autotools multiprocessing
 
+MYP=${PN}-gpl-${PV}
+
 DESCRIPTION="A complete Ada graphical toolkit"
 HOMEPAGE="http://libre.adacore.com//tools/gtkada/"
-SRC_URI="https://github.com/AdaCore/gtkada/archive/${P}.tar.gz"
+SRC_URI="http://mirrors.cdn.adacore.com/art/591ae7a8c7a4473fcbb154c9
+	-> ${MYP}-src.tgz"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="+shared static"
+IUSE="gnat_2016 gnat_2017 +shared static"
 
-RDEPEND="dev-lang/gnat-gpl:*
+RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
+	gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )
 	dev-libs/atk
 	dev-libs/glib:2
 	media-libs/fontconfig
@@ -24,23 +28,12 @@ RDEPEND="dev-lang/gnat-gpl:*
 	x11-libs/gtk+:3
 	x11-libs/pango"
 DEPEND="${RDEPEND}
-	dev-ada/gprbuild"
+	dev-ada/gprbuild[gnat_2016=,gnat_2017=]"
 
-S="${WORKDIR}"/${PN}-${P}
+S="${WORKDIR}"/${MYP}-src
 
 PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
 
-pkg_setup() {
-	GCC=${ADA:-$(tc-getCC)}
-	export GNATPREP="${GCC/gcc/gnatprep}"
-	if [[ -z "$(type ${GNATPREP} 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_prepare() {
 	default
 	mv configure.{in,ac}
@@ -48,17 +41,25 @@ src_prepare() {
 }
 
 src_configure() {
+	if use gnat_2016; then
+		GCC_PV=4.9.4
+	else
+		GCC_PV=6.3.0
+	fi
+	GCC=${CHOST}-gcc-${GCC_PV}
 	econf \
+		--prefix="${D}/usr" \
 		$(use_enable static) \
 		$(use_enable shared) \
 		--without-GL
 }
 
 src_compile() {
-	GCC=${GCC} emake -j1 PROCESSORS=$(makeopts_jobs)
+	GNATPREP=${CHOST}-gnatprep-${GCC_PV}
+	GCC=${GCC} emake -j1 GNATPREP=${GNATPREP} PROCESSORS=$(makeopts_jobs)
 }
 
 src_install() {
-	emake -j1 DESTDIR="${D}" install
+	emake -j1 install
 	einstalldocs
 }
diff --git a/dev-ada/gtkada/gtkada-9999.ebuild b/dev-ada/gtkada/gtkada-9999.ebuild
deleted file mode 100644
index 9d4e1b093c5f..000000000000
--- a/dev-ada/gtkada/gtkada-9999.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools multiprocessing git-r3
-
-DESCRIPTION="A complete Ada graphical toolkit"
-HOMEPAGE="http://libre.adacore.com//tools/gtkada/"
-SRC_URI=""
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS=""
-IUSE="+shared static"
-
-RDEPEND="dev-lang/gnat-gpl:*
-	dev-libs/atk
-	dev-libs/glib:2
-	media-libs/fontconfig
-	media-libs/freetype
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3
-	x11-libs/pango"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild"
-
-EGIT_REPO_URI="https://github.com/AdaCore/gtkada.git"
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-pkg_setup() {
-	GCC=${ADA:-$(tc-getCC)}
-	export GNATPREP="${GCC/gcc/gnatprep}"
-	if [[ -z "$(type ${GNATPREP} 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_prepare() {
-	default
-	mv configure.{in,ac}
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable static) \
-		$(use_enable shared) \
-		--without-GL
-}
-
-src_compile() {
-	GCC=${GCC} emake -j1 PROCESSORS=$(makeopts_jobs)
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install
-	einstalldocs
-}
diff --git a/dev-ada/gtkada/metadata.xml b/dev-ada/gtkada/metadata.xml
index 520b5b59b812..ba0f05fc23e8 100644
--- a/dev-ada/gtkada/metadata.xml
+++ b/dev-ada/gtkada/metadata.xml
@@ -6,6 +6,8 @@
 		<name>Tupone Alfredo</name>
 	</maintainer>
 	<use>
+		<flag name="gnat_2016">Compile with dev-lang/gnat-gpl-2016</flag>
+		<flag name="gnat_2017">Compile with dev-lang/gnat-gpl-2017</flag>
 		<flag name="shared">Build gtkada as shared library</flag>
 		<flag name="static">Build gtkada as static library</flag>
 	</use>