| 1 |
commit: 3968fbe1a801e276a36abce16bf412792f7b3fe8 |
| 2 |
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Apr 18 20:40:25 2017 +0000 |
| 4 |
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Apr 18 20:40:25 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3968fbe1 |
| 7 |
|
| 8 |
dev-ada/gnatcoll: port to python-single-r1. Bug #615914 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
| 11 |
|
| 12 |
dev-ada/gnatcoll/files/gnatcoll-2016-gentoo.patch | 9 +++++++++ |
| 13 |
dev-ada/gnatcoll/gnatcoll-2016.ebuild | 22 ++++++++++++---------- |
| 14 |
2 files changed, 21 insertions(+), 10 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-ada/gnatcoll/files/gnatcoll-2016-gentoo.patch b/dev-ada/gnatcoll/files/gnatcoll-2016-gentoo.patch |
| 17 |
index bb2112a058f..e69b6e50a90 100644 |
| 18 |
--- a/dev-ada/gnatcoll/files/gnatcoll-2016-gentoo.patch |
| 19 |
+++ b/dev-ada/gnatcoll/files/gnatcoll-2016-gentoo.patch |
| 20 |
@@ -101,6 +101,15 @@ |
| 21 |
package Linker is |
| 22 |
--- gnatcoll-gpl-2016-src/gnatcoll_shared.gpr.in.old 2017-01-20 19:50:03.222808656 +0100 |
| 23 |
+++ gnatcoll-gpl-2016-src/gnatcoll_shared.gpr.in 2017-01-20 19:50:28.200399274 +0100 |
| 24 |
+@@ -13,7 +13,7 @@ |
| 25 |
+ |
| 26 |
+ type Yes_No is ("yes", "no"); |
| 27 |
+ Gtk : Yes_No := External ("GTK", "@WITH_GTK@"); |
| 28 |
+- Python : Yes_No := External ("PYTHON", "@WITH_PYTHON@"); |
| 29 |
++ Python : Yes_No := "@WITH_PYTHON@"; |
| 30 |
+ Syslog : Yes_No := External ("SYSLOG", "@WITH_SYSLOG@"); |
| 31 |
+ Postgres : Yes_No := External ("POSTGRES", "@WITH_POSTGRES@"); |
| 32 |
+ type Sqlite_Inclusion is ("yes", "no", "embedded"); |
| 33 |
@@ -67,7 +67,7 @@ |
| 34 |
|
| 35 |
when "Production" => |
| 36 |
|
| 37 |
diff --git a/dev-ada/gnatcoll/gnatcoll-2016.ebuild b/dev-ada/gnatcoll/gnatcoll-2016.ebuild |
| 38 |
index 36e52edb121..b4db44c4c21 100644 |
| 39 |
--- a/dev-ada/gnatcoll/gnatcoll-2016.ebuild |
| 40 |
+++ b/dev-ada/gnatcoll/gnatcoll-2016.ebuild |
| 41 |
@@ -2,8 +2,8 @@ |
| 42 |
# Distributed under the terms of the GNU General Public License v2 |
| 43 |
|
| 44 |
EAPI=6 |
| 45 |
- |
| 46 |
-inherit multilib multiprocessing autotools |
| 47 |
+PYTHON_COMPAT=( python2_7 ) |
| 48 |
+inherit multilib multiprocessing autotools python-single-r1 |
| 49 |
|
| 50 |
MYP=${PN}-gpl-${PV} |
| 51 |
|
| 52 |
@@ -20,20 +20,18 @@ RDEPEND="dev-lang/gnat-gpl |
| 53 |
gmp? ( dev-libs/gmp:* ) |
| 54 |
postgresql? ( dev-db/postgresql:* ) |
| 55 |
pygobject? ( |
| 56 |
- || ( |
| 57 |
- dev-python/pygobject:2 |
| 58 |
- dev-python/pygobject:3 |
| 59 |
- ) |
| 60 |
+ dev-python/pygobject:*[${PYTHON_USEDEP}] |
| 61 |
) |
| 62 |
- python? ( dev-lang/python:2.7 ) |
| 63 |
+ python? ( ${PYTHON_DEPS} ) |
| 64 |
sqlite? ( dev-db/sqlite ) |
| 65 |
projects? ( |
| 66 |
- dev-ada/gprbuild[static?] |
| 67 |
- dev-ada/gprbuild[shared?] |
| 68 |
+ dev-ada/gprbuild[static?,shared?] |
| 69 |
)" |
| 70 |
DEPEND="${RDEPEND} |
| 71 |
dev-ada/gprbuild" |
| 72 |
|
| 73 |
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
| 74 |
+ |
| 75 |
S="${WORKDIR}"/${MYP}-src |
| 76 |
|
| 77 |
PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) |
| 78 |
@@ -48,10 +46,12 @@ pkg_setup() { |
| 79 |
eerror "2) set ADA=gcc-4.9.4 in make.conf" |
| 80 |
die "ada compiler not available" |
| 81 |
fi |
| 82 |
+ use python && python-single-r1_pkg_setup |
| 83 |
} |
| 84 |
|
| 85 |
src_prepare() { |
| 86 |
default |
| 87 |
+ mv configure.{in,ac} || die |
| 88 |
eautoreconf |
| 89 |
} |
| 90 |
|
| 91 |
@@ -74,7 +74,7 @@ src_configure() { |
| 92 |
$(use_enable readline gpl) \ |
| 93 |
$(use_enable readline) \ |
| 94 |
$(use_enable syslog) \ |
| 95 |
- --with-python-exec=python2 \ |
| 96 |
+ --with-python-exec=${EPYTHON} \ |
| 97 |
--enable-shared-python \ |
| 98 |
--without-gtk \ |
| 99 |
--disable-pygtk \ |
| 100 |
@@ -102,6 +102,8 @@ src_install() { |
| 101 |
dodoc -r features-* known-problems-* examples |
| 102 |
mv "${D}"/usr/share/doc/${PN}/GNATColl.pdf "${D}"/usr/share/doc/${PF}/ |
| 103 |
mv "${D}"/usr/share/doc/${PN}/html/html "${D}"/usr/share/doc/${PF}/ |
| 104 |
+ rm -rf "${D}"/usr/share/doc/${PN} |
| 105 |
+ use python && python_fix_shebang "${ED}"usr/share/gnatcoll/dborm.py |
| 106 |
} |
| 107 |
|
| 108 |
src_test() { |
Archives