gentoo resync : 15.02.2018

5 files changed, 7 insertions, 167 deletions

diff --git a/dev-ada/gtkada/Manifest b/dev-ada/gtkada/Manifest
index 2d0f8258eb22..68b8c2577112 100644
--- a/dev-ada/gtkada/Manifest
+++ b/dev-ada/gtkada/Manifest
@@ -1,7 +1,4 @@
-AUX gtkada-2016-gentoo.patch 3728 BLAKE2B 8f05c4591d267e4e383f052e691876df915aad52a22b6305a7f338fbbf5063b0620c2bfb97a023570dbef0781d891299da65e165481d304e28e710eca8e93656 SHA512 8e8815173496f7ebc795e8b20e19f88f50a726cca3657b5798cd7cd613c0196aea4c63daa2874c36d5a039e5b6cc26c67d0003c47ddcf8ca6e9c28dd8a58bf4b
 AUX gtkada-2017-gentoo.patch 2777 BLAKE2B bd13bd4458296c2e40ae7c769a1e1422123638d494d7ee3fb168a72e06a6344876fef0b4745744e6ec02b91c17b4fdff156f045233b47eb22aa8e836bc407a2a SHA512 0027d42e41ee1e754bf54982c5bd31b6fc5a113e9a5e7aed95868ac956097f3226b073721d4a5ccb9dc8d82600089720a72162b02910d6c8afcdfb2ea8ec4b13
-DIST gtkada-gpl-2016-src.tgz 11944697 BLAKE2B 61760bad9417ef76a8d3779b1fd67cfaf8ec9c1427871ae8152226a5d3a75862a4b4a72480a1d5a1b60ceb06444e89d37440ca5368f954de6a9ba26ac17bef02 SHA512 90912e15d9e22574a3d86e8bd052d4ce0a0d8018386f699dc1ce3c345978e9b3ddc7bdd3e4247a264496c5da7cff6ae68589a02f43193fc957c418e2a8ef63c7
 DIST gtkada-gpl-2017-src.tgz 11952333 BLAKE2B 2a333452ff271bba0521235598afdb1abebc4ceeab0f915f173862329ae0986b0fc4f654d3df28eac73af075db224c0b12340c3acd1e4ed0ffc965e4365f8b40 SHA512 f5bbb9ebdd966e70b3edcaaf359cb9e75edba3c3f4f8febfa7de9f634f8e96cd0dd1482fb16ad852b1c9f9b0e2c16eb3a437120d37f0638d90af666620f09f3f
-EBUILD gtkada-2016.ebuild 1269 BLAKE2B 3c2772faa6a43f7f1ac0e19f1d50b0a840382f2b85280c9d4f446069d8625e71a1d863202cc6f246e327b0e07499800d11242b42c002d7407187a4c119d9620c SHA512 32a327fa14ec2f7a4e658356d8af7cff460cd7faa6b2dd8d20ae593be5689f9bd8824047b0d034b32833fc978b66290cb2b584730828615f87ee9af18116f689
-EBUILD gtkada-2017.ebuild 1269 BLAKE2B 0d9ff1fe178b4804a14cca0f373e938400fbd91004af7184b915ec12bd62e36ce1dbf11d783f349b78ab6f8d65a0d85a62a6ed4803d9a77721f5d1f6cb9369cc SHA512 c82beb455477b41b485a6c8b1dfa34f50d94112f649f205f0c8b3411c637caa9dd9fc84d90d68fce61e95febdf9a504cbda57999739a6cbebcfc84f99f908d78
-MISC metadata.xml 764 BLAKE2B dfc39e0e4fa7b9919f02f67680bdd5c5afa200a45102184b8aa760291694a20431798b5de06b87bbc366590ff7b49dfc5114f466b219bff6c9a1e4abc01344a7 SHA512 96d85d1f4ddc06554fd4fb8572bf55b2bb880423c9813f00a69d7211bf9b441e84feac1e19c04cb99a54396ac220e9d79cdc441e4c10de5805487baebcee0e64
+EBUILD gtkada-2017.ebuild 1330 BLAKE2B 33c5f296517fe9ccca131534489449b53dc1eb4980904ccbc3e460bfd45c214456c8ca50c662ba98e123f52347bbab21241632de14505a0b617d5fa8d2df895a SHA512 c9eb4add40823dd56cfdea7bfb7388bd506f6802c211d610f14241491119ec5a461b5fe24dd75a948a8b9537414f5548ed581e8d594df58d9cf863310f28bfb5
+MISC metadata.xml 704 BLAKE2B 3dd587570234d4bca6f818611011ff14c2a009d1078dba153bbe9fb1071b3962201ddde374176d4492f7066e978366a1ca1dd030b36c000b7f71281c4b407cac SHA512 3139597952f51ad23e7bdc4dfb49aec1b040016e60d1cb83319388146a503b4ca59a16c800548b32ef41987e631d06103360925c598c8cee2805bd84623e9b52
diff --git a/dev-ada/gtkada/files/gtkada-2016-gentoo.patch b/dev-ada/gtkada/files/gtkada-2016-gentoo.patch
deleted file mode 100644
index 808b07dfdfaf..000000000000
--- a/dev-ada/gtkada/files/gtkada-2016-gentoo.patch
+++ /dev/null
@@ -1,93 +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 ("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
-@@ -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} -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} -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
- 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} -v -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
- 
-@@ -106,12 +106,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=${exampledir} \
--		-Ptestgtk.gpr -aP ../src
- 
- 	@echo '-----------------------------------------------------------------------'
- 	@echo '--  GtkAda has now been installed.                                   --'
---- gtkada-gpl-2016-src/src/gtkada.gpr.old	2017-05-31 14:21:35.007965274 +0200
-+++ gtkada-gpl-2016-src/src/gtkada.gpr	2017-05-31 14:23:16.597315577 +0200
-@@ -41,7 +41,13 @@
-    for Library_Name use "gtkada";
-    for Library_Version use
-       "lib" & Project'Library_Name & Shared.So_Ext & "." & Version;
--   for Library_Options use Shared.Gtk_Libs;
-+
-+   case Shared.Library_Kind is
-+      when "relocatable" =>
-+         for Library_Options use Shared.Gtk_Libs;
-+      when others =>
-+         null;
-+   end case;
- 
-    package Builder  renames Shared.Builder;
-    package Naming   renames Shared.Naming;
diff --git a/dev-ada/gtkada/gtkada-2016.ebuild b/dev-ada/gtkada/gtkada-2016.ebuild
deleted file mode 100644
index 6ca105eb3655..000000000000
--- a/dev-ada/gtkada/gtkada-2016.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools multiprocessing
-
-MYP=${PN}-gpl-${PV}
-
-DESCRIPTION="A complete Ada graphical toolkit"
-HOMEPAGE="http://libre.adacore.com//tools/gtkada/"
-SRC_URI="http://mirrors.cdn.adacore.com/art/5739985fc7a447658e0affae
-	-> ${MYP}-src.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="gnat_2016 gnat_2017 +shared static"
-
-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
-	media-libs/freetype
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3
-	x11-libs/pango"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2016=,gnat_2017=]"
-
-S="${WORKDIR}"/${MYP}-src
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_prepare() {
-	default
-	mv configure.{in,ac}
-	eautoreconf
-}
-
-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() {
-	GNATPREP=${CHOST}-gnatprep-${GCC_PV}
-	GCC=${GCC} emake -j1 GNATPREP=${GNATPREP} PROCESSORS=$(makeopts_jobs)
-}
-
-src_install() {
-	emake -j1 install
-	einstalldocs
-}
diff --git a/dev-ada/gtkada/gtkada-2017.ebuild b/dev-ada/gtkada/gtkada-2017.ebuild
index 659aacbe7b77..aed9663db246 100644
--- a/dev-ada/gtkada/gtkada-2017.ebuild
+++ b/dev-ada/gtkada/gtkada-2017.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/591ae7a8c7a4473fcbb154c9
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="gnat_2016 gnat_2017 +shared static"
+IUSE="gnat_2016 +gnat_2017 +shared static-libs"
 
 RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
 	gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )
@@ -30,6 +30,8 @@ RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
 DEPEND="${RDEPEND}
 	dev-ada/gprbuild[gnat_2016=,gnat_2017=]"
 
+REQUIRED_USE="^^ ( gnat_2016 gnat_2017 )"
+
 S="${WORKDIR}"/${MYP}-src
 
 PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
@@ -49,7 +51,7 @@ src_configure() {
 	GCC=${CHOST}-gcc-${GCC_PV}
 	econf \
 		--prefix="${D}/usr" \
-		$(use_enable static) \
+		$(use_enable static-libs static) \
 		$(use_enable shared) \
 		--without-GL
 }
diff --git a/dev-ada/gtkada/metadata.xml b/dev-ada/gtkada/metadata.xml
index 1b27068850f3..e26ee639a2da 100644
--- a/dev-ada/gtkada/metadata.xml
+++ b/dev-ada/gtkada/metadata.xml
@@ -9,7 +9,6 @@
 		<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>
 	<longdescription lang="en">
 		GtkAda is an Ada graphical toolkit based on Gtk+, providing the complete set of Gtk+ widgets using the Object-Oriented features of this language. GtkAda supports the latest 3.14 stable releases.