* [gentoo-commits] repo/gentoo:master commit in: dev-ada/gnatcoll/, dev-ada/gnatcoll/files/
@ 2017-04-18 20:40 Alfredo Tupone
0 siblings, 0 replies; 4+ messages in thread
From: Alfredo Tupone @ 2017-04-18 20:40 UTC (permalink / raw
To: gentoo-commits
commit: 3968fbe1a801e276a36abce16bf412792f7b3fe8
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 18 20:40:25 2017 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Tue Apr 18 20:40:25 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3968fbe1
dev-ada/gnatcoll: port to python-single-r1. Bug #615914
Package-Manager: Portage-2.3.3, Repoman-2.3.1
dev-ada/gnatcoll/files/gnatcoll-2016-gentoo.patch | 9 +++++++++
dev-ada/gnatcoll/gnatcoll-2016.ebuild | 22 ++++++++++++----------
2 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/dev-ada/gnatcoll/files/gnatcoll-2016-gentoo.patch b/dev-ada/gnatcoll/files/gnatcoll-2016-gentoo.patch
index bb2112a058f..e69b6e50a90 100644
--- a/dev-ada/gnatcoll/files/gnatcoll-2016-gentoo.patch
+++ b/dev-ada/gnatcoll/files/gnatcoll-2016-gentoo.patch
@@ -101,6 +101,15 @@
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");
@@ -67,7 +67,7 @@
when "Production" =>
diff --git a/dev-ada/gnatcoll/gnatcoll-2016.ebuild b/dev-ada/gnatcoll/gnatcoll-2016.ebuild
index 36e52edb121..b4db44c4c21 100644
--- a/dev-ada/gnatcoll/gnatcoll-2016.ebuild
+++ b/dev-ada/gnatcoll/gnatcoll-2016.ebuild
@@ -2,8 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-
-inherit multilib multiprocessing autotools
+PYTHON_COMPAT=( python2_7 )
+inherit multilib multiprocessing autotools python-single-r1
MYP=${PN}-gpl-${PV}
@@ -20,20 +20,18 @@ RDEPEND="dev-lang/gnat-gpl
gmp? ( dev-libs/gmp:* )
postgresql? ( dev-db/postgresql:* )
pygobject? (
- || (
- dev-python/pygobject:2
- dev-python/pygobject:3
- )
+ dev-python/pygobject:*[${PYTHON_USEDEP}]
)
- python? ( dev-lang/python:2.7 )
+ python? ( ${PYTHON_DEPS} )
sqlite? ( dev-db/sqlite )
projects? (
- dev-ada/gprbuild[static?]
- dev-ada/gprbuild[shared?]
+ dev-ada/gprbuild[static?,shared?]
)"
DEPEND="${RDEPEND}
dev-ada/gprbuild"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
S="${WORKDIR}"/${MYP}-src
PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
@@ -48,10 +46,12 @@ 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
}
src_prepare() {
default
+ mv configure.{in,ac} || die
eautoreconf
}
@@ -74,7 +74,7 @@ src_configure() {
$(use_enable readline gpl) \
$(use_enable readline) \
$(use_enable syslog) \
- --with-python-exec=python2 \
+ --with-python-exec=${EPYTHON} \
--enable-shared-python \
--without-gtk \
--disable-pygtk \
@@ -102,6 +102,8 @@ src_install() {
dodoc -r features-* known-problems-* examples
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}/
+ rm -rf "${D}"/usr/share/doc/${PN}
+ use python && python_fix_shebang "${ED}"usr/share/gnatcoll/dborm.py
}
src_test() {
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ada/gnatcoll/, dev-ada/gnatcoll/files/
@ 2017-07-05 20:27 Alfredo Tupone
0 siblings, 0 replies; 4+ messages in thread
From: Alfredo Tupone @ 2017-07-05 20:27 UTC (permalink / raw
To: gentoo-commits
commit: bbb0250a9d9849cf72b527b75205bc3107025546
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 5 20:26:56 2017 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Wed Jul 5 20:27:21 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbb0250a
dev-ada/gnatcoll: Add tools use flag to build gnatcoll_db2ada
Package-Manager: Portage-2.3.6, Repoman-2.3.1
dev-ada/gnatcoll/files/gnatcoll-2016-gentoo.patch | 21 ---------------------
dev-ada/gnatcoll/gnatcoll-2016.ebuild | 15 +++++++++++----
dev-ada/gnatcoll/gnatcoll-2017.ebuild | 9 ++++++++-
dev-ada/gnatcoll/metadata.xml | 14 ++++++++++++--
4 files changed, 31 insertions(+), 28 deletions(-)
diff --git a/dev-ada/gnatcoll/files/gnatcoll-2016-gentoo.patch b/dev-ada/gnatcoll/files/gnatcoll-2016-gentoo.patch
index a54a7c12566..1a1d4d14eec 100644
--- a/dev-ada/gnatcoll/files/gnatcoll-2016-gentoo.patch
+++ b/dev-ada/gnatcoll/files/gnatcoll-2016-gentoo.patch
@@ -23,27 +23,6 @@
#######################################################################
# 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 @@
diff --git a/dev-ada/gnatcoll/gnatcoll-2016.ebuild b/dev-ada/gnatcoll/gnatcoll-2016.ebuild
index 9ceb0858a42..165b27e6abd 100644
--- a/dev-ada/gnatcoll/gnatcoll-2016.ebuild
+++ b/dev-ada/gnatcoll/gnatcoll-2016.ebuild
@@ -16,7 +16,7 @@ LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64"
IUSE="gmp gnat_2016 gnat_2017 gtk iconv postgresql pygobject projects readline
- +shared sqlite static syslog"
+ +shared sqlite static syslog tools"
RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )
@@ -101,17 +101,24 @@ src_compile() {
emake PROCESSORS=$(makeopts_jobs) GPRBUILD_OPTIONS=-v GCC=${GCC} \
build_library_type/static
fi
+ if use tools; then
+ emake PROCESSORS=$(makeopts_jobs) GPRBUILD_OPTIONS=-v GCC=${GCC} \
+ build_tools/static
+ fi
python_fix_shebang .
}
src_install() {
if use shared; then
- emake DESTDIR="${D}" install_library_type/relocatable
+ emake prefix="${D}usr" install_library_type/relocatable
fi
if use static; then
- emake DESTDIR="${D}" install_library_type/static
+ emake prefix="${D}usr" install_library_type/static
+ fi
+ if use tools; then
+ emake prefix="${D}usr" install_tools/static
fi
- emake DESTDIR="${D}" install_gps_plugin
+ emake prefix="${D}usr" install_gps_plugin
einstalldocs
dodoc -r features-* known-problems-*
mv "${D}"/usr/share/doc/${PN}/GNATColl.pdf "${D}"/usr/share/doc/${PF}/
diff --git a/dev-ada/gnatcoll/gnatcoll-2017.ebuild b/dev-ada/gnatcoll/gnatcoll-2017.ebuild
index 21b6e39c137..9656c9a094e 100644
--- a/dev-ada/gnatcoll/gnatcoll-2017.ebuild
+++ b/dev-ada/gnatcoll/gnatcoll-2017.ebuild
@@ -16,7 +16,7 @@ LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64"
IUSE="gmp gnat_2016 gnat_2017 gtk iconv postgresql pygobject projects readline
- +shared sqlite static syslog"
+ +shared sqlite static syslog tools"
RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )
@@ -101,6 +101,10 @@ src_compile() {
emake PROCESSORS=$(makeopts_jobs) GPRBUILD_OPTIONS=-v GCC=${GCC} \
build_library_type/static
fi
+ if use tools; then
+ emake PROCESSORS=$(makeopts_jobs) GPRBUILD_OPTIONS=-v GCC=${GCC} \
+ build_tools/static
+ fi
python_fix_shebang .
}
@@ -111,6 +115,9 @@ src_install() {
if use static; then
emake prefix="${D}usr" install_library_type/static
fi
+ if use tools; then
+ emake prefix="${D}usr" install_tools/static
+ fi
emake prefix="${D}usr" install_gps_plugin
einstalldocs
}
diff --git a/dev-ada/gnatcoll/metadata.xml b/dev-ada/gnatcoll/metadata.xml
index a54b19b4b3c..cca8442f43b 100644
--- a/dev-ada/gnatcoll/metadata.xml
+++ b/dev-ada/gnatcoll/metadata.xml
@@ -13,10 +13,20 @@
<flag name="pygobject">Adds support for pygobject</flag>
<flag name="shared">Build shared library</flag>
<flag name="static">Build static library</flag>
+ <flag name="tools">Build associated tools</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 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.
+ 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] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ada/gnatcoll/, dev-ada/gnatcoll/files/
@ 2018-11-17 14:17 Alfredo Tupone
0 siblings, 0 replies; 4+ messages in thread
From: Alfredo Tupone @ 2018-11-17 14:17 UTC (permalink / raw
To: gentoo-commits
commit: 2ea89c208511c8b1f9f4f06110b33730b48697f6
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 17 14:17:31 2018 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sat Nov 17 14:17:31 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ea89c20
dev-ada/gnatcoll: Enable build with gnat_2016 & remove old
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
dev-ada/gnatcoll/Manifest | 1 -
dev-ada/gnatcoll/files/gnatcoll-2016-gentoo.patch | 297 ----------------------
dev-ada/gnatcoll/files/gnatcoll-2017-gentoo.patch | 169 +++---------
dev-ada/gnatcoll/gnatcoll-2016.ebuild | 127 ---------
dev-ada/gnatcoll/gnatcoll-2017.ebuild | 32 +--
5 files changed, 49 insertions(+), 577 deletions(-)
diff --git a/dev-ada/gnatcoll/Manifest b/dev-ada/gnatcoll/Manifest
index 109aacccdc2..3fb4963a439 100644
--- a/dev-ada/gnatcoll/Manifest
+++ b/dev-ada/gnatcoll/Manifest
@@ -1,2 +1 @@
-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-2016-gentoo.patch b/dev-ada/gnatcoll/files/gnatcoll-2016-gentoo.patch
deleted file mode 100644
index ee987a72c1f..00000000000
--- a/dev-ada/gnatcoll/files/gnatcoll-2016-gentoo.patch
+++ /dev/null
@@ -1,297 +0,0 @@
---- 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
-
- @echo "====== Building $(@F) libraries ======"
-- ${GPRBUILD} ${GPRBLD_OPTS} -Pgnatcoll_full
-+ ${GPRBUILD} ${GPRBLD_OPTS} -Pgnatcoll_full -v -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 -v -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 -v -cargs ${ADAFLAGS}
-
- #######################################################################
- # 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 @@
-
- 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");
---- 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 @@
- 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
---- a/testsuite/json/__init__.py 2017-04-24 17:52:34.158513249 +0200
-+++ b/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")
-
---- a/testsuite/projects/__init__.py 2017-04-24 19:10:30.465246199 +0200
-+++ b/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
---- a/src/tools/gnatcoll_db2ada.adb 2017-04-24 21:36:09.193973179 +0200
-+++ b/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,
---- 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");
---- 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;
---- 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/files/gnatcoll-2017-gentoo.patch b/dev-ada/gnatcoll/files/gnatcoll-2017-gentoo.patch
index ecec0b78458..36da82626f4 100644
--- a/dev-ada/gnatcoll/files/gnatcoll-2017-gentoo.patch
+++ b/dev-ada/gnatcoll/files/gnatcoll-2017-gentoo.patch
@@ -1,63 +1,45 @@
---- 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 @@
+--- a/Makefile 2017-01-20 19:39:07.131398270 +0100
++++ b/Makefile 2017-01-20 19:42:30.088728844 +0100
+@@ -43,18 +43,18 @@
+
+ # 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} -XXMLADA_BUILD=$(@F)
++GPRBLD_OPTS=-p -m -j${PROCESSORS} -XGPR_BUILD=$(@F) -XLIBRARY_TYPE=$(@F) -XGnatcoll_Build=${Gnatcoll_Build} -XXMLADA_BUILD=$(@F)
+
+ build_library_type/%: generate_sources
@${RM} src/gnatcoll-atomic.adb
@echo "====== Building $(@F) libraries ======"
- ${GPRBUILD} ${GPRBLD_OPTS} -Pgnatcoll_full
-+ ${GPRBUILD} ${GPRBLD_OPTS} -Pgnatcoll_full -cargs ${ADAFLAGS}
++ ${GPRBUILD} ${GPRBLD_OPTS} -Pgnatcoll_full -v -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}
++ ${GPRBUILD} ${GPRBLD_OPTS} -Psrc/gnatcoll_gtk -v -cargs ${ADAFLAGS}
endif
build_tools/%: build_library_type/%
-@@ -63,7 +63,7 @@
+@@ -63,13 +63,14 @@
@# 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}
++ ${GPRBUILD} ${GPRBLD_OPTS} -q -Psrc/gnatcoll_tools -v -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 @@
+ GPRINST_OPTS=-p -f --prefix=${prefix} --install-name=gnatcoll \
+ --exec-subdir=${bindir} --project-subdir=lib/gnat -XXMLADA_BUILD=$(@F) \
++ -XGPR_BUILD=$(@F) \
+ --build-var=LIBRARY_TYPE --build-name=$(@F) -XLIBRARY_TYPE=$(@F)
- -- 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
+ 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 @@
type Yes_No is ("yes", "no");
@@ -67,29 +49,8 @@
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
+--- 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 @@
cat > conftest.ada <<EOF
[$3]
@@ -108,8 +69,8 @@
[
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
+--- a/testsuite/json/__init__.py 2017-04-24 17:52:34.158513249 +0200
++++ b/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")
@@ -119,26 +80,8 @@
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
+--- a/testsuite/projects/__init__.py 2017-04-24 19:10:30.465246199 +0200
++++ b/testsuite/projects/__init__.py 2017-04-24 19:10:42.768035080 +0200
@@ -105,25 +105,6 @@
self.gprbuild("default.gpr")
self.runexec("main", "")
@@ -165,27 +108,8 @@
@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
+--- a/src/tools/gnatcoll_db2ada.adb 2017-04-24 21:36:09.193973179 +0200
++++ b/src/tools/gnatcoll_db2ada.adb 2017-04-24 21:36:16.029858932 +0200
@@ -211,7 +211,7 @@
declare
@@ -195,35 +119,8 @@
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
---- 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
+--- a/src/gnatcoll-projects.ads 2017-11-25 14:50:06.919939453 +0100
++++ b/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
@@ -234,8 +131,8 @@
-- 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
+--- a/src/tools/gnatinspect.adb 2017-11-25 14:52:47.282170250 +0100
++++ b/src/tools/gnatinspect.adb 2017-11-25 14:52:57.691990254 +0100
@@ -642,7 +642,7 @@
GNAT_Version : GNAT.Strings.String_Access;
begin
diff --git a/dev-ada/gnatcoll/gnatcoll-2016.ebuild b/dev-ada/gnatcoll/gnatcoll-2016.ebuild
deleted file mode 100644
index 0194b141db2..00000000000
--- a/dev-ada/gnatcoll/gnatcoll-2016.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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/5739942ac7a447658d00e1e7
- -> ${MYP}-src.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gmp +gnat_2016 gnat_2017 gtk iconv postgres pygobject projects readline
- +shared sqlite static-libs syslog tools"
-
-RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
- gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )
- ${PYTHON_DEPS}
- gmp? ( dev-libs/gmp:* )
- gtk? (
- dev-ada/gtkada[gnat_2016=,gnat_2017=,shared?,static-libs?]
- 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}] )
- postgres? ( dev-db/postgresql:* )
- sqlite? ( dev-db/sqlite )
- projects? (
- ~dev-ada/libgpr-2018[gnat_2016=,gnat_2017=,shared?,static-libs?]
- dev-ada/xmlada[shared?,static-libs?]
- )"
-DEPEND="${RDEPEND}
- dev-ada/gprbuild[gnat_2016=,gnat_2017=]"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- tools? ( static-libs )
- pygobject? ( gtk )
- ^^ ( gnat_2016 gnat_2017 )"
-
-S="${WORKDIR}"/${MYP}-src
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_prepare() {
- default
- mv configure.{in,ac} || die
- eautoreconf
-}
-
-src_configure() {
- if use gnat_2016; then
- GCC_PV=4.9.4
- else
- GCC_PV=6.3.0
- fi
- GNATMAKE=${CHOST}-gnatmake-${GCC_PV}
- GNATCHOP=${CHOST}-gnatchop-${GCC_PV}
- 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 postgres 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 \
- $myConf
-}
-
-src_compile() {
- if use shared; then
- emake PROCESSORS=$(makeopts_jobs) \
- build_library_type/relocatable
- fi
- if use static-libs; then
- emake PROCESSORS=$(makeopts_jobs) \
- 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-libs; then
- emake prefix="${D}usr" install_library_type/static
- fi
- emake prefix="${D}usr" install_gps_plugin
- einstalldocs
- dodoc -r features-* known-problems-*
-}
-
-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
-}
diff --git a/dev-ada/gnatcoll/gnatcoll-2017.ebuild b/dev-ada/gnatcoll/gnatcoll-2017.ebuild
index e13a6333db2..8790026af64 100644
--- a/dev-ada/gnatcoll/gnatcoll-2017.ebuild
+++ b/dev-ada/gnatcoll/gnatcoll-2017.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
@@ -18,11 +18,12 @@ KEYWORDS="amd64 x86"
IUSE="gmp gnat_2016 +gnat_2017 gtk iconv postgres pygobject projects readline
+shared sqlite static-libs syslog tools"
-RDEPEND="dev-lang/gnat-gpl:6.3.0
+RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
+ gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )
${PYTHON_DEPS}
gmp? ( dev-libs/gmp:* )
gtk? (
- dev-ada/gtkada[gnat_2017,shared?,static-libs?]
+ dev-ada/gtkada[gnat_2016=,gnat_2017=,shared?,static-libs?]
dev-libs/atk
dev-libs/glib
x11-libs/cairo
@@ -34,23 +35,27 @@ RDEPEND="dev-lang/gnat-gpl:6.3.0
postgres? ( dev-db/postgresql:* )
sqlite? ( dev-db/sqlite )
projects? (
- =dev-ada/libgpr-2017*[gnat_2017,shared?,static-libs?]
+ ~dev-ada/libgpr-2017[gnat_2016=,gnat_2017=,shared?,static-libs?]
dev-ada/xmlada[shared?,static-libs?]
)"
DEPEND="${RDEPEND}
- dev-ada/gprbuild[gnat_2017]"
+ dev-ada/gprbuild[gnat_2016=,gnat_2017=]"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
tools? ( static-libs )
pygobject? ( gtk )
- !gnat_2016 gnat_2017"
+ ^^ ( gnat_2016 gnat_2017 )"
S="${WORKDIR}"/${MYP}-src
PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
src_prepare() {
- GCC_PV=6.3.0
+ if use gnat_2016; then
+ GCC_PV=4.9.4
+ else
+ GCC_PV=6.3.0
+ fi
default
mv configure.{in,ac} || die
sed -i \
@@ -62,7 +67,6 @@ src_prepare() {
}
src_configure() {
- GCC=${CHOST}-gcc-${GCC_PV}
GNATMAKE=${CHOST}-gnatmake-${GCC_PV}
GNATCHOP=${CHOST}-gnatchop-${GCC_PV}
if use sqlite; then
@@ -90,22 +94,18 @@ 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} \
- build_library_type/relocatable
+ emake PROCESSORS=$(makeopts_jobs) build_library_type/relocatable
fi
if use static-libs; then
- emake PROCESSORS=$(makeopts_jobs) GPRBUILD_OPTIONS=-v GCC=${GCC} \
- build_library_type/static
+ emake PROCESSORS=$(makeopts_jobs) build_library_type/static
fi
if use tools; then
- emake PROCESSORS=$(makeopts_jobs) GPRBUILD_OPTIONS=-v GCC=${GCC} \
- build_tools/static
+ emake PROCESSORS=$(makeopts_jobs) build_tools/static
fi
python_fix_shebang .
}
@@ -127,7 +127,7 @@ src_install() {
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
+ # Even in this case there are still some problems
# Going into the testsuite directory and running
# ./run.py -v -v
# run here (having enabled most USE flags)
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ada/gnatcoll/, dev-ada/gnatcoll/files/
@ 2019-09-14 17:10 Alfredo Tupone
0 siblings, 0 replies; 4+ messages in thread
From: Alfredo Tupone @ 2019-09-14 17:10 UTC (permalink / raw
To: gentoo-commits
commit: 16a5784a51534af0453811caa81181309aa4bf81
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 14 17:10:16 2019 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sat Sep 14 17:10:16 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16a5784a
dev-ada/gnatcoll: simplify using ada eclass
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
.../gnatcoll/files/gnatcoll-2017-r1-gentoo.patch | 186 +++++++++++++++++++++
dev-ada/gnatcoll/gnatcoll-2017-r1.ebuild | 129 ++++++++++++++
2 files changed, 315 insertions(+)
diff --git a/dev-ada/gnatcoll/files/gnatcoll-2017-r1-gentoo.patch b/dev-ada/gnatcoll/files/gnatcoll-2017-r1-gentoo.patch
new file mode 100644
index 00000000000..b8b92e4b737
--- /dev/null
+++ b/dev-ada/gnatcoll/files/gnatcoll-2017-r1-gentoo.patch
@@ -0,0 +1,186 @@
+--- a/Makefile 2017-01-20 19:39:07.131398270 +0100
++++ b/Makefile 2017-01-20 19:42:30.088728844 +0100
+@@ -43,18 +43,18 @@
+
+ # 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} -XXMLADA_BUILD=$(@F)
++GPRBLD_OPTS=-p -m -j${PROCESSORS} -XGPR_BUILD=$(@F) -XLIBRARY_TYPE=$(@F) -XGnatcoll_Build=${Gnatcoll_Build} -XXMLADA_BUILD=$(@F)
+
+ build_library_type/%: generate_sources
+ @${RM} src/gnatcoll-atomic.adb
+
+ @echo "====== Building $(@F) libraries ======"
+- ${GPRBUILD} ${GPRBLD_OPTS} -Pgnatcoll_full
++ ${GPRBUILD} ${GPRBLD_OPTS} -Pgnatcoll_full -v -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 -v -cargs ${ADAFLAGS}
+ endif
+
+ build_tools/%: build_library_type/%
+@@ -63,13 +63,14 @@
+ @# 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 -v -cargs ${ADAFLAGS}
+
+ #######################################################################
+ # install
+
+ GPRINST_OPTS=-p -f --prefix=${prefix} --install-name=gnatcoll \
+ --exec-subdir=${bindir} --project-subdir=lib/gnat -XXMLADA_BUILD=$(@F) \
++ -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 @@
+
+ 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");
+--- a/testsuite/json/__init__.py 2017-04-24 17:52:34.158513249 +0200
++++ b/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")
+
+--- a/testsuite/projects/__init__.py 2017-04-24 19:10:30.465246199 +0200
++++ b/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
+--- a/src/tools/gnatcoll_db2ada.adb 2017-04-24 21:36:09.193973179 +0200
++++ b/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,
+--- a/src/gnatcoll-projects.ads 2017-11-25 14:50:06.919939453 +0100
++++ b/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;
+--- a/src/tools/gnatinspect.adb 2017-11-25 14:52:47.282170250 +0100
++++ b/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);
+--- 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-r1.ebuild b/dev-ada/gnatcoll/gnatcoll-2017-r1.ebuild
new file mode 100644
index 00000000000..ae3680e4ccc
--- /dev/null
+++ b/dev-ada/gnatcoll/gnatcoll-2017-r1.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+ADA_COMPAT=( gnat_201{6,7} )
+inherit ada 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 ~x86"
+IUSE="gmp gtk iconv postgres pygobject projects readline
+ +shared sqlite static-libs syslog tools"
+
+RDEPEND="${ADA_DEPS}
+ ${PYTHON_DEPS}
+ gmp? ( dev-libs/gmp:* )
+ gtk? (
+ dev-ada/gtkada[${ADA_USEDEP},shared?,static-libs?]
+ 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}] )
+ postgres? ( dev-db/postgresql:* )
+ sqlite? ( dev-db/sqlite )
+ projects? (
+ >=dev-ada/libgpr-2018[${ADA_USEDEP},shared?,static-libs?]
+ dev-ada/xmlada[shared?,static-libs?]
+ )
+ !dev-ada/gnatcoll-core
+ !dev-ada/gnatcoll-bindings
+ !dev-ada/gnatcoll-db"
+DEPEND="${RDEPEND}
+ dev-ada/gprbuild[${ADA_USEDEP}]"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ tools? ( static-libs )
+ pygobject? ( gtk )
+ ${ADA_REQUIRED_USE}"
+
+S="${WORKDIR}"/${MYP}-src
+
+PATCHES=( "${FILESDIR}"/${P}-r1-gentoo.patch )
+
+src_prepare() {
+ default
+ mv configure.{in,ac} || die
+ sed -i \
+ -e "s:@GNATLS@:${GNATLS}:g" \
+ src/gnatcoll-projects.ads \
+ src/tools/gnatinspect.adb \
+ || 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 \
+ --with-python \
+ $(use_with gmp) \
+ $(use_with iconv) \
+ $(use_with postgres 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 \
+ $myConf
+}
+
+src_compile() {
+ if use shared; then
+ emake PROCESSORS=$(makeopts_jobs) build_library_type/relocatable
+ fi
+ if use static-libs; then
+ emake PROCESSORS=$(makeopts_jobs) build_library_type/static
+ fi
+ if use tools; then
+ emake PROCESSORS=$(makeopts_jobs) build_tools/static
+ fi
+ python_fix_shebang .
+}
+
+src_install() {
+ if use shared; then
+ emake prefix="${D}usr" install_library_type/relocatable
+ fi
+ if use static-libs; then
+ emake prefix="${D}usr" install_library_type/static
+ fi
+ if use tools; then
+ emake prefix="${D}usr" install_tools/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 problems
+ # 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] 4+ messages in thread
end of thread, other threads:[~2019-09-14 17:10 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-07-05 20:27 [gentoo-commits] repo/gentoo:master commit in: dev-ada/gnatcoll/, dev-ada/gnatcoll/files/ Alfredo Tupone
-- strict thread matches above, loose matches on Subject: below --
2019-09-14 17:10 Alfredo Tupone
2018-11-17 14:17 Alfredo Tupone
2017-04-18 20:40 Alfredo Tupone
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox