[gentoo-commits] repo/gentoo:master commit in: dev-ada/gnatcoll/, dev-ada/gnatcoll/files/

2019-09-14 Thread Alfredo Tupone
commit: 16a5784a51534af0453811caa81181309aa4bf81
Author: Tupone Alfredo  gentoo  org>
AuthorDate: Sat Sep 14 17:10:16 2019 +
Commit: Alfredo Tupone  gentoo  org>
CommitDate: Sat Sep 14 17:10:16 2019 +
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  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 000..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, "")
+-
+-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.adb2017-04-24 21:36:09.193973179 +0200
 b/src/tools/gnatcoll_db2ada.adb2017-04-24 21:36:16.029858932 +0200
+@@ -211,7 +211,7 @@
+ 
+   declare
+  Output : constant String := Get_Command_Output
+-  

[gentoo-commits] repo/gentoo:master commit in: dev-ada/gnatcoll/, dev-ada/gnatcoll/files/

2018-11-17 Thread Alfredo Tupone
commit: 2ea89c208511c8b1f9f4f06110b33730b48697f6
Author: Tupone Alfredo  gentoo  org>
AuthorDate: Sat Nov 17 14:17:31 2018 +
Commit: Alfredo Tupone  gentoo  org>
CommitDate: Sat Nov 17 14:17:31 2018 +
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  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..000
--- 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 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 

[gentoo-commits] repo/gentoo:master commit in: dev-ada/gnatcoll/, dev-ada/gnatcoll/files/

2017-07-05 Thread Alfredo Tupone
commit: bbb0250a9d9849cf72b527b75205bc3107025546
Author: Tupone Alfredo  gentoo  org>
AuthorDate: Wed Jul  5 20:26:56 2017 +
Commit: Alfredo Tupone  gentoo  org>
CommitDate: Wed Jul  5 20:27:21 2017 +
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
+

[gentoo-commits] repo/gentoo:master commit in: dev-ada/gnatcoll/, dev-ada/gnatcoll/files/

2017-04-18 Thread Alfredo Tupone
commit: 3968fbe1a801e276a36abce16bf412792f7b3fe8
Author: Tupone Alfredo  gentoo  org>
AuthorDate: Tue Apr 18 20:40:25 2017 +
Commit: Alfredo Tupone  gentoo  org>
CommitDate: Tue Apr 18 20:40:25 2017 +
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() {