public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-ada/gnatcoll/files/, dev-ada/gnatcoll/
@ 2017-04-05  9:27 Alfredo Tupone
  0 siblings, 0 replies; 10+ messages in thread
From: Alfredo Tupone @ 2017-04-05  9:27 UTC (permalink / raw
  To: gentoo-commits

commit:     04bd2b8c8a865af6b206fecc17de73c890b8fac6
Author:     Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  5 09:27:26 2017 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Wed Apr  5 09:27:26 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04bd2b8c

dev-ada/gnatcoll: Added 2016 version of GNAT Component Collection

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-ada/gnatcoll/Manifest                         |   1 +
 dev-ada/gnatcoll/files/gnatcoll-2016-gentoo.patch | 149 ++++++++++++++++++++++
 dev-ada/gnatcoll/gnatcoll-2016.ebuild             |  83 ++++++++++++
 dev-ada/gnatcoll/metadata.xml                     |  20 +++
 4 files changed, 253 insertions(+)

diff --git a/dev-ada/gnatcoll/Manifest b/dev-ada/gnatcoll/Manifest
new file mode 100644
index 00000000000..e3d320cc8a1
--- /dev/null
+++ b/dev-ada/gnatcoll/Manifest
@@ -0,0 +1 @@
+DIST gnatcoll-gpl-2016-src.tar.gz 5687584 SHA256 8cc7cc01db548447a78e3d6d35a35867514beb625009abbcd3be124c1e259b3b SHA512 8cf06e7c5d58d3b159855534791e7969882e04856ba9d03982a63dcfc630f5b5910c6cad57fec9b00c3d04008b0cb0a1fb238e349766348fa4548868238ede8a WHIRLPOOL d37c12bb6242d92104e89b7c1d9a9cd94d802137ee32faa58687700a822db69e2739372376d12032228843c2a5356f8085d6072715b8bc1bda411039d20b55f5

diff --git a/dev-ada/gnatcoll/files/gnatcoll-2016-gentoo.patch b/dev-ada/gnatcoll/files/gnatcoll-2016-gentoo.patch
new file mode 100644
index 00000000000..0d3d958c791
--- /dev/null
+++ b/dev-ada/gnatcoll/files/gnatcoll-2016-gentoo.patch
@@ -0,0 +1,149 @@
+--- gnatcoll-gpl-2016-src/Makefile.old	2017-01-20 19:39:07.131398270 +0100
++++ gnatcoll-gpl-2016-src/Makefile	2017-01-20 19:42:30.088728844 +0100
+@@ -34,19 +36,19 @@
+ 	@${RM} src/gnatcoll-atomic.adb
+ 
+ 	@echo "====== Building $(@F) libraries ======"
+-	${GPRBUILD} ${GPRBLD_OPTS} -Pgnatcoll_full
++	${GPRBUILD} ${GPRBLD_OPTS} -Pgnatcoll_full -cargs ${ADAFLAGS}
+ 
+ 	@# Need to build libgnatcoll_gtk separately, because its project files
+ 	@# requires gtkada.gpr, which might not exist on the machine.
+ ifeq (${WITH_GTK},yes)
+-	${GPRBUILD} ${GPRBLD_OPTS} -Psrc/gnatcoll_gtk
++	${GPRBUILD} ${GPRBLD_OPTS} -Psrc/gnatcoll_gtk -cargs ${ADAFLAGS}
+ endif
+ 
+ 	@# Build the tools (the list is the project\'s Main attribute)
+ 	@# They are not build as part of the above because only the Main from
+ 	@# gnatcoll_full.gpr are build. We could use aggregate projects to
+ 	@# speed things up.
+-	${GPRBUILD} ${GPRBLD_OPTS} -q -Psrc/gnatcoll_tools
++	${GPRBUILD} ${GPRBLD_OPTS} -q -Psrc/gnatcoll_tools -cargs ${ADAFLAGS}
+ 
+ #######################################################################
+ #  install
+@@ -53,7 +53,7 @@
+ #######################################################################
+ #  install
+ 
+-GPRINST_OPTS=-p -f --prefix=${prefix} --install-name=gnatcoll \
++GPRINST_OPTS=-p -f --prefix=$(DESTDIR)${prefix} --install-name=gnatcoll \
+ 	--exec-subdir=${bindir} --project-subdir=lib/gnat \
+ 	--build-var=LIBRARY_TYPE --build-name=$(@F) -XLIBRARY_TYPE=$(@F)
+ 
+@@ -73,9 +73,9 @@
+ 	${GPRINSTALL} --mode=usage ${GPRINST_OPTS} -Psrc/gnatcoll_tools
+ 
+ install_gps_plugin: force
+-	mkdir -p $(prefix)/share/gps/plug-ins
++	mkdir -p $(DESTDIR)$(prefix)/share/gps/plug-ins
+ 	(cd distrib/ ; tar cf - gnatcoll) | \
+-          (cd $(prefix)/share/gps/plug-ins ; tar xf -)
++          (cd $(DESTDIR)$(prefix)/share/gps/plug-ins ; tar xf -)
+ 
+ # Regenerate part of the sources. Unfortunately, this can be run only after
+ # we have build GNATCOLL, and then its tools, even though GNATCOLL itself
+--- gnatcoll-gpl-2015-src/src/gnatcoll_gmp.gpr.in.old	2017-01-07 08:52:14.921110195 +0100
++++ gnatcoll-gpl-2015-src/src/gnatcoll_gmp.gpr.in	2017-01-07 08:55:35.718946607 +0100
+@@ -24,6 +24,7 @@
+ 
+    package Compiler is
+       for Switches ("Ada") use Gnatcoll_Shared.Compiler'Switches ("Ada");
++      for Driver ("C") use External ("CC", "gcc");
+       for Switches ("C") use Gnatcoll_Shared.Compiler'Switches ("C")
+         & (@GMP_CFLAGS_GPR@);
+    end Compiler;
+--- gnatcoll-gpl-2015-src/src/gnatcoll_iconv.gpr.old	2017-01-07 08:58:01.361112843 +0100
++++ gnatcoll-gpl-2015-src/src/gnatcoll_iconv.gpr	2017-01-07 08:58:23.653687385 +0100
+@@ -26,6 +26,7 @@
+ 
+    package Compiler is
+       for Switches ("Ada") use GnatColl_Shared.Compiler'Switches ("Ada");
++      for Driver ("C") use External ("CC", "gcc");
+       for Switches ("C") use GnatColl_Shared.Compiler'Switches ("C")
+           & GnatColl_Shared.Iconv_Include;
+    end Compiler;
+--- gnatcoll-gpl-2015-src/src/gnatcoll_sqlite.gpr.old	2017-01-07 09:00:17.146448202 +0100
++++ gnatcoll-gpl-2015-src/src/gnatcoll_sqlite.gpr	2017-01-07 09:00:44.884885281 +0100
+@@ -60,8 +60,9 @@
+ 
+                   --  force full optimization for sqlite, we do not debug it
+                   --  in any case.
+-                  "-O3") & Gnatcoll_Shared.Sqlite_Switches;
++                  "-O3", "-fPIC") & Gnatcoll_Shared.Sqlite_Switches;
+       end case;
++      for Driver ("C") use External ("CC", "gcc");
+    end Compiler;
+ 
+    package Linker is
+--- gnatcoll-gpl-2015-src/src/gnatcoll_postgres.gpr.old	2017-01-07 09:05:09.177756146 +0100
++++ gnatcoll-gpl-2015-src/src/gnatcoll_postgres.gpr	2017-01-07 09:05:34.282279733 +0100
+@@ -38,6 +38,7 @@
+            for Switches ("C") use
+               GnatColl_Shared.Compiler'Switches ("C");
+       end case;
++      for Driver ("C") use External ("CC", "gcc");
+    end Compiler;
+ 
+    package Linker is
+--- gnatcoll-gpl-2015-src/src/gnatcoll_python.gpr.in.old	2017-01-07 09:12:30.490399897 +0100
++++ gnatcoll-gpl-2015-src/src/gnatcoll_python.gpr.in	2017-01-07 09:12:53.111976591 +0100
+@@ -30,7 +30,8 @@
+         GnatColl_Shared.Compiler'Switches ("Ada");
+ 
+       for Switches ("C") use
+-        ("-g", "-O2") & GnatColl_Shared.Python_Cflags;
++        ("-g", "-O2", "-fPIC") & GnatColl_Shared.Python_Cflags;
++      for Driver ("C") use External ("CC", "gcc");
+    end Compiler;
+ 
+    package Linker is
+--- gnatcoll-gpl-2016-src/gnatcoll_shared.gpr.in.old	2017-01-20 19:50:03.222808656 +0100
++++ gnatcoll-gpl-2016-src/gnatcoll_shared.gpr.in	2017-01-20 19:50:28.200399274 +0100
+@@ -67,7 +67,7 @@
+ 
+          when "Production" =>
+             for Switches ("Ada") use ("-O2", "-gnatn", "-gnatws");
+-            for Switches ("C") use ("-O2", "-Wunreachable-code");
++            for Switches ("C") use ("-O2", "-Wunreachable-code", "-fPIC");
+       end case;
+ 
+       case Syslog is
+--- gnatcoll-gpl-2016-src/src/gnatcoll_gtk.gpr.in.old	2017-01-20 19:53:16.647607400 +0100
++++ gnatcoll-gpl-2016-src/src/gnatcoll_gtk.gpr.in	2017-01-20 19:53:57.302925708 +0100
+@@ -63,11 +63,12 @@
+       for Switches ("Ada") use GnatColl_Shared.Compiler'Switches ("Ada");
+ 
+       for Switches ("C") use
+-        ("-g", "-O2")
++        ("-g", "-O2", "-fPIC")
+         & GnatColl_Shared.Python_Cflags
+         & GnatColl_Shared.Pygtk_Include
+         & GnatColl_Shared.PyGobject_Include
+         & Gtk_Include;
++      for Driver ("C") use External ("CC", "gcc");
+    end Compiler;
+ 
+    package Linker is
+--- gnatcoll-gpl-2016-src/src/gnatcoll__libgpr.gpr.old	2017-02-04 15:56:11.685079607 +0100
++++ gnatcoll-gpl-2016-src/src/gnatcoll__libgpr.gpr	2017-02-04 15:57:00.383221978 +0100
+@@ -49,6 +49,8 @@
+    package Builder renames GnatColl_Shared.Builder;
+ 
+    package Compiler is
++      for Driver ("C") use External ("CC", "gcc");
++
+       for Switches ("Ada") use GnatColl_Shared.Compiler'Switches ("Ada");
+       for Switches ("C") use GnatColl_Shared.Compiler'Switches ("C");
+       for Switches ("sinfo.adb") use Compiler'Switches ("Ada") & ("-gnatg");
+--- gnatcoll-gpl-2016-src/src/gnatcoll__nogpr.gpr.old	2017-02-04 15:58:41.008450044 +0100
++++ gnatcoll-gpl-2016-src/src/gnatcoll__nogpr.gpr	2017-02-04 15:59:02.815066080 +0100
+@@ -64,6 +64,7 @@
+       for Switches ("Ada") use GnatColl_Shared.Compiler'Switches ("Ada");
+       for Switches ("C") use GnatColl_Shared.Compiler'Switches ("C");
+       for Switches ("sinfo.adb") use Compiler'Switches ("Ada") & ("-gnatg");
++      for Driver ("C") use External ("CC", "gcc");
+ 
+       case GnatColl_Shared.Atomics is
+          when "intrinsic" =>

diff --git a/dev-ada/gnatcoll/gnatcoll-2016.ebuild b/dev-ada/gnatcoll/gnatcoll-2016.ebuild
new file mode 100644
index 00000000000..671fcafa583
--- /dev/null
+++ b/dev-ada/gnatcoll/gnatcoll-2016.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib multiprocessing
+
+MYP=${PN}-gpl-${PV}
+
+DESCRIPTION="GNAT Component Collection"
+HOMEPAGE="http://libre.adacore.com"
+SRC_URI="http://mirrors.cdn.adacore.com/art/5739942ac7a447658d00e1e7 -> ${MYP}-src.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="gmp iconv postgresql projects pygobject python readline +shared sqlite static syslog"
+
+RDEPEND="dev-lang/gnat-gpl
+	gmp? ( dev-libs/gmp:* )
+	postgresql? ( dev-db/postgresql:* )
+	pygobject? (
+	|| (
+		dev-python/pygobject:2
+		dev-python/pygobject:3
+		)
+	)
+	python? ( dev-lang/python:2.7 )
+	sqlite? ( dev-db/sqlite )
+	projects? (
+		dev-ada/gprbuild[static?]
+		dev-ada/gprbuild[shared?]
+	)"
+DEPEND="${RDEPEND}
+	dev-ada/gprbuild"
+
+S="${WORKDIR}"/${MYP}-src
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+src_configure() {
+	local myConf=""
+	if use sqlite; then
+		myConf="$myConf --with-sqlite=$(get_libdir)"
+	else
+		myConf="$myConf --without-sqlite"
+	fi
+	econf \
+		$(use_with gmp) \
+		$(use_with iconv) \
+		$(use_with postgresql) \
+		$(use_enable projects) \
+		$(use_enable pygobject) \
+		$(use_with python) \
+		$(use_enable readline gpl) \
+		$(use_enable readline) \
+		$(use_enable syslog) \
+		--with-python-exec=python2 \
+		--enable-shared-python \
+		--without-gtk \
+		--disable-pygtk \
+		$myConf
+}
+
+src_compile() {
+	if use shared; then
+		emake PROCESSORS=$(makeopts_jobs) build_library_type/relocatable
+	fi
+	if use static; then
+		emake PROCESSORS=$(makeopts_jobs) build_library_type/static
+	fi
+}
+
+src_install() {
+	if use shared; then
+		emake DESTDIR="${D}" install_library_type/relocatable
+	fi
+	if use static; then
+		emake DESTDIR="${D}" install_library_type/static
+	fi
+	emake DESTDIR="${D}" install_gps_plugin
+	einstalldocs
+}

diff --git a/dev-ada/gnatcoll/metadata.xml b/dev-ada/gnatcoll/metadata.xml
new file mode 100644
index 00000000000..324e66961c9
--- /dev/null
+++ b/dev-ada/gnatcoll/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>tupone@gentoo.org</email>
+		<name>Tupone Alfredo</name>
+	</maintainer>
+	<use>
+		<flag name="pygobject">Adds support for pygobject</flag>
+		<flag name="postgresql">Adds support for postgresql</flag>
+		<flag name="projects">Adds support for projects</flag>
+		<flag name="shared">Build shared library</flag>
+		<flag name="static">Build static library</flag>
+	</use>
+	<longdescription lang="en">
+		The reusable library known as the GNAT Component Collection (GNATColl) is based on one main principle: general-purpose packages that are part of the GNAT technology should also be available to GNAT user application code. The compiler front end, the GNAT Programming Studio (GPS) Interactive Development Environment, and the GNAT Tracker web-based interface all served as sources for the components.
+
+		The GNATColl components complement the predefined Ada and GNAT libraries and deal with a range of common programming issues including string and text processing, memory management, and file handling. Several of the components are especially useful in enterprise applications.
+	</longdescription>
+</pkgmetadata>


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-ada/gnatcoll/files/, dev-ada/gnatcoll/
@ 2017-04-06  6:44 Alfredo Tupone
  0 siblings, 0 replies; 10+ messages in thread
From: Alfredo Tupone @ 2017-04-06  6:44 UTC (permalink / raw
  To: gentoo-commits

commit:     53a82b45cf0a1594164e11175cdde9341ac7e5dd
Author:     Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Thu Apr  6 06:44:35 2017 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Thu Apr  6 06:44:35 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53a82b45

dev-ada/gnatcoll: fix discover of atomic inc/dec

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-ada/gnatcoll/files/gnatcoll-2016-gentoo.patch | 20 ++++++++++++++++++++
 dev-ada/gnatcoll/gnatcoll-2016.ebuild             | 21 ++++++++++++++++++++-
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/dev-ada/gnatcoll/files/gnatcoll-2016-gentoo.patch b/dev-ada/gnatcoll/files/gnatcoll-2016-gentoo.patch
index 0d3d958c791..bb2112a058f 100644
--- a/dev-ada/gnatcoll/files/gnatcoll-2016-gentoo.patch
+++ b/dev-ada/gnatcoll/files/gnatcoll-2016-gentoo.patch
@@ -147,3 +147,23 @@
  
        case GnatColl_Shared.Atomics is
           when "intrinsic" =>
+--- gnatcoll-gpl-2016-src/aclocal.m4.old	2017-04-06 08:25:14.796699365 +0200
++++ gnatcoll-gpl-2016-src/aclocal.m4	2017-04-06 08:25:36.622318016 +0200
+@@ -45,7 +45,7 @@
+    cat > conftest.ada <<EOF
+ [$3]
+ EOF
+-   if AC_TRY_COMMAND([gnatchop -q conftest.ada && $1 $2 >/dev/null 2>conftest.out])
++   if AC_TRY_COMMAND([${GNATCHOP} -q conftest.ada && $1 $2 >/dev/null 2>conftest.out])
+    then
+       : Success
+       $4
+@@ -68,7 +68,7 @@
+ AC_DEFUN(AM_HAS_INTRINSIC_SYNC_COUNTERS,
+ [
+   AC_MSG_CHECKING([whether platform supports atomic inc/dec])
+-  AM_TRY_ADA([gnatmake], [check.adb],
++  AM_TRY_ADA([${GNATMAKE}], [check.adb],
+ [
+ with Interfaces; use Interfaces;
+ procedure Check is

diff --git a/dev-ada/gnatcoll/gnatcoll-2016.ebuild b/dev-ada/gnatcoll/gnatcoll-2016.ebuild
index 3f8a8fb505a..36e52edb121 100644
--- a/dev-ada/gnatcoll/gnatcoll-2016.ebuild
+++ b/dev-ada/gnatcoll/gnatcoll-2016.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit multilib multiprocessing
+inherit multilib multiprocessing autotools
 
 MYP=${PN}-gpl-${PV}
 
@@ -38,6 +38,23 @@ S="${WORKDIR}"/${MYP}-src
 
 PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
 
+pkg_setup() {
+	GCC=${ADA:-$(tc-getCC)}
+	GNATMAKE="${GCC/gcc/gnatmake}"
+	GNATCHOP="${GCC/gcc/gnatchop}"
+	if [[ -z "$(type ${GNATMAKE} 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
+	eautoreconf
+}
+
 src_configure() {
 	local myConf=""
 	if use sqlite; then
@@ -46,6 +63,8 @@ src_configure() {
 		myConf="$myConf --without-sqlite"
 	fi
 	econf \
+		GNATCHOP="${GNATCHOP}" \
+		GNATMAKE="${GNATMAKE}" \
 		$(use_with gmp) \
 		$(use_with iconv) \
 		$(use_with postgresql) \


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-ada/gnatcoll/files/, dev-ada/gnatcoll/
@ 2017-04-24 21:04 Alfredo Tupone
  0 siblings, 0 replies; 10+ messages in thread
From: Alfredo Tupone @ 2017-04-24 21:04 UTC (permalink / raw
  To: gentoo-commits

commit:     ce2804ebe6c5d757d481f31a9cd0cbca6bf20726
Author:     Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 24 21:04:05 2017 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Mon Apr 24 21:04:05 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce2804eb

dev-ada/gnatcoll: Adding support to gtk, using python unconditionally

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-ada/gnatcoll/files/gnatcoll-2016-gentoo.patch | 176 ++++++++++++++++++++++
 dev-ada/gnatcoll/gnatcoll-2016.ebuild             |  46 ++++--
 2 files changed, 210 insertions(+), 12 deletions(-)

diff --git a/dev-ada/gnatcoll/files/gnatcoll-2016-gentoo.patch b/dev-ada/gnatcoll/files/gnatcoll-2016-gentoo.patch
index e69b6e50a90..a54a7c12566 100644
--- a/dev-ada/gnatcoll/files/gnatcoll-2016-gentoo.patch
+++ b/dev-ada/gnatcoll/files/gnatcoll-2016-gentoo.patch
@@ -176,3 +176,179 @@
  [
  with Interfaces; use Interfaces;
  procedure Check is
+--- gnatcoll-gpl-2016-src/testsuite/json/__init__.py.old	2017-04-24 17:52:34.158513249 +0200
++++ gnatcoll-gpl-2016-src/testsuite/json/__init__.py	2017-04-24 17:52:52.636207017 +0200
+@@ -21,7 +21,7 @@
+     @requires_not_aix    # Storage_Error on that machine
+     @chdir("MB28-001")
+     def test_MB28_001(self):
+-        self.runexec(["python", "make_json.py"])
++        self.runexec(["python2.7", "make_json.py"])
+         self.gprbuild()
+         self.runexec("json_stack_test", "test.out")
+ 
+--- gnatcoll-gpl-2016-src/testsuite/projects/aggregate_create/c1/c.gpr.old	2017-04-24 18:00:21.652975475 +0200
++++ gnatcoll-gpl-2016-src/testsuite/projects/aggregate_create/c1/c.gpr	2017-04-24 18:01:23.035983670 +0200
+@@ -15,6 +15,7 @@
+       for Default_Switches ("ada") use
+         ("-g", "-gnatQ", "-O1", "-gnatf", "-gnato", "-gnatwa.Xe", "-gnaty");
+       for Switches ("c") use ("-fdump-xref");
++      for Driver ("c") use External ("CC", "gcc");
+    end Compiler;
+ 
+ end c;
+--- gnatcoll-gpl-2016-src/testsuite/projects/aggregate_create/c2/c.gpr.old	2017-04-24 18:01:28.394896928 +0200
++++ gnatcoll-gpl-2016-src/testsuite/projects/aggregate_create/c2/c.gpr	2017-04-24 18:01:44.343638682 +0200
+@@ -15,6 +15,7 @@
+       for Default_Switches ("ada") use
+         ("-g", "-gnatQ", "-O1", "-gnatf", "-gnato", "-gnatwa.Xe", "-gnaty");
+       for Switches ("C") use ("-fdump-xref");
++      for Driver ("C") use External ("CC", "gcc");
+    end Compiler;
+ 
+ end c;
+--- gnatcoll-gpl-2016-src/testsuite/projects/__init__.py.old	2017-04-24 19:10:30.465246199 +0200
++++ gnatcoll-gpl-2016-src/testsuite/projects/__init__.py	2017-04-24 19:10:42.768035080 +0200
+@@ -105,25 +105,6 @@
+         self.gprbuild("default.gpr")
+         self.runexec("main", "")
+ 
+-    @support.requires_not_windows
+-    @chdir("N918-040")
+-    def test_bareboard(self):
+-        self.create_fake_bb_compiler('install', 'arm-eabi', '6.1.0w', '3.4.6')
+-
+-        # Make sure auto.cgpr is not deleted on exit
+-        try:
+-            os.unlink('auto.cgpr')
+-        except:
+-            pass
+-        self.gprbuild('main_prj', switches=['--autoconf=auto.cgpr'])
+-        m = re.search('for Target use "(.*?)"', open('auto.cgpr').read())
+-        target = m.group(1)
+-
+-        def customFilter(actual):
+-            return actual.replace(target, "<native>")
+-
+-        self.runexec(['sh', 'test.sh'], 'test.out', customFilter=customFilter)
+-
+     @chdir("NB12-045")
+     def test_NB12_045(self):
+         # Test registering attribute in unknown package
+--- gnatcoll-gpl-2016-src/testsuite/xref/tabs/default.gpr.old	2017-04-24 20:01:55.535913959 +0200
++++ gnatcoll-gpl-2016-src/testsuite/xref/tabs/default.gpr	2017-04-24 20:02:51.740950192 +0200
+@@ -1,3 +1,6 @@
+ project Default is
+    for Languages use ("Ada", "C");
++   package Compiler is
++      for Driver ("C") use External ("CC", "gcc");
++   end Compiler;
+ end Default;
+--- gnatcoll-gpl-2016-src/testsuite/xref/doc1/dummy.gpr.old	2017-04-24 20:04:12.012574064 +0200
++++ gnatcoll-gpl-2016-src/testsuite/xref/doc1/dummy.gpr	2017-04-24 20:04:54.025853974 +0200
+@@ -6,4 +6,7 @@
+       for Body_Suffix ("c++") use ".cc";
+    end Naming;
+ 
++   package Compiler is
++      for Driver ("C") use External ("CC", "gcc");
++   end Compiler;
+ end Dummy;
+--- gnatcoll-gpl-2016-src/testsuite/xref/cpp_ref3/default.gpr.old	2017-04-24 20:08:06.018564544 +0200
++++ gnatcoll-gpl-2016-src/testsuite/xref/cpp_ref3/default.gpr	2017-04-24 20:08:53.682748215 +0200
+@@ -1,3 +1,7 @@
+ project Default is
+    for Languages use ("C");
++
++   package Compiler is
++      for Driver ("C") use External ("CC", "gcc");
++   end Compiler;
+ end Default;
+--- gnatcoll-gpl-2016-src/testsuite/xref/cpp_ref2/default.gpr.old	2017-04-24 20:10:00.146610101 +0200
++++ gnatcoll-gpl-2016-src/testsuite/xref/cpp_ref2/default.gpr	2017-04-24 20:10:40.512919251 +0200
+@@ -1,3 +1,7 @@
+ project Default is
+    for Languages use ("C");
++
++   package Compiler is
++      for Driver ("C") use External ("CC", "gcc");
++   end COmpiler;
+ end Default;
+--- gnatcoll-gpl-2016-src/testsuite/xref/cpp_ref1/default.gpr.old	2017-04-24 20:13:28.543059408 +0200
++++ gnatcoll-gpl-2016-src/testsuite/xref/cpp_ref1/default.gpr	2017-04-24 20:14:05.513430176 +0200
+@@ -1,3 +1,7 @@
+ project Default is
+    for Languages use ("C");
++
++   package Compiler is
++      for Driver ("C") use External ("CC", "gcc");
++   end Compiler;
+ end Default;
+--- gnatcoll-gpl-2016-src/testsuite/xref/cpp_expr1/default.gpr.old	2017-04-24 20:15:26.420053157 +0200
++++ gnatcoll-gpl-2016-src/testsuite/xref/cpp_expr1/default.gpr	2017-04-24 20:16:12.695265558 +0200
+@@ -1,3 +1,6 @@
+ project Default is
+    for Languages use ("C");
++   package Compiler is
++      for Driver ("C") use External ("CC", "gcc");
++   end Compiler;
+ end Default;
+--- gnatcoll-gpl-2016-src/testsuite/xref/cpp_enum/dummy.gpr.old	2017-04-24 20:16:53.562570024 +0200
++++ gnatcoll-gpl-2016-src/testsuite/xref/cpp_enum/dummy.gpr	2017-04-24 20:17:32.086914323 +0200
+@@ -4,4 +4,7 @@
+       for Spec_Suffix ("c++") use ".h";
+       for Body_Suffix ("c++") use ".cc";
+    end Naming;
++   package Compiler is
++      for Driver ("c") use External ("CC", "gcc");
++   end Compiler;
+ end Dummy;
+--- gnatcoll-gpl-2016-src/testsuite/xref/cpp_dbi_error/dummy.gpr.old	2017-04-24 20:18:03.688376474 +0200
++++ gnatcoll-gpl-2016-src/testsuite/xref/cpp_dbi_error/dummy.gpr	2017-04-24 20:18:52.761541251 +0200
+@@ -1,3 +1,6 @@
+ project Dummy is
+    for Languages use ("c");
++   package Compiler is
++      for Driver ("c") use External ("CC", "gcc");
++   end Compiler;
+ end Dummy;
+--- gnatcoll-gpl-2016-src/testsuite/xref/L821-017-import/default.gpr.old	2017-04-24 20:19:40.401730504 +0200
++++ gnatcoll-gpl-2016-src/testsuite/xref/L821-017-import/default.gpr	2017-04-24 20:22:52.303465944 +0200
+@@ -4,5 +4,6 @@
+    package Compiler is
+       for Switches ("C") use ("-fsyntax-only", "-fdump-xref");
+       for Switches ("C++") use ("-fsyntax-only", "-fdump-xref");
++      for Driver ("C") use External ("CC", "gcc");
+    end Compiler;
+ end Default;
+--- gnatcoll-gpl-2016-src/testsuite/xref/E224-007-change_obj_dir-c/default.gpr.old	2017-04-24 20:31:02.679123516 +0200
++++ gnatcoll-gpl-2016-src/testsuite/xref/E224-007-change_obj_dir-c/default.gpr	2017-04-24 20:31:42.515445784 +0200
+@@ -8,4 +8,7 @@
+       when "release"  => for Object_Dir use "obj1";
+       when "debug"    => for Object_Dir use "obj2";
+    end case;
++   package Compiler is
++      for Driver ("C") use External ("CC", "gcc");
++   end Compiler;
+ end Default;
+--- gnatcoll-gpl-2016-src/testsuite/xref/I401-027/default.gpr.old	2017-04-24 20:32:45.175379776 +0200
++++ gnatcoll-gpl-2016-src/testsuite/xref/I401-027/default.gpr	2017-04-24 20:33:16.130853112 +0200
+@@ -7,6 +7,7 @@
+    package Compiler is
+ 	   for Default_Switches ("Ada") use ("-gnatws");
+ 	   for Default_Switches ("C") use ("-fdump-xref");
++      for Driver ("C") use External ("CC", "gcc");
+    end Compiler;
+ 
+ end Default;
+--- gnatcoll-gpl-2016-src/src/tools/gnatcoll_db2ada.adb.old	2017-04-24 21:36:09.193973179 +0200
++++ gnatcoll-gpl-2016-src/src/tools/gnatcoll_db2ada.adb	2017-04-24 21:36:16.029858932 +0200
+@@ -211,7 +211,7 @@
+ 
+       declare
+          Output : constant String := Get_Command_Output
+-           (Command     => "python",
++           (Command     => "python2.7",
+             Arguments   => Args,
+             Input       => "",
+             Status      => Status'Access,

diff --git a/dev-ada/gnatcoll/gnatcoll-2016.ebuild b/dev-ada/gnatcoll/gnatcoll-2016.ebuild
index c7e5367ec21..7f00456dddf 100644
--- a/dev-ada/gnatcoll/gnatcoll-2016.ebuild
+++ b/dev-ada/gnatcoll/gnatcoll-2016.ebuild
@@ -9,17 +9,27 @@ MYP=${PN}-gpl-${PV}
 
 DESCRIPTION="GNAT Component Collection"
 HOMEPAGE="http://libre.adacore.com"
-SRC_URI="http://mirrors.cdn.adacore.com/art/5739942ac7a447658d00e1e7 -> ${MYP}-src.tar.gz"
+SRC_URI="http://mirrors.cdn.adacore.com/art/5739942ac7a447658d00e1e7
+	-> ${MYP}-src.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="gmp iconv postgresql projects python readline +shared sqlite static syslog"
+IUSE="gmp gtk iconv postgresql projects readline +shared sqlite static syslog"
 
 RDEPEND="dev-lang/gnat-gpl
+	${PYTHON_DEPS}
 	gmp? ( dev-libs/gmp:* )
+	gtk? (
+		dev-ada/gtkada
+		dev-libs/atk
+		dev-libs/glib
+		x11-libs/cairo
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:3
+		x11-libs/pango
+	)
 	postgresql? ( dev-db/postgresql:* )
-	python? ( ${PYTHON_DEPS} )
 	sqlite? ( dev-db/sqlite )
 	projects? (
 		dev-ada/gprbuild[static?,shared?]
@@ -27,7 +37,7 @@ RDEPEND="dev-lang/gnat-gpl
 DEPEND="${RDEPEND}
 	dev-ada/gprbuild"
 
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 S="${WORKDIR}"/${MYP}-src
 
@@ -43,7 +53,7 @@ pkg_setup() {
 		eerror "2) set ADA=gcc-4.9.4 in make.conf"
 		die "ada compiler not available"
 	fi
-	use python && python-single-r1_pkg_setup
+	python-single-r1_pkg_setup
 }
 
 src_prepare() {
@@ -53,26 +63,29 @@ src_prepare() {
 }
 
 src_configure() {
-	local myConf=""
 	if use sqlite; then
-		myConf="$myConf --with-sqlite=$(get_libdir)"
+		myConf="--with-sqlite=$(get_libdir)"
 	else
-		myConf="$myConf --without-sqlite"
+		myConf="--without-sqlite"
+	fi
+	if use gtk ; then
+		myConf="$myConf --with-gtk=3.0"
+	else
+		myConf="$myConf --with-gtk=no"
 	fi
 	econf \
 		GNATCHOP="${GNATCHOP}" \
 		GNATMAKE="${GNATMAKE}" \
+		--with-python \
 		$(use_with gmp) \
 		$(use_with iconv) \
 		$(use_with postgresql) \
 		$(use_enable projects) \
-		$(use_with python) \
 		$(use_enable readline gpl) \
 		$(use_enable readline) \
 		$(use_enable syslog) \
 		--with-python-exec=${EPYTHON} \
 		--enable-shared-python \
-		--without-gtk \
 		--disable-pygtk \
 		--disable-pygobject \
 		$myConf
@@ -85,6 +98,7 @@ src_compile() {
 	if use static; then
 		emake PROCESSORS=$(makeopts_jobs) build_library_type/static
 	fi
+	python_fix_shebang .
 }
 
 src_install() {
@@ -96,13 +110,21 @@ src_install() {
 	fi
 	emake DESTDIR="${D}" install_gps_plugin
 	einstalldocs
-	dodoc -r features-* known-problems-* examples
+	dodoc -r features-* known-problems-*
 	mv "${D}"/usr/share/doc/${PN}/GNATColl.pdf "${D}"/usr/share/doc/${PF}/
 	mv "${D}"/usr/share/doc/${PN}/html/html "${D}"/usr/share/doc/${PF}/
+	mv "${D}"/usr/share/examples/${PN} "${D}"/usr/share/doc/${PF}/examples
 	rm -rf "${D}"/usr/share/doc/${PN}
-	use python && python_fix_shebang "${ED}"usr/share/gnatcoll/dborm.py
+	rmdir "${D}"/usr/share/examples
+	docompress -x /usr/share/doc/${PF}/examples
 }
 
 src_test() {
+	# The test suite is in
+	# To run you need to have the ada compiler available as gcc
+	# Even in this case there are still some problem
+	# Going into the testsuite directory and running
+	# ./run.py -v -v
+	# run here (having enabled most USE flags)
 	true
 }


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-ada/gnatcoll/files/, dev-ada/gnatcoll/
@ 2017-06-24 16:45 Alfredo Tupone
  0 siblings, 0 replies; 10+ messages in thread
From: Alfredo Tupone @ 2017-06-24 16:45 UTC (permalink / raw
  To: gentoo-commits

commit:     c5228848bed1923663fd665c3cf91c5ad37ba5e8
Author:     Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 24 16:45:11 2017 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sat Jun 24 16:45:11 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5228848

dev-ada/gnatcoll: Add version 2017

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 dev-ada/gnatcoll/Manifest                         |   1 +
 dev-ada/gnatcoll/files/gnatcoll-2017-gentoo.patch | 224 ++++++++++++++++++++++
 dev-ada/gnatcoll/gnatcoll-2017.ebuild             | 129 +++++++++++++
 3 files changed, 354 insertions(+)

diff --git a/dev-ada/gnatcoll/Manifest b/dev-ada/gnatcoll/Manifest
index e3d320cc8a1..c8f53f37aaf 100644
--- a/dev-ada/gnatcoll/Manifest
+++ b/dev-ada/gnatcoll/Manifest
@@ -1 +1,2 @@
 DIST gnatcoll-gpl-2016-src.tar.gz 5687584 SHA256 8cc7cc01db548447a78e3d6d35a35867514beb625009abbcd3be124c1e259b3b SHA512 8cf06e7c5d58d3b159855534791e7969882e04856ba9d03982a63dcfc630f5b5910c6cad57fec9b00c3d04008b0cb0a1fb238e349766348fa4548868238ede8a WHIRLPOOL d37c12bb6242d92104e89b7c1d9a9cd94d802137ee32faa58687700a822db69e2739372376d12032228843c2a5356f8085d6072715b8bc1bda411039d20b55f5
+DIST gnatcoll-gpl-2017-src.tar.gz 5785988 SHA256 66168ee795a67dde3b8a8d0fe6663a776d1bdf50091e6cdd47f3837d89afd434 SHA512 e8b7f2c00816597f33496168bf8928841a2037e517908810761849e23633b2c229d47e4bfaa808e5a619da52bc165f17b8aefa5dee39ecf1a6773b3b1db80363 WHIRLPOOL a0fbda792b282ecb184057efa98332f0b790c9412ba6fec541fbcb8c57cab48f64df6ff81017c283e599cda858d668f5f8fcf5b7bd771c23f34a84a6d16f4c79

diff --git a/dev-ada/gnatcoll/files/gnatcoll-2017-gentoo.patch b/dev-ada/gnatcoll/files/gnatcoll-2017-gentoo.patch
new file mode 100644
index 00000000000..2c3efd2c29f
--- /dev/null
+++ b/dev-ada/gnatcoll/files/gnatcoll-2017-gentoo.patch
@@ -0,0 +1,224 @@
+--- gnatcoll-gpl-2016-src/Makefile.old	2017-01-20 19:39:07.131398270 +0100
++++ gnatcoll-gpl-2016-src/Makefile	2017-01-20 19:42:30.088728844 +0100
+@@ -49,12 +49,12 @@
+ 	@${RM} src/gnatcoll-atomic.adb
+ 
+ 	@echo "====== Building $(@F) libraries ======"
+-	${GPRBUILD} ${GPRBLD_OPTS} -Pgnatcoll_full
++	${GPRBUILD} ${GPRBLD_OPTS} -Pgnatcoll_full -cargs ${ADAFLAGS}
+ 
+ 	@# Need to build libgnatcoll_gtk separately, because its project files
+ 	@# requires gtkada.gpr, which might not exist on the machine.
+ ifeq (${WITH_GTK},yes)
+-	${GPRBUILD} ${GPRBLD_OPTS} -Psrc/gnatcoll_gtk
++	${GPRBUILD} ${GPRBLD_OPTS} -Psrc/gnatcoll_gtk -cargs ${ADAFLAGS}
+ endif
+ 
+ build_tools/%: build_library_type/%
+@@ -63,7 +63,7 @@
+ 	@# They are not build as part of the above because only the Main from
+ 	@# gnatcoll_full.gpr are build. We could use aggregate projects to
+ 	@# speed things up.
+-	${GPRBUILD} ${GPRBLD_OPTS} -q -Psrc/gnatcoll_tools
++	${GPRBUILD} ${GPRBLD_OPTS} -q -Psrc/gnatcoll_tools -cargs ${ADAFLAGS}
+ 
+ #######################################################################
+ #  install
+--- gnatcoll-gpl-2015-src/src/gnatcoll_iconv.gpr.old	2017-01-07 08:58:01.361112843 +0100
++++ gnatcoll-gpl-2015-src/src/gnatcoll_iconv.gpr	2017-01-07 08:58:23.653687385 +0100
+@@ -26,6 +26,7 @@
+ 
+    package Compiler is
+       for Switches ("Ada") use GnatColl_Shared.Compiler'Switches ("Ada");
++      for Driver ("C") use External ("GCC", "gcc");
+       for Switches ("C") use GnatColl_Shared.Compiler'Switches ("C")
+           & GnatColl_Shared.Iconv_Include;
+    end Compiler;
+--- gnatcoll-gpl-2015-src/src/gnatcoll_sqlite.gpr.old	2017-01-07 09:00:17.146448202 +0100
++++ gnatcoll-gpl-2015-src/src/gnatcoll_sqlite.gpr	2017-01-07 09:00:44.884885281 +0100
+@@ -60,8 +60,9 @@
+ 
+                   --  force full optimization for sqlite, we do not debug it
+                   --  in any case.
+                   "-O3") & Gnatcoll_Shared.Sqlite_Switches;
+       end case;
++      for Driver ("C") use External ("GCC", "gcc");
+    end Compiler;
+ 
+    package Linker is
+--- gnatcoll-gpl-2015-src/src/gnatcoll_postgres.gpr.old	2017-01-07 09:05:09.177756146 +0100
++++ gnatcoll-gpl-2015-src/src/gnatcoll_postgres.gpr	2017-01-07 09:05:34.282279733 +0100
+@@ -38,6 +38,7 @@
+            for Switches ("C") use
+               GnatColl_Shared.Compiler'Switches ("C");
+       end case;
++      for Driver ("C") use External ("GCC", "gcc");
+    end Compiler;
+ 
+    package Linker is
+--- gnatcoll-gpl-2016-src/gnatcoll_shared.gpr.in.old	2017-01-20 19:50:03.222808656 +0100
++++ gnatcoll-gpl-2016-src/gnatcoll_shared.gpr.in	2017-01-20 19:50:28.200399274 +0100
+@@ -13,7 +13,7 @@
+ 
+    type Yes_No is ("yes", "no");
+    Gtk       : Yes_No := External ("GTK", "@WITH_GTK@");
+-   Python    : Yes_No := External ("PYTHON", "@WITH_PYTHON@");
++   Python    : Yes_No := "@WITH_PYTHON@"; 
+    Syslog    : Yes_No := External ("SYSLOG", "@WITH_SYSLOG@");
+    Postgres  : Yes_No := External ("POSTGRES", "@WITH_POSTGRES@");
+    type Sqlite_Inclusion is ("yes", "no", "embedded");
+--- gnatcoll-gpl-2016-src/src/gnatcoll__libgpr.gpr.old	2017-02-04 15:56:11.685079607 +0100
++++ gnatcoll-gpl-2016-src/src/gnatcoll__libgpr.gpr	2017-02-04 15:57:00.383221978 +0100
+@@ -49,6 +49,8 @@
+    package Builder renames GnatColl_Shared.Builder;
+ 
+    package Compiler is
++      for Driver ("C") use External ("GCC", "gcc");
++
+       for Switches ("Ada") use GnatColl_Shared.Compiler'Switches ("Ada");
+       for Switches ("C") use GnatColl_Shared.Compiler'Switches ("C");
+       for Switches ("sinfo.adb") use Compiler'Switches ("Ada") & ("-gnatg");
+--- gnatcoll-gpl-2016-src/src/gnatcoll__nogpr.gpr.old	2017-02-04 15:58:41.008450044 +0100
++++ gnatcoll-gpl-2016-src/src/gnatcoll__nogpr.gpr	2017-02-04 15:59:02.815066080 +0100
+@@ -64,6 +64,7 @@
+       for Switches ("Ada") use GnatColl_Shared.Compiler'Switches ("Ada");
+       for Switches ("C") use GnatColl_Shared.Compiler'Switches ("C");
+       for Switches ("sinfo.adb") use Compiler'Switches ("Ada") & ("-gnatg");
++      for Driver ("C") use External ("GCC", "gcc");
+ 
+       case GnatColl_Shared.Atomics is
+          when "intrinsic" =>
+--- gnatcoll-gpl-2016-src/aclocal.m4.old	2017-04-06 08:25:14.796699365 +0200
++++ gnatcoll-gpl-2016-src/aclocal.m4	2017-04-06 08:25:36.622318016 +0200
+@@ -45,7 +45,7 @@
+    cat > conftest.ada <<EOF
+ [$3]
+ EOF
+-   if AC_TRY_COMMAND([gnatchop -q conftest.ada && $1 $2 >/dev/null 2>conftest.out])
++   if AC_TRY_COMMAND([${GNATCHOP} -q conftest.ada && $1 $2 >/dev/null 2>conftest.out])
+    then
+       : Success
+       $4
+@@ -68,7 +68,7 @@
+ AC_DEFUN(AM_HAS_INTRINSIC_SYNC_COUNTERS,
+ [
+   AC_MSG_CHECKING([whether platform supports atomic inc/dec])
+-  AM_TRY_ADA([gnatmake], [check.adb],
++  AM_TRY_ADA([${GNATMAKE}], [check.adb],
+ [
+ with Interfaces; use Interfaces;
+ procedure Check is
+--- gnatcoll-gpl-2016-src/testsuite/json/__init__.py.old	2017-04-24 17:52:34.158513249 +0200
++++ gnatcoll-gpl-2016-src/testsuite/json/__init__.py	2017-04-24 17:52:52.636207017 +0200
+@@ -21,7 +21,7 @@
+     @requires_not_aix    # Storage_Error on that machine
+     @chdir("MB28-001")
+     def test_MB28_001(self):
+-        self.runexec(["python", "make_json.py"])
++        self.runexec(["python2.7", "make_json.py"])
+         self.gprbuild()
+         self.runexec("json_stack_test", "test.out")
+ 
+--- gnatcoll-gpl-2016-src/testsuite/projects/aggregate_create/c1/c.gpr.old	2017-04-24 18:00:21.652975475 +0200
++++ gnatcoll-gpl-2016-src/testsuite/projects/aggregate_create/c1/c.gpr	2017-04-24 18:01:23.035983670 +0200
+@@ -15,5 +15,6 @@
+       for Default_Switches ("ada") use
+         ("-g", "-gnatQ", "-O1", "-gnatf", "-gnato", "-gnatwa.Xe", "-gnaty");
++      for Driver ("c") use External ("GCC", "gcc");
+    end Compiler;
+ 
+ end c;
+--- gnatcoll-gpl-2016-src/testsuite/projects/aggregate_create/c2/c.gpr.old	2017-04-24 18:01:28.394896928 +0200
++++ gnatcoll-gpl-2016-src/testsuite/projects/aggregate_create/c2/c.gpr	2017-04-24 18:01:44.343638682 +0200
+@@ -15,5 +15,6 @@
+       for Default_Switches ("ada") use
+         ("-g", "-gnatQ", "-O1", "-gnatf", "-gnato", "-gnatwa.Xe", "-gnaty");
++      for Driver ("C") use External ("GCC", "gcc");
+    end Compiler;
+ 
+ end c;
+--- gnatcoll-gpl-2016-src/testsuite/projects/__init__.py.old	2017-04-24 19:10:30.465246199 +0200
++++ gnatcoll-gpl-2016-src/testsuite/projects/__init__.py	2017-04-24 19:10:42.768035080 +0200
+@@ -105,25 +105,6 @@
+         self.gprbuild("default.gpr")
+         self.runexec("main", "")
+ 
+-    @support.requires_not_windows
+-    @chdir("N918-040")
+-    def test_bareboard(self):
+-        self.create_fake_bb_compiler('install', 'arm-eabi', '6.1.0w', '3.4.6')
+-
+-        # Make sure auto.cgpr is not deleted on exit
+-        try:
+-            os.unlink('auto.cgpr')
+-        except:
+-            pass
+-        self.gprbuild('main_prj', switches=['--autoconf=auto.cgpr'])
+-        m = re.search('for Target use "(.*?)"', open('auto.cgpr').read())
+-        target = m.group(1)
+-
+-        def customFilter(actual):
+-            return actual.replace(target, "<native>")
+-
+-        self.runexec(['sh', 'test.sh'], 'test.out', customFilter=customFilter)
+-
+     @chdir("NB12-045")
+     def test_NB12_045(self):
+         # Test registering attribute in unknown package
+--- gnatcoll-gpl-2016-src/testsuite/xref/tabs/default.gpr.old	2017-04-24 20:01:55.535913959 +0200
++++ gnatcoll-gpl-2016-src/testsuite/xref/tabs/default.gpr	2017-04-24 20:02:51.740950192 +0200
+@@ -1,3 +1,6 @@
+ project Default is
+    for Languages use ("Ada", "C");
++   package Compiler is
++      for Driver ("C") use External ("GCC", "gcc");
++   end Compiler;
+ end Default;
+--- gnatcoll-gpl-2016-src/testsuite/xref/doc1/dummy.gpr.old	2017-04-24 20:04:12.012574064 +0200
++++ gnatcoll-gpl-2016-src/testsuite/xref/doc1/dummy.gpr	2017-04-24 20:04:54.025853974 +0200
+@@ -6,4 +6,7 @@
+       for Body_Suffix ("c++") use ".cc";
+    end Naming;
+ 
++   package Compiler is
++      for Driver ("C") use External ("GCC", "gcc");
++   end Compiler;
+ end Dummy;
+--- gnatcoll-gpl-2016-src/src/tools/gnatcoll_db2ada.adb.old	2017-04-24 21:36:09.193973179 +0200
++++ gnatcoll-gpl-2016-src/src/tools/gnatcoll_db2ada.adb	2017-04-24 21:36:16.029858932 +0200
+@@ -211,7 +211,7 @@
+ 
+       declare
+          Output : constant String := Get_Command_Output
+-           (Command     => "python",
++           (Command     => "python2.7",
+             Arguments   => Args,
+             Input       => "",
+             Status      => Status'Access,
+--- gnatcoll-gpl-2017-src/src/gnatcoll_python.gpr.old	2017-06-24 18:06:19.702063079 +0200
++++ gnatcoll-gpl-2017-src/src/gnatcoll_python.gpr	2017-06-24 18:05:04.276103652 +0200
+@@ -60,6 +60,7 @@
+ 
+       for Switches ("C") use
+-        ("-g", "-O2") & GnatColl_Shared.Python_Cflags;
++        ("-g", "-O2", "-fPIC") & GnatColl_Shared.Python_Cflags;
++      for Driver ("C") use External ("GCC", "gcc");
+    end Compiler;
+ 
+    package Linker is
+--- gnatcoll-gpl-2017-src/src/gnatcoll_gtk.gpr.old	2017-06-24 18:37:22.164631219 +0200
++++ gnatcoll-gpl-2017-src/src/gnatcoll_gtk.gpr	2017-06-24 18:37:55.763186201 +0200
+@@ -71,11 +71,12 @@
+       for Switches ("Ada") use GnatColl_Shared.Compiler'Switches ("Ada");
+ 
+       for Switches ("C") use
+-        ("-g", "-O2")
++        ("-g", "-O2", "-fPIC")
+         & GnatColl_Shared.Python_Cflags
+         & GnatColl_Shared.Pygtk_Include
+         & GnatColl_Shared.PyGobject_Include
+         & Gtk_Include;
++      for Driver ("C") use External ("GCC", "gcc");
+    end Compiler;
+ 
+    package Linker is

diff --git a/dev-ada/gnatcoll/gnatcoll-2017.ebuild b/dev-ada/gnatcoll/gnatcoll-2017.ebuild
new file mode 100644
index 00000000000..64a817fd92c
--- /dev/null
+++ b/dev-ada/gnatcoll/gnatcoll-2017.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+inherit multilib multiprocessing autotools python-single-r1
+
+MYP=${PN}-gpl-${PV}
+
+DESCRIPTION="GNAT Component Collection"
+HOMEPAGE="http://libre.adacore.com"
+SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed016
+	-> ${MYP}-src.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="gmp gtk iconv postgresql pygobject projects readline +shared sqlite
+	static syslog"
+
+RDEPEND="dev-lang/gnat-gpl:*
+	${PYTHON_DEPS}
+	gmp? ( dev-libs/gmp:* )
+	gtk? (
+		dev-ada/gtkada
+		dev-libs/atk
+		dev-libs/glib
+		x11-libs/cairo
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:3
+		x11-libs/pango
+	)
+	pygobject? ( dev-python/pygobject:3[${PYTHON_USEDEP}] )
+	postgresql? ( dev-db/postgresql:* )
+	sqlite? ( dev-db/sqlite )
+	projects? (
+		>=dev-ada/gprbuild-2017[static?,shared?]
+	)"
+DEPEND="${RDEPEND}
+	dev-ada/gprbuild"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	pygobject? ( gtk )"
+
+S="${WORKDIR}"/${MYP}-src
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+pkg_setup() {
+	GCC=${ADA:-$(tc-getCC)}
+	GNATMAKE="${GCC/gcc/gnatmake}"
+	GNATCHOP="${GCC/gcc/gnatchop}"
+	if [[ -z "$(type ${GNATMAKE} 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
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	mv configure.{in,ac} || die
+	eautoreconf
+}
+
+src_configure() {
+	if use sqlite; then
+		myConf="--with-sqlite=$(get_libdir)"
+	else
+		myConf="--without-sqlite"
+	fi
+	if use gtk ; then
+		myConf="$myConf --with-gtk=3.0"
+	else
+		myConf="$myConf --with-gtk=no"
+	fi
+	econf \
+		GNATCHOP="${GNATCHOP}" \
+		GNATMAKE="${GNATMAKE}" \
+		--with-python \
+		$(use_with gmp) \
+		$(use_with iconv) \
+		$(use_with postgresql) \
+		$(use_enable projects) \
+		$(use_enable pygobject) \
+		$(use_enable readline gpl) \
+		$(use_enable readline) \
+		$(use_enable syslog) \
+		--with-python-exec=${EPYTHON} \
+		--enable-shared-python \
+		--disable-pygtk \
+		CC=${GCC} \
+		$myConf
+}
+
+src_compile() {
+	if use shared; then
+		emake PROCESSORS=$(makeopts_jobs) GPRBUILD_OPTIONS=-v GCC=${GCC} \
+			build_library_type/relocatable
+	fi
+	if use static; then
+		emake PROCESSORS=$(makeopts_jobs) GPRBUILD_OPTIONS=-v GCC=${GCC} \
+			build_library_type/static
+	fi
+	python_fix_shebang .
+}
+
+src_install() {
+	if use shared; then
+		emake prefix="${D}usr" install_library_type/relocatable
+	fi
+	if use static; then
+		emake prefix="${D}usr" install_library_type/static
+	fi
+	emake prefix="${D}usr" install_gps_plugin
+	einstalldocs
+}
+
+src_test() {
+	# The test suite is in
+	# To run you need to have the ada compiler available as gcc
+	# Even in this case there are still some problem
+	# Going into the testsuite directory and running
+	# ./run.py -v -v
+	# run here (having enabled most USE flags)
+	true
+}


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-ada/gnatcoll/files/, dev-ada/gnatcoll/
@ 2017-11-25 15:11 Alfredo Tupone
  0 siblings, 0 replies; 10+ messages in thread
From: Alfredo Tupone @ 2017-11-25 15:11 UTC (permalink / raw
  To: gentoo-commits

commit:     084b75081845bc83908ed348800cc67f8317cd05
Author:     Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 25 15:11:03 2017 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sat Nov 25 15:11:03 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=084b7508

dev-ada/gnatcoll: use gnatls-6.3.0 instead of gnatls

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 dev-ada/gnatcoll/Manifest                         |  4 ++--
 dev-ada/gnatcoll/files/gnatcoll-2017-gentoo.patch | 23 +++++++++++++++++++++++
 dev-ada/gnatcoll/gnatcoll-2017.ebuild             | 23 +++++++++++------------
 3 files changed, 36 insertions(+), 14 deletions(-)

diff --git a/dev-ada/gnatcoll/Manifest b/dev-ada/gnatcoll/Manifest
index c8f53f37aaf..109aacccdc2 100644
--- a/dev-ada/gnatcoll/Manifest
+++ b/dev-ada/gnatcoll/Manifest
@@ -1,2 +1,2 @@
-DIST gnatcoll-gpl-2016-src.tar.gz 5687584 SHA256 8cc7cc01db548447a78e3d6d35a35867514beb625009abbcd3be124c1e259b3b SHA512 8cf06e7c5d58d3b159855534791e7969882e04856ba9d03982a63dcfc630f5b5910c6cad57fec9b00c3d04008b0cb0a1fb238e349766348fa4548868238ede8a WHIRLPOOL d37c12bb6242d92104e89b7c1d9a9cd94d802137ee32faa58687700a822db69e2739372376d12032228843c2a5356f8085d6072715b8bc1bda411039d20b55f5
-DIST gnatcoll-gpl-2017-src.tar.gz 5785988 SHA256 66168ee795a67dde3b8a8d0fe6663a776d1bdf50091e6cdd47f3837d89afd434 SHA512 e8b7f2c00816597f33496168bf8928841a2037e517908810761849e23633b2c229d47e4bfaa808e5a619da52bc165f17b8aefa5dee39ecf1a6773b3b1db80363 WHIRLPOOL a0fbda792b282ecb184057efa98332f0b790c9412ba6fec541fbcb8c57cab48f64df6ff81017c283e599cda858d668f5f8fcf5b7bd771c23f34a84a6d16f4c79
+DIST gnatcoll-gpl-2016-src.tar.gz 5687584 BLAKE2B 0ff5489f3e02ceeb44292f0d13907959884a55ec8f00fcadb21ee4e8a07f863a3bae3c7ae18d3fc669895a76b5f8f495699d31af71940a5abd32b156ad5fe247 SHA512 8cf06e7c5d58d3b159855534791e7969882e04856ba9d03982a63dcfc630f5b5910c6cad57fec9b00c3d04008b0cb0a1fb238e349766348fa4548868238ede8a
+DIST gnatcoll-gpl-2017-src.tar.gz 5785988 BLAKE2B 828aff797f7d992bf3f5dda7f8ce8a79e97ecd98253a657fb6e79a2fd08aac97e19cb421f47010f8c1f26442a013b9126ab3a95353d9ce0f29d071601e9dfe2f SHA512 e8b7f2c00816597f33496168bf8928841a2037e517908810761849e23633b2c229d47e4bfaa808e5a619da52bc165f17b8aefa5dee39ecf1a6773b3b1db80363

diff --git a/dev-ada/gnatcoll/files/gnatcoll-2017-gentoo.patch b/dev-ada/gnatcoll/files/gnatcoll-2017-gentoo.patch
index 2c3efd2c29f..ecec0b78458 100644
--- a/dev-ada/gnatcoll/files/gnatcoll-2017-gentoo.patch
+++ b/dev-ada/gnatcoll/files/gnatcoll-2017-gentoo.patch
@@ -222,3 +222,26 @@
     end Compiler;
  
     package Linker is
+--- gnatcoll-gpl-2017-src/src/gnatcoll-projects.ads.old	2017-11-25 14:50:06.919939453 +0100
++++ gnatcoll-gpl-2017-src/src/gnatcoll-projects.ads	2017-11-25 14:50:38.932387204 +0100
+@@ -1917,7 +1917,8 @@
+       Predefined_Source_Files : GNATCOLL.VFS.File_Array_Access;
+       --  The list of source files in Predefined_Source_Path
+ 
+-      Default_Gnatls : GNAT.Strings.String_Access := new String'("gnatls");
++      Default_Gnatls : GNAT.Strings.String_Access :=
++         new String'("@GNATLS@");
+       --  The default gnatls command to run.
+ 
+       Xrefs_Subdir : GNAT.Strings.String_Access;
+--- gnatcoll-gpl-2017-src/src/tools/gnatinspect.adb.old	2017-11-25 14:52:47.282170250 +0100
++++ gnatcoll-gpl-2017-src/src/tools/gnatinspect.adb	2017-11-25 14:52:57.691990254 +0100
+@@ -642,7 +642,7 @@
+       GNAT_Version : GNAT.Strings.String_Access;
+    begin
+       Env.Set_Path_From_Gnatls
+-        (Gnatls       => "gnatls",
++        (Gnatls       => "@GNATLS@",
+          GNAT_Version => GNAT_Version,
+          Errors       => Local_On_Error'Unrestricted_Access);
+       Free (GNAT_Version);

diff --git a/dev-ada/gnatcoll/gnatcoll-2017.ebuild b/dev-ada/gnatcoll/gnatcoll-2017.ebuild
index 1be61829341..2064ea175d3 100644
--- a/dev-ada/gnatcoll/gnatcoll-2017.ebuild
+++ b/dev-ada/gnatcoll/gnatcoll-2017.ebuild
@@ -18,12 +18,11 @@ KEYWORDS="~amd64"
 IUSE="gmp gnat_2016 gnat_2017 gtk iconv postgresql pygobject projects readline
 	+shared sqlite static syslog tools"
 
-RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
-	gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )
+RDEPEND="dev-lang/gnat-gpl:6.3.0
 	${PYTHON_DEPS}
 	gmp? ( dev-libs/gmp:* )
 	gtk? (
-		dev-ada/gtkada[gnat_2016=,gnat_2017=,shared?,static?]
+		dev-ada/gtkada[gnat_2017,shared?,static?]
 		dev-libs/atk
 		dev-libs/glib
 		x11-libs/cairo
@@ -35,31 +34,31 @@ RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
 	postgresql? ( dev-db/postgresql:* )
 	sqlite? ( dev-db/sqlite )
 	projects? (
-		>=dev-ada/gprbuild-2017[gnat_2016=,gnat_2017=,shared?,static?]
+		>=dev-ada/gprbuild-2017[gnat_2017,shared?,static?]
 	)"
 DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2016=,gnat_2017=]"
+	dev-ada/gprbuild[gnat_2017]"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	pygobject? ( gtk )
-	!gnat_2016 gnat_2017"
+	pygobject? ( gtk )"
 
 S="${WORKDIR}"/${MYP}-src
 
 PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
 
 src_prepare() {
+	GCC_PV=6.3.0
 	default
 	mv configure.{in,ac} || die
+	sed -i \
+		-e "s:@GNATLS@:gnatls-${GCC_PV}:g" \
+		src/gnatcoll-projects.ads \
+		src/tools/gnatinspect.adb \
+		|| die
 	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}
 	GNATMAKE=${CHOST}-gnatmake-${GCC_PV}
 	GNATCHOP=${CHOST}-gnatchop-${GCC_PV}


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-ada/gnatcoll/files/, dev-ada/gnatcoll/
@ 2018-11-10  8:35 Alfredo Tupone
  0 siblings, 0 replies; 10+ messages in thread
From: Alfredo Tupone @ 2018-11-10  8:35 UTC (permalink / raw
  To: gentoo-commits

commit:     725c51cfcdc1aa811beefbf36a6fdea448d0f114
Author:     Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 10 08:35:43 2018 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sat Nov 10 08:35:43 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=725c51cf

dev-ada/gnatcoll: remove hack on GCC for 2016 vers

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

 dev-ada/gnatcoll/files/gnatcoll-2016-gentoo.patch | 191 +---------------------
 dev-ada/gnatcoll/gnatcoll-2016.ebuild             |  10 +-
 2 files changed, 7 insertions(+), 194 deletions(-)

diff --git a/dev-ada/gnatcoll/files/gnatcoll-2016-gentoo.patch b/dev-ada/gnatcoll/files/gnatcoll-2016-gentoo.patch
index 1a1d4d14eec..cd9507026e2 100644
--- a/dev-ada/gnatcoll/files/gnatcoll-2016-gentoo.patch
+++ b/dev-ada/gnatcoll/files/gnatcoll-2016-gentoo.patch
@@ -23,58 +23,25 @@
  
  #######################################################################
  #  install
---- gnatcoll-gpl-2015-src/src/gnatcoll_gmp.gpr.in.old	2017-01-07 08:52:14.921110195 +0100
-+++ gnatcoll-gpl-2015-src/src/gnatcoll_gmp.gpr.in	2017-01-07 08:55:35.718946607 +0100
-@@ -24,6 +24,7 @@
- 
-    package Compiler is
-       for Switches ("Ada") use Gnatcoll_Shared.Compiler'Switches ("Ada");
-+      for Driver ("C") use External ("CC", "gcc");
-       for Switches ("C") use Gnatcoll_Shared.Compiler'Switches ("C")
-         & (@GMP_CFLAGS_GPR@);
-    end Compiler;
---- gnatcoll-gpl-2015-src/src/gnatcoll_iconv.gpr.old	2017-01-07 08:58:01.361112843 +0100
-+++ gnatcoll-gpl-2015-src/src/gnatcoll_iconv.gpr	2017-01-07 08:58:23.653687385 +0100
-@@ -26,6 +26,7 @@
- 
-    package Compiler is
-       for Switches ("Ada") use GnatColl_Shared.Compiler'Switches ("Ada");
-+      for Driver ("C") use External ("CC", "gcc");
-       for Switches ("C") use GnatColl_Shared.Compiler'Switches ("C")
-           & GnatColl_Shared.Iconv_Include;
-    end Compiler;
 --- gnatcoll-gpl-2015-src/src/gnatcoll_sqlite.gpr.old	2017-01-07 09:00:17.146448202 +0100
 +++ gnatcoll-gpl-2015-src/src/gnatcoll_sqlite.gpr	2017-01-07 09:00:44.884885281 +0100
-@@ -60,8 +60,9 @@
+@@ -60,7 +60,7 @@
  
                    --  force full optimization for sqlite, we do not debug it
                    --  in any case.
 -                  "-O3") & Gnatcoll_Shared.Sqlite_Switches;
 +                  "-O3", "-fPIC") & Gnatcoll_Shared.Sqlite_Switches;
        end case;
-+      for Driver ("C") use External ("CC", "gcc");
     end Compiler;
  
-    package Linker is
---- gnatcoll-gpl-2015-src/src/gnatcoll_postgres.gpr.old	2017-01-07 09:05:09.177756146 +0100
-+++ gnatcoll-gpl-2015-src/src/gnatcoll_postgres.gpr	2017-01-07 09:05:34.282279733 +0100
-@@ -38,6 +38,7 @@
-            for Switches ("C") use
-               GnatColl_Shared.Compiler'Switches ("C");
-       end case;
-+      for Driver ("C") use External ("CC", "gcc");
-    end Compiler;
- 
-    package Linker is
 --- gnatcoll-gpl-2015-src/src/gnatcoll_python.gpr.in.old	2017-01-07 09:12:30.490399897 +0100
 +++ gnatcoll-gpl-2015-src/src/gnatcoll_python.gpr.in	2017-01-07 09:12:53.111976591 +0100
-@@ -30,7 +30,8 @@
+@@ -30,7 +30,7 @@
          GnatColl_Shared.Compiler'Switches ("Ada");
  
        for Switches ("C") use
 -        ("-g", "-O2") & GnatColl_Shared.Python_Cflags;
 +        ("-g", "-O2", "-fPIC") & GnatColl_Shared.Python_Cflags;
-+      for Driver ("C") use External ("CC", "gcc");
     end Compiler;
  
     package Linker is
@@ -100,7 +67,7 @@
        case Syslog is
 --- gnatcoll-gpl-2016-src/src/gnatcoll_gtk.gpr.in.old	2017-01-20 19:53:16.647607400 +0100
 +++ gnatcoll-gpl-2016-src/src/gnatcoll_gtk.gpr.in	2017-01-20 19:53:57.302925708 +0100
-@@ -63,11 +63,12 @@
+@@ -63,7 +63,7 @@
        for Switches ("Ada") use GnatColl_Shared.Compiler'Switches ("Ada");
  
        for Switches ("C") use
@@ -109,32 +76,6 @@
          & GnatColl_Shared.Python_Cflags
          & GnatColl_Shared.Pygtk_Include
          & GnatColl_Shared.PyGobject_Include
-         & Gtk_Include;
-+      for Driver ("C") use External ("CC", "gcc");
-    end Compiler;
- 
-    package Linker is
---- gnatcoll-gpl-2016-src/src/gnatcoll__libgpr.gpr.old	2017-02-04 15:56:11.685079607 +0100
-+++ gnatcoll-gpl-2016-src/src/gnatcoll__libgpr.gpr	2017-02-04 15:57:00.383221978 +0100
-@@ -49,6 +49,8 @@
-    package Builder renames GnatColl_Shared.Builder;
- 
-    package Compiler is
-+      for Driver ("C") use External ("CC", "gcc");
-+
-       for Switches ("Ada") use GnatColl_Shared.Compiler'Switches ("Ada");
-       for Switches ("C") use GnatColl_Shared.Compiler'Switches ("C");
-       for Switches ("sinfo.adb") use Compiler'Switches ("Ada") & ("-gnatg");
---- gnatcoll-gpl-2016-src/src/gnatcoll__nogpr.gpr.old	2017-02-04 15:58:41.008450044 +0100
-+++ gnatcoll-gpl-2016-src/src/gnatcoll__nogpr.gpr	2017-02-04 15:59:02.815066080 +0100
-@@ -64,6 +64,7 @@
-       for Switches ("Ada") use GnatColl_Shared.Compiler'Switches ("Ada");
-       for Switches ("C") use GnatColl_Shared.Compiler'Switches ("C");
-       for Switches ("sinfo.adb") use Compiler'Switches ("Ada") & ("-gnatg");
-+      for Driver ("C") use External ("CC", "gcc");
- 
-       case GnatColl_Shared.Atomics is
-          when "intrinsic" =>
 --- gnatcoll-gpl-2016-src/aclocal.m4.old	2017-04-06 08:25:14.796699365 +0200
 +++ gnatcoll-gpl-2016-src/aclocal.m4	2017-04-06 08:25:36.622318016 +0200
 @@ -45,7 +45,7 @@
@@ -166,26 +107,6 @@
          self.gprbuild()
          self.runexec("json_stack_test", "test.out")
  
---- gnatcoll-gpl-2016-src/testsuite/projects/aggregate_create/c1/c.gpr.old	2017-04-24 18:00:21.652975475 +0200
-+++ gnatcoll-gpl-2016-src/testsuite/projects/aggregate_create/c1/c.gpr	2017-04-24 18:01:23.035983670 +0200
-@@ -15,6 +15,7 @@
-       for Default_Switches ("ada") use
-         ("-g", "-gnatQ", "-O1", "-gnatf", "-gnato", "-gnatwa.Xe", "-gnaty");
-       for Switches ("c") use ("-fdump-xref");
-+      for Driver ("c") use External ("CC", "gcc");
-    end Compiler;
- 
- end c;
---- gnatcoll-gpl-2016-src/testsuite/projects/aggregate_create/c2/c.gpr.old	2017-04-24 18:01:28.394896928 +0200
-+++ gnatcoll-gpl-2016-src/testsuite/projects/aggregate_create/c2/c.gpr	2017-04-24 18:01:44.343638682 +0200
-@@ -15,6 +15,7 @@
-       for Default_Switches ("ada") use
-         ("-g", "-gnatQ", "-O1", "-gnatf", "-gnato", "-gnatwa.Xe", "-gnaty");
-       for Switches ("C") use ("-fdump-xref");
-+      for Driver ("C") use External ("CC", "gcc");
-    end Compiler;
- 
- end c;
 --- gnatcoll-gpl-2016-src/testsuite/projects/__init__.py.old	2017-04-24 19:10:30.465246199 +0200
 +++ gnatcoll-gpl-2016-src/testsuite/projects/__init__.py	2017-04-24 19:10:42.768035080 +0200
 @@ -105,25 +105,6 @@
@@ -214,112 +135,6 @@
      @chdir("NB12-045")
      def test_NB12_045(self):
          # Test registering attribute in unknown package
---- gnatcoll-gpl-2016-src/testsuite/xref/tabs/default.gpr.old	2017-04-24 20:01:55.535913959 +0200
-+++ gnatcoll-gpl-2016-src/testsuite/xref/tabs/default.gpr	2017-04-24 20:02:51.740950192 +0200
-@@ -1,3 +1,6 @@
- project Default is
-    for Languages use ("Ada", "C");
-+   package Compiler is
-+      for Driver ("C") use External ("CC", "gcc");
-+   end Compiler;
- end Default;
---- gnatcoll-gpl-2016-src/testsuite/xref/doc1/dummy.gpr.old	2017-04-24 20:04:12.012574064 +0200
-+++ gnatcoll-gpl-2016-src/testsuite/xref/doc1/dummy.gpr	2017-04-24 20:04:54.025853974 +0200
-@@ -6,4 +6,7 @@
-       for Body_Suffix ("c++") use ".cc";
-    end Naming;
- 
-+   package Compiler is
-+      for Driver ("C") use External ("CC", "gcc");
-+   end Compiler;
- end Dummy;
---- gnatcoll-gpl-2016-src/testsuite/xref/cpp_ref3/default.gpr.old	2017-04-24 20:08:06.018564544 +0200
-+++ gnatcoll-gpl-2016-src/testsuite/xref/cpp_ref3/default.gpr	2017-04-24 20:08:53.682748215 +0200
-@@ -1,3 +1,7 @@
- project Default is
-    for Languages use ("C");
-+
-+   package Compiler is
-+      for Driver ("C") use External ("CC", "gcc");
-+   end Compiler;
- end Default;
---- gnatcoll-gpl-2016-src/testsuite/xref/cpp_ref2/default.gpr.old	2017-04-24 20:10:00.146610101 +0200
-+++ gnatcoll-gpl-2016-src/testsuite/xref/cpp_ref2/default.gpr	2017-04-24 20:10:40.512919251 +0200
-@@ -1,3 +1,7 @@
- project Default is
-    for Languages use ("C");
-+
-+   package Compiler is
-+      for Driver ("C") use External ("CC", "gcc");
-+   end COmpiler;
- end Default;
---- gnatcoll-gpl-2016-src/testsuite/xref/cpp_ref1/default.gpr.old	2017-04-24 20:13:28.543059408 +0200
-+++ gnatcoll-gpl-2016-src/testsuite/xref/cpp_ref1/default.gpr	2017-04-24 20:14:05.513430176 +0200
-@@ -1,3 +1,7 @@
- project Default is
-    for Languages use ("C");
-+
-+   package Compiler is
-+      for Driver ("C") use External ("CC", "gcc");
-+   end Compiler;
- end Default;
---- gnatcoll-gpl-2016-src/testsuite/xref/cpp_expr1/default.gpr.old	2017-04-24 20:15:26.420053157 +0200
-+++ gnatcoll-gpl-2016-src/testsuite/xref/cpp_expr1/default.gpr	2017-04-24 20:16:12.695265558 +0200
-@@ -1,3 +1,6 @@
- project Default is
-    for Languages use ("C");
-+   package Compiler is
-+      for Driver ("C") use External ("CC", "gcc");
-+   end Compiler;
- end Default;
---- gnatcoll-gpl-2016-src/testsuite/xref/cpp_enum/dummy.gpr.old	2017-04-24 20:16:53.562570024 +0200
-+++ gnatcoll-gpl-2016-src/testsuite/xref/cpp_enum/dummy.gpr	2017-04-24 20:17:32.086914323 +0200
-@@ -4,4 +4,7 @@
-       for Spec_Suffix ("c++") use ".h";
-       for Body_Suffix ("c++") use ".cc";
-    end Naming;
-+   package Compiler is
-+      for Driver ("c") use External ("CC", "gcc");
-+   end Compiler;
- end Dummy;
---- gnatcoll-gpl-2016-src/testsuite/xref/cpp_dbi_error/dummy.gpr.old	2017-04-24 20:18:03.688376474 +0200
-+++ gnatcoll-gpl-2016-src/testsuite/xref/cpp_dbi_error/dummy.gpr	2017-04-24 20:18:52.761541251 +0200
-@@ -1,3 +1,6 @@
- project Dummy is
-    for Languages use ("c");
-+   package Compiler is
-+      for Driver ("c") use External ("CC", "gcc");
-+   end Compiler;
- end Dummy;
---- gnatcoll-gpl-2016-src/testsuite/xref/L821-017-import/default.gpr.old	2017-04-24 20:19:40.401730504 +0200
-+++ gnatcoll-gpl-2016-src/testsuite/xref/L821-017-import/default.gpr	2017-04-24 20:22:52.303465944 +0200
-@@ -4,5 +4,6 @@
-    package Compiler is
-       for Switches ("C") use ("-fsyntax-only", "-fdump-xref");
-       for Switches ("C++") use ("-fsyntax-only", "-fdump-xref");
-+      for Driver ("C") use External ("CC", "gcc");
-    end Compiler;
- end Default;
---- gnatcoll-gpl-2016-src/testsuite/xref/E224-007-change_obj_dir-c/default.gpr.old	2017-04-24 20:31:02.679123516 +0200
-+++ gnatcoll-gpl-2016-src/testsuite/xref/E224-007-change_obj_dir-c/default.gpr	2017-04-24 20:31:42.515445784 +0200
-@@ -8,4 +8,7 @@
-       when "release"  => for Object_Dir use "obj1";
-       when "debug"    => for Object_Dir use "obj2";
-    end case;
-+   package Compiler is
-+      for Driver ("C") use External ("CC", "gcc");
-+   end Compiler;
- end Default;
---- gnatcoll-gpl-2016-src/testsuite/xref/I401-027/default.gpr.old	2017-04-24 20:32:45.175379776 +0200
-+++ gnatcoll-gpl-2016-src/testsuite/xref/I401-027/default.gpr	2017-04-24 20:33:16.130853112 +0200
-@@ -7,6 +7,7 @@
-    package Compiler is
- 	   for Default_Switches ("Ada") use ("-gnatws");
- 	   for Default_Switches ("C") use ("-fdump-xref");
-+      for Driver ("C") use External ("CC", "gcc");
-    end Compiler;
- 
- end Default;
 --- gnatcoll-gpl-2016-src/src/tools/gnatcoll_db2ada.adb.old	2017-04-24 21:36:09.193973179 +0200
 +++ gnatcoll-gpl-2016-src/src/tools/gnatcoll_db2ada.adb	2017-04-24 21:36:16.029858932 +0200
 @@ -211,7 +211,7 @@

diff --git a/dev-ada/gnatcoll/gnatcoll-2016.ebuild b/dev-ada/gnatcoll/gnatcoll-2016.ebuild
index 7f73bf715c6..9aa2594fbfa 100644
--- a/dev-ada/gnatcoll/gnatcoll-2016.ebuild
+++ b/dev-ada/gnatcoll/gnatcoll-2016.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -35,7 +35,7 @@ RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
 	postgres? ( dev-db/postgresql:* )
 	sqlite? ( dev-db/sqlite )
 	projects? (
-		=dev-ada/libgpr-2016[gnat_2016=,gnat_2017=,shared?,static-libs?]
+		~dev-ada/libgpr-2016[gnat_2016=,gnat_2017=,shared?,static-libs?]
 		dev-ada/xmlada[shared?,static-libs?]
 	)"
 DEPEND="${RDEPEND}
@@ -62,7 +62,6 @@ src_configure() {
 	else
 		GCC_PV=6.3.0
 	fi
-	GCC=${CHOST}-gcc-${GCC_PV}
 	GNATMAKE=${CHOST}-gnatmake-${GCC_PV}
 	GNATCHOP=${CHOST}-gnatchop-${GCC_PV}
 	if use sqlite; then
@@ -90,17 +89,16 @@ src_configure() {
 		--with-python-exec=${EPYTHON} \
 		--enable-shared-python \
 		--disable-pygtk \
-		CC=${GCC} \
 		$myConf
 }
 
 src_compile() {
 	if use shared; then
-		emake PROCESSORS=$(makeopts_jobs) GPRBUILD_OPTIONS=-v GCC=${GCC} \
+		emake PROCESSORS=$(makeopts_jobs) GPRBUILD_OPTIONS=-v \
 			build_library_type/relocatable
 	fi
 	if use static-libs; then
-		emake PROCESSORS=$(makeopts_jobs) GPRBUILD_OPTIONS=-v GCC=${GCC} \
+		emake PROCESSORS=$(makeopts_jobs) GPRBUILD_OPTIONS=-v \
 			build_library_type/static
 	fi
 	python_fix_shebang .


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-ada/gnatcoll/files/, dev-ada/gnatcoll/
@ 2018-11-11 11:01 Alfredo Tupone
  0 siblings, 0 replies; 10+ messages in thread
From: Alfredo Tupone @ 2018-11-11 11:01 UTC (permalink / raw
  To: gentoo-commits

commit:     7b381d7c0945f1d1625bc58fcb1f1ee728565e94
Author:     Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 11 11:00:52 2018 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sun Nov 11 11:00:52 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b381d7c

dev-ada/gnatcoll: compatibility with gprbuild-2017

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

 dev-ada/gnatcoll/files/gnatcoll-2016-gentoo.patch | 134 ++++++++++++++++------
 dev-ada/gnatcoll/gnatcoll-2016.ebuild             |   4 +-
 2 files changed, 103 insertions(+), 35 deletions(-)

diff --git a/dev-ada/gnatcoll/files/gnatcoll-2016-gentoo.patch b/dev-ada/gnatcoll/files/gnatcoll-2016-gentoo.patch
index b33c2bbb364..3d775e2c030 100644
--- a/dev-ada/gnatcoll/files/gnatcoll-2016-gentoo.patch
+++ b/dev-ada/gnatcoll/files/gnatcoll-2016-gentoo.patch
@@ -23,28 +23,6 @@
  
  #######################################################################
  #  install
---- a/src/gnatcoll_sqlite.gpr	2017-01-07 09:00:17.146448202 +0100
-+++ b/src/gnatcoll_sqlite.gpr	2017-01-07 09:00:44.884885281 +0100
-@@ -60,7 +60,7 @@
- 
-                   --  force full optimization for sqlite, we do not debug it
-                   --  in any case.
--                  "-O3") & Gnatcoll_Shared.Sqlite_Switches;
-+                  "-O3", "-fPIC") & Gnatcoll_Shared.Sqlite_Switches;
-       end case;
-    end Compiler;
- 
---- a/src/gnatcoll_python.gpr.in	2017-01-07 09:12:30.490399897 +0100
-+++ b/src/gnatcoll_python.gpr.in	2017-01-07 09:12:53.111976591 +0100
-@@ -30,7 +30,7 @@
-         GnatColl_Shared.Compiler'Switches ("Ada");
- 
-       for Switches ("C") use
--        ("-g", "-O2") & GnatColl_Shared.Python_Cflags;
-+        ("-g", "-O2", "-fPIC") & GnatColl_Shared.Python_Cflags;
-    end Compiler;
- 
-    package Linker is
 --- a/gnatcoll_shared.gpr.in	2017-01-20 19:50:03.222808656 +0100
 +++ b/gnatcoll_shared.gpr.in	2017-01-20 19:50:28.200399274 +0100
 @@ -13,7 +13,7 @@
@@ -65,17 +43,6 @@
        end case;
  
        case Syslog is
---- a/src/gnatcoll_gtk.gpr.in	2017-01-20 19:53:16.647607400 +0100
-+++ b/src/gnatcoll_gtk.gpr.in	2017-01-20 19:53:57.302925708 +0100
-@@ -63,7 +63,7 @@
-       for Switches ("Ada") use GnatColl_Shared.Compiler'Switches ("Ada");
- 
-       for Switches ("C") use
--        ("-g", "-O2")
-+        ("-g", "-O2", "-fPIC")
-         & GnatColl_Shared.Python_Cflags
-         & GnatColl_Shared.Pygtk_Include
-         & GnatColl_Shared.PyGobject_Include
 --- a/aclocal.m4	2017-04-06 08:25:14.796699365 +0200
 +++ b/aclocal.m4	2017-04-06 08:25:36.622318016 +0200
 @@ -45,7 +45,7 @@
@@ -146,3 +113,104 @@
              Arguments   => Args,
              Input       => "",
              Status      => Status'Access,
+--- a/src/gnatcoll_python.gpr.in	2018-11-11 11:04:46.275182850 +0100
++++ b/src/gnatcoll_python.gpr.in	2018-11-11 11:10:22.809783463 +0100
+@@ -33,14 +33,19 @@
+       "lib" & Project'Library_Name
+       & GnatColl_Shared.So_Ext & "." & GnatColl_Shared.Version;
+ 
+-   --  When linking a shared library (see Linker_Options below in addition)
+-   for Library_Options use GnatColl_Shared.Python_Libs;
+-
+    case GnatColl_Shared.Python is
+       when "yes" =>
+          for Languages use ("Ada", "C");
+          for Source_Dirs use ("python");
+-         for Library_Options use (@PYTHON_LIBS_GPR@);
++         case Gnatcoll_Shared.Library_Type is
++            when "relocatable" =>
++               --  When linking a shared library (see Linker_Options
++               --  below in addition)
++               for Library_Options use GnatColl_Shared.Python_Libs;
++            when others =>
++               null;
++         end case;
++
+       when "no"  =>
+          for Languages use ("Ada");
+          for Source_Dirs use ("nopython");
+--- a/src/gnatcoll_iconv.gpr	2018-11-11 11:39:47.736090039 +0100
++++ b/src/gnatcoll_iconv.gpr	2018-11-11 11:40:42.161198640 +0100
+@@ -44,7 +44,13 @@
+         for Source_Dirs use ("iconv", "iconv/no_iconv");
+       when "yes" =>
+         for Source_Dirs use ("iconv", "iconv/with_iconv");
+-        for Library_Options use (GnatColl_Shared.Iconv_Dir) & Gnatcoll_Shared.Iconv_Lib;
++        case Gnatcoll_Shared.Library_Type is
++           when "relocatable" =>
++              for Library_Options use (GnatColl_Shared.Iconv_Dir)
++                 & Gnatcoll_Shared.Iconv_Lib;
++           when others =>
++              null;
++        end case;
+    end case;
+ 
+    package Compiler is
+--- a/src/gnatcoll_sqlite.gpr	2018-11-11 11:45:36.672371038 +0100
++++ b/src/gnatcoll_sqlite.gpr	2018-11-11 11:48:24.898610725 +0100
+@@ -51,8 +51,15 @@
+         for Source_Dirs use ("sqlite", "sqlite/no_sqlite");
+       when "yes" =>
+         for Source_Dirs use ("sqlite", "sqlite/with_sqlite");
+-        for Library_Options use (GnatColl_Shared.Sqlite_Dir)
+-          & "-lsqlite3" & Thread_Lib;
++
++        case Gnatcoll_Shared.Library_Type is
++           when "relocatable" =>
++              for Library_Options use (GnatColl_Shared.Sqlite_Dir)
++                & "-lsqlite3" & Thread_Lib;
++           when others =>
++              null;
++        end case;
++
+       when "embedded" =>
+         for Languages use ("Ada", "C");
+         for Source_Dirs use ("sqlite", "sqlite/with_sqlite", "sqlite/amalgamation");
+--- a/src/gnatcoll_readline.gpr.in	2018-11-11 11:51:19.119750140 +0100
++++ b/src/gnatcoll_readline.gpr.in	2018-11-11 11:52:00.531069930 +0100
+@@ -6,7 +6,14 @@
+       when "yes" =>
+          for Languages use ("Ada");
+          for Source_Dirs use ("readline", "readline/with_readline");
+-         for Library_Options use ("-lreadline");
++
++         case Gnatcoll_Shared.Library_Type is
++            when "relocatable" =>
++               for Library_Options use ("-lreadline");
++            when others =>
++               null;
++         end case;
++
+       when "no" =>
+          for Source_Dirs use ("readline", "readline/no_readline");
+    end case;
+--- a/src/gnatcoll_gtk.gpr.in	2018-11-11 11:55:32.460587328 +0100
++++ b/src/gnatcoll_gtk.gpr.in	2018-11-11 11:56:15.930872692 +0100
+@@ -47,8 +47,15 @@
+          for Source_Dirs use ();
+       when "yes" =>
+          for Source_Dirs use ("gtk");
+-         for Library_Options use GnatColl_Shared.Gtk_Libs
+-            & GnatColl_Shared.Python_Libs;
++
++         case Gnatcoll_Shared.Library_Type is
++            when "relocatable" =>
++               for Library_Options use GnatColl_Shared.Gtk_Libs
++                  & GnatColl_Shared.Python_Libs;
++            when others =>
++               null;
++         end case;
++
+          case GnatColl_Shared.Python is
+             when "yes" =>
+                for Source_Dirs use Project'Source_Dirs & ("gtk/python");

diff --git a/dev-ada/gnatcoll/gnatcoll-2016.ebuild b/dev-ada/gnatcoll/gnatcoll-2016.ebuild
index 9aa2594fbfa..435a16df129 100644
--- a/dev-ada/gnatcoll/gnatcoll-2016.ebuild
+++ b/dev-ada/gnatcoll/gnatcoll-2016.ebuild
@@ -94,11 +94,11 @@ src_configure() {
 
 src_compile() {
 	if use shared; then
-		emake PROCESSORS=$(makeopts_jobs) GPRBUILD_OPTIONS=-v \
+		emake PROCESSORS=$(makeopts_jobs) \
 			build_library_type/relocatable
 	fi
 	if use static-libs; then
-		emake PROCESSORS=$(makeopts_jobs) GPRBUILD_OPTIONS=-v \
+		emake PROCESSORS=$(makeopts_jobs) \
 			build_library_type/static
 	fi
 	python_fix_shebang .


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-ada/gnatcoll/files/, dev-ada/gnatcoll/
@ 2018-11-13 20:30 Alfredo Tupone
  0 siblings, 0 replies; 10+ messages in thread
From: Alfredo Tupone @ 2018-11-13 20:30 UTC (permalink / raw
  To: gentoo-commits

commit:     971f893b0e0d4c2080513bed8ebfe832049ed79f
Author:     Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 13 20:30:25 2018 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Tue Nov 13 20:30:25 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=971f893b

dev-ada/gnatcoll: require a more recent libgpr

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

 dev-ada/gnatcoll/files/gnatcoll-2016-gentoo.patch | 20 +++++++++++---------
 dev-ada/gnatcoll/gnatcoll-2016.ebuild             |  2 +-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/dev-ada/gnatcoll/files/gnatcoll-2016-gentoo.patch b/dev-ada/gnatcoll/files/gnatcoll-2016-gentoo.patch
index 3d775e2c030..d6ece9454e2 100644
--- a/dev-ada/gnatcoll/files/gnatcoll-2016-gentoo.patch
+++ b/dev-ada/gnatcoll/files/gnatcoll-2016-gentoo.patch
@@ -34,15 +34,6 @@
     Syslog : Yes_No := External ("SYSLOG", "@WITH_SYSLOG@");
     Postgres : Yes_No := External ("POSTGRES", "@WITH_POSTGRES@");
     type Sqlite_Inclusion is ("yes", "no", "embedded");
-@@ -67,7 +67,7 @@
- 
-          when "Production" =>
-             for Switches ("Ada") use ("-O2", "-gnatn", "-gnatws");
--            for Switches ("C") use ("-O2", "-Wunreachable-code");
-+            for Switches ("C") use ("-O2", "-Wunreachable-code", "-fPIC");
-       end case;
- 
-       case Syslog is
 --- a/aclocal.m4	2017-04-06 08:25:14.796699365 +0200
 +++ b/aclocal.m4	2017-04-06 08:25:36.622318016 +0200
 @@ -45,7 +45,7 @@
@@ -214,3 +205,14 @@
           case GnatColl_Shared.Python is
              when "yes" =>
                 for Source_Dirs use Project'Source_Dirs & ("gtk/python");
+--- a/src/gnatcoll-projects-normalize.adb	2018-11-13 19:34:01.491003676 +0100
++++ b/src/gnatcoll-projects-normalize.adb	2018-11-13 19:34:16.289760553 +0100
+@@ -2202,7 +2202,7 @@
+             when N_Comment_Zones =>
+                null;
+ 
+-            when N_Comment =>
++            when others =>
+                null;
+          end case;
+       end if;

diff --git a/dev-ada/gnatcoll/gnatcoll-2016.ebuild b/dev-ada/gnatcoll/gnatcoll-2016.ebuild
index 435a16df129..4f0159efc45 100644
--- a/dev-ada/gnatcoll/gnatcoll-2016.ebuild
+++ b/dev-ada/gnatcoll/gnatcoll-2016.ebuild
@@ -35,7 +35,7 @@ RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
 	postgres? ( dev-db/postgresql:* )
 	sqlite? ( dev-db/sqlite )
 	projects? (
-		~dev-ada/libgpr-2016[gnat_2016=,gnat_2017=,shared?,static-libs?]
+		~dev-ada/libgpr-2017[gnat_2016=,gnat_2017=,shared?,static-libs?]
 		dev-ada/xmlada[shared?,static-libs?]
 	)"
 DEPEND="${RDEPEND}


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-ada/gnatcoll/files/, dev-ada/gnatcoll/
@ 2018-11-14 21:45 Alfredo Tupone
  0 siblings, 0 replies; 10+ messages in thread
From: Alfredo Tupone @ 2018-11-14 21:45 UTC (permalink / raw
  To: gentoo-commits

commit:     ae26107f9310729821efa6696161dc4c7bdbde3b
Author:     Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 14 21:45:07 2018 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Wed Nov 14 21:45:07 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae26107f

dev-ada/gnatcoll: Fix build with new libgpr

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

 dev-ada/gnatcoll/files/gnatcoll-2016-gentoo.patch | 79 +++++++++++++++++++++++
 dev-ada/gnatcoll/gnatcoll-2016.ebuild             |  2 +-
 2 files changed, 80 insertions(+), 1 deletion(-)

diff --git a/dev-ada/gnatcoll/files/gnatcoll-2016-gentoo.patch b/dev-ada/gnatcoll/files/gnatcoll-2016-gentoo.patch
index d6ece9454e2..ee987a72c1f 100644
--- a/dev-ada/gnatcoll/files/gnatcoll-2016-gentoo.patch
+++ b/dev-ada/gnatcoll/files/gnatcoll-2016-gentoo.patch
@@ -1,5 +1,14 @@
 --- a/Makefile	2017-01-20 19:39:07.131398270 +0100
 +++ b/Makefile	2017-01-20 19:42:30.088728844 +0100
+@@ -28,7 +28,7 @@
+ 
+ # Build either type of library. The argument (%) is the type of library to build
+ 
+-GPRBLD_OPTS=-p -m -j${PROCESSORS} -XLIBRARY_TYPE=$(@F) -XGnatcoll_Build=${Gnatcoll_Build}
++GPRBLD_OPTS=-p -m -j${PROCESSORS} -XGPR_BUILD=$(@F) -XLIBRARY_TYPE=$(@F) -XGnatcoll_Build=${Gnatcoll_Build}
+ 
+ build_library_type/%: generate_sources
+ 	@${RM} src/gnatcoll-atomic.adb
 @@ -34,19 +36,19 @@
  	@${RM} src/gnatcoll-atomic.adb
  
@@ -23,6 +32,14 @@
  
  #######################################################################
  #  install
+@@ -53,6 +53,7 @@
+ 
+ GPRINST_OPTS=-p -f --prefix=${prefix} --install-name=gnatcoll \
+ 	--exec-subdir=${bindir} --project-subdir=lib/gnat \
++	-XGPR_BUILD=$(@F) \
+ 	--build-var=LIBRARY_TYPE --build-name=$(@F) -XLIBRARY_TYPE=$(@F)
+ 
+ install-clean:
 --- a/gnatcoll_shared.gpr.in	2017-01-20 19:50:03.222808656 +0100
 +++ b/gnatcoll_shared.gpr.in	2017-01-20 19:50:28.200399274 +0100
 @@ -13,7 +13,7 @@
@@ -216,3 +233,65 @@
                 null;
           end case;
        end if;
+--- a/src/gnatcoll-projects.adb	2018-11-14 18:47:27.760365233 +0100
++++ b/src/gnatcoll-projects.adb	2018-11-14 19:10:43.961337201 +0100
+@@ -3273,9 +3273,9 @@
+       Status                   : out Status_Type;
+       Result                   : out GNATCOLL.VFS.File_Array_Access)
+    is
+-      Mains_Str_List : String_List_Access;
++      Mains_Str_List : String_Vectors.Vector;
+       Closure_Status : GPR.Util.Status_Type;
+-      Closures_List  : String_List_Access;
++      Closures_List  : String_Vectors.Vector;
+    begin
+       Trace (Me, "Get_Closures");
+ 
+@@ -3287,25 +3287,18 @@
+          return;
+       end if;
+ 
+-      Mains_Str_List := new String_List (Mains'First .. Mains'Last);
+       for I in Mains'Range loop
+-         Mains_Str_List (I) := new String'(Mains (I).Display_Base_Name);
++         Mains_Str_List.Append (Mains (I).Display_Base_Name);
+       end loop;
+ 
+       GPR.Util.Get_Closures
+         (Project.Get_View, Project.Tree_View,
+-         Mains                    => Mains_Str_List.all,
++         Mains                    => Mains_Str_List,
+          All_Projects             => All_Projects,
+          Include_Externally_Built => Include_Externally_Built,
+          Status                   => Closure_Status,
+          Result                   => Closures_List);
+ 
+-      --  Freeing temporary list of mains.
+-      for I in Mains_Str_List'Range loop
+-         Free (Mains_Str_List (I));
+-      end loop;
+-      Free (Mains_Str_List);
+-
+       case Closure_Status is
+          when Success =>
+             Status := Success;
+@@ -3321,17 +3314,10 @@
+       end case;
+ 
+       if Closure_Status in Success | Incomplete_Closure then
+-         for I in Closures_List'Range loop
+-            Append (Result, Create (+Closures_List (I).all));
++         for Closure of Closures_List loop
++            Append (Result, Create (+Closure));
+          end loop;
+       end if;
+-
+-      --  Freeing temporary list of closures.
+-      for I in Closures_List'Range loop
+-         Free (Closures_List (I));
+-      end loop;
+-      Free (Closures_List);
+-
+    end Get_Closures;
+ 
+    ----------------

diff --git a/dev-ada/gnatcoll/gnatcoll-2016.ebuild b/dev-ada/gnatcoll/gnatcoll-2016.ebuild
index 4f0159efc45..0194b141db2 100644
--- a/dev-ada/gnatcoll/gnatcoll-2016.ebuild
+++ b/dev-ada/gnatcoll/gnatcoll-2016.ebuild
@@ -35,7 +35,7 @@ RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
 	postgres? ( dev-db/postgresql:* )
 	sqlite? ( dev-db/sqlite )
 	projects? (
-		~dev-ada/libgpr-2017[gnat_2016=,gnat_2017=,shared?,static-libs?]
+		~dev-ada/libgpr-2018[gnat_2016=,gnat_2017=,shared?,static-libs?]
 		dev-ada/xmlada[shared?,static-libs?]
 	)"
 DEPEND="${RDEPEND}


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-ada/gnatcoll/files/, dev-ada/gnatcoll/
@ 2018-11-18 10:10 Alfredo Tupone
  0 siblings, 0 replies; 10+ messages in thread
From: Alfredo Tupone @ 2018-11-18 10:10 UTC (permalink / raw
  To: gentoo-commits

commit:     597ffa19f29851bae0be038fada18539f23c5eb9
Author:     Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 18 10:09:53 2018 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sun Nov 18 10:09:53 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=597ffa19

dev-ada/gnatcoll: require dev-ada/libgpr-2018

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

 dev-ada/gnatcoll/files/gnatcoll-2017-gentoo.patch | 62 +++++++++++++++++++++++
 dev-ada/gnatcoll/gnatcoll-2017.ebuild             |  2 +-
 2 files changed, 63 insertions(+), 1 deletion(-)

diff --git a/dev-ada/gnatcoll/files/gnatcoll-2017-gentoo.patch b/dev-ada/gnatcoll/files/gnatcoll-2017-gentoo.patch
index 36da82626f4..f0ec53f368e 100644
--- a/dev-ada/gnatcoll/files/gnatcoll-2017-gentoo.patch
+++ b/dev-ada/gnatcoll/files/gnatcoll-2017-gentoo.patch
@@ -142,3 +142,65 @@
           GNAT_Version => GNAT_Version,
           Errors       => Local_On_Error'Unrestricted_Access);
        Free (GNAT_Version);
+--- a/src/gnatcoll-projects.adb	2018-11-14 18:47:27.760365233 +0100
++++ b/src/gnatcoll-projects.adb	2018-11-14 19:10:43.961337201 +0100
+@@ -3273,9 +3273,9 @@
+       Status                   : out Status_Type;
+       Result                   : out GNATCOLL.VFS.File_Array_Access)
+    is
+-      Mains_Str_List : String_List_Access;
++      Mains_Str_List : String_Vectors.Vector;
+       Closure_Status : GPR.Util.Status_Type;
+-      Closures_List  : String_List_Access;
++      Closures_List  : String_Vectors.Vector;
+    begin
+       Trace (Me, "Get_Closures");
+ 
+@@ -3287,25 +3287,18 @@
+          return;
+       end if;
+ 
+-      Mains_Str_List := new String_List (Mains'First .. Mains'Last);
+       for I in Mains'Range loop
+-         Mains_Str_List (I) := new String'(Mains (I).Display_Base_Name);
++         Mains_Str_List.Append (Mains (I).Display_Base_Name);
+       end loop;
+ 
+       GPR.Util.Get_Closures
+         (Project.Get_View, Project.Tree_View,
+-         Mains                    => Mains_Str_List.all,
++         Mains                    => Mains_Str_List,
+          All_Projects             => All_Projects,
+          Include_Externally_Built => Include_Externally_Built,
+          Status                   => Closure_Status,
+          Result                   => Closures_List);
+ 
+-      --  Freeing temporary list of mains.
+-      for I in Mains_Str_List'Range loop
+-         Free (Mains_Str_List (I));
+-      end loop;
+-      Free (Mains_Str_List);
+-
+       case Closure_Status is
+          when Success =>
+             Status := Success;
+@@ -3321,17 +3314,10 @@
+       end case;
+ 
+       if Closure_Status in Success | Incomplete_Closure then
+-         for I in Closures_List'Range loop
+-            Append (Result, Create (+Closures_List (I).all));
++         for Closure of Closures_List loop
++            Append (Result, Create (+Closure));
+          end loop;
+       end if;
+-
+-      --  Freeing temporary list of closures.
+-      for I in Closures_List'Range loop
+-         Free (Closures_List (I));
+-      end loop;
+-      Free (Closures_List);
+-
+    end Get_Closures;
+ 
+    ----------------

diff --git a/dev-ada/gnatcoll/gnatcoll-2017.ebuild b/dev-ada/gnatcoll/gnatcoll-2017.ebuild
index 8790026af64..20e5c844541 100644
--- a/dev-ada/gnatcoll/gnatcoll-2017.ebuild
+++ b/dev-ada/gnatcoll/gnatcoll-2017.ebuild
@@ -35,7 +35,7 @@ RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
 	postgres? ( dev-db/postgresql:* )
 	sqlite? ( dev-db/sqlite )
 	projects? (
-		~dev-ada/libgpr-2017[gnat_2016=,gnat_2017=,shared?,static-libs?]
+		~dev-ada/libgpr-2018[gnat_2016=,gnat_2017=,shared?,static-libs?]
 		dev-ada/xmlada[shared?,static-libs?]
 	)"
 DEPEND="${RDEPEND}


^ permalink raw reply related	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2018-11-18 10:10 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-11-10  8:35 [gentoo-commits] repo/gentoo:master commit in: dev-ada/gnatcoll/files/, dev-ada/gnatcoll/ Alfredo Tupone
  -- strict thread matches above, loose matches on Subject: below --
2018-11-18 10:10 Alfredo Tupone
2018-11-14 21:45 Alfredo Tupone
2018-11-13 20:30 Alfredo Tupone
2018-11-11 11:01 Alfredo Tupone
2017-11-25 15:11 Alfredo Tupone
2017-06-24 16:45 Alfredo Tupone
2017-04-24 21:04 Alfredo Tupone
2017-04-06  6:44 Alfredo Tupone
2017-04-05  9:27 Alfredo Tupone

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox