| 1 |
commit: 8210cca97406e547eac3027180a7ef09c8cc6fe2 |
| 2 |
Author: Michael Weber <xmw <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Dec 11 08:15:04 2017 +0000 |
| 4 |
Commit: Michael Weber <xmw <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Dec 11 08:15:04 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8210cca9 |
| 7 |
|
| 8 |
sci-electronics/geda: Fix m4 test for guile-2.2, thanks Juergen Rose. |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/639884 |
| 11 |
Package-Manager: Portage-2.3.17, Repoman-2.3.6 |
| 12 |
|
| 13 |
sci-electronics/geda/files/geda-1.9.2-guile-2.2.patch | 16 ++++++++++++++++ |
| 14 |
sci-electronics/geda/geda-1.8.2.ebuild | 3 ++- |
| 15 |
.../geda/{geda-1.9.2.ebuild => geda-1.9.2-r1.ebuild} | 10 ++++++++-- |
| 16 |
3 files changed, 26 insertions(+), 3 deletions(-) |
| 17 |
|
| 18 |
diff --git a/sci-electronics/geda/files/geda-1.9.2-guile-2.2.patch b/sci-electronics/geda/files/geda-1.9.2-guile-2.2.patch |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..63167336780 |
| 21 |
--- /dev/null |
| 22 |
+++ b/sci-electronics/geda/files/geda-1.9.2-guile-2.2.patch |
| 23 |
@@ -0,0 +1,16 @@ |
| 24 |
+--- geda-gaf-1.9.2/m4/geda-guile.m4 |
| 25 |
++++ geda-gaf-1.9.2/m4/geda-guile.m4 |
| 26 |
+@@ -35,8 +35,13 @@ |
| 27 |
+ GUILE_MIN_TEENY=`echo ${GUILE_MIN_VER} | sed -e 's;.*\.;;'` |
| 28 |
+ |
| 29 |
+ _found_pkg_config_guile=yes |
| 30 |
++ PKG_CHECK_MODULES(GUILE, [guile-2.2 >= $GUILE_MIN_VER], |
| 31 |
++ [GUILE_PKG_NAME=guile-2.2], [_found_pkg_config_guile=no]) |
| 32 |
++ |
| 33 |
++ if test "${_found_pkg_config_guile}" = "no" ; then |
| 34 |
+ PKG_CHECK_MODULES(GUILE, [guile-2.0 >= $GUILE_MIN_VER], |
| 35 |
+ [GUILE_PKG_NAME=guile-2.0], [_found_pkg_config_guile=no]) |
| 36 |
++ fi |
| 37 |
+ |
| 38 |
+ if test "${_found_pkg_config_guile}" = "no" ; then |
| 39 |
+ PKG_CHECK_MODULES(GUILE, [guile-1.8 >= $GUILE_MIN_VER], |
| 40 |
|
| 41 |
diff --git a/sci-electronics/geda/geda-1.8.2.ebuild b/sci-electronics/geda/geda-1.8.2.ebuild |
| 42 |
index 4fa4b255d03..01203ce3884 100644 |
| 43 |
--- a/sci-electronics/geda/geda-1.8.2.ebuild |
| 44 |
+++ b/sci-electronics/geda/geda-1.8.2.ebuild |
| 45 |
@@ -1,4 +1,4 @@ |
| 46 |
-# Copyright 1999-2015 Gentoo Foundation |
| 47 |
+# Copyright 1999-2017 Gentoo Foundation |
| 48 |
# Distributed under the terms of the GNU General Public License v2 |
| 49 |
|
| 50 |
EAPI=4 |
| 51 |
@@ -21,6 +21,7 @@ CDEPEND=" |
| 52 |
x11-libs/gtk+:2 |
| 53 |
>=x11-libs/cairo-1.2.0 |
| 54 |
>=dev-scheme/guile-1.8[deprecated] |
| 55 |
+ <dev-scheme/guile-2.2 |
| 56 |
nls? ( virtual/libintl ) |
| 57 |
stroke? ( >=dev-libs/libstroke-0.5.1 )" |
| 58 |
|
| 59 |
|
| 60 |
diff --git a/sci-electronics/geda/geda-1.9.2.ebuild b/sci-electronics/geda/geda-1.9.2-r1.ebuild |
| 61 |
similarity index 92% |
| 62 |
rename from sci-electronics/geda/geda-1.9.2.ebuild |
| 63 |
rename to sci-electronics/geda/geda-1.9.2-r1.ebuild |
| 64 |
index c51bd3844de..9a6544d1aba 100644 |
| 65 |
--- a/sci-electronics/geda/geda-1.9.2.ebuild |
| 66 |
+++ b/sci-electronics/geda/geda-1.9.2-r1.ebuild |
| 67 |
@@ -1,8 +1,8 @@ |
| 68 |
# Copyright 1999-2017 Gentoo Foundation |
| 69 |
# Distributed under the terms of the GNU General Public License v2 |
| 70 |
|
| 71 |
-EAPI=5 |
| 72 |
-inherit eutils fdo-mime gnome2-utils versionator |
| 73 |
+EAPI=6 |
| 74 |
+inherit autotools eutils fdo-mime gnome2-utils versionator |
| 75 |
|
| 76 |
MY_PN=${PN}-gaf |
| 77 |
MY_P=${MY_PN}-${PV} |
| 78 |
@@ -40,13 +40,19 @@ S=${WORKDIR}/${MY_P} |
| 79 |
|
| 80 |
DOCS="AUTHORS NEWS README" |
| 81 |
|
| 82 |
+PATCHES=( "${FILESDIR}"/${P}-guile-2.2.patch ) |
| 83 |
+ |
| 84 |
src_prepare() { |
| 85 |
+ default |
| 86 |
+ |
| 87 |
if ! use doc ; then |
| 88 |
sed -i -e '/^SUBDIRS = /s/docs//' Makefile.in || die |
| 89 |
fi |
| 90 |
if ! use examples ; then |
| 91 |
sed -i -e 's/\texamples$//' Makefile.in || die |
| 92 |
fi |
| 93 |
+ |
| 94 |
+ eautoreconf |
| 95 |
} |
| 96 |
|
| 97 |
src_configure() { |
Archives