sci-electronics/geda: Fix m4 test for guile-2.2, thanks Juergen Rose.

Closes: https://bugs.gentoo.org/639884
Package-Manager: Portage-2.3.17, Repoman-2.3.6

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
new file mode 100644 (file)
index 0000000..6316733
--- /dev/null
+++ b/sci-electronics/geda/files/geda-1.9.2-guile-2.2.patch
@@ -0,0 +1,16 @@
+--- geda-gaf-1.9.2/m4/geda-guile.m4
++++ geda-gaf-1.9.2/m4/geda-guile.m4
+@@ -35,8 +35,13 @@
+   GUILE_MIN_TEENY=`echo ${GUILE_MIN_VER} | sed -e 's;.*\.;;'`
+ 
+   _found_pkg_config_guile=yes
++  PKG_CHECK_MODULES(GUILE, [guile-2.2 >= $GUILE_MIN_VER],
++                           [GUILE_PKG_NAME=guile-2.2], [_found_pkg_config_guile=no])
++
++  if test "${_found_pkg_config_guile}" = "no" ; then
+   PKG_CHECK_MODULES(GUILE, [guile-2.0 >= $GUILE_MIN_VER],
+                            [GUILE_PKG_NAME=guile-2.0], [_found_pkg_config_guile=no])
++  fi
+ 
+   if test "${_found_pkg_config_guile}" = "no" ; then
+    PKG_CHECK_MODULES(GUILE, [guile-1.8 >= $GUILE_MIN_VER],

diff --git a/sci-electronics/geda/geda-1.8.2.ebuild b/sci-electronics/geda/geda-1.8.2.ebuild
index 4fa4b255d03960a38d48baa06fed63b3d002bd56..01203ce38849d1618b4f83057178c0bf3ddc6ed4 100644 (file)
--- a/sci-electronics/geda/geda-1.8.2.ebuild
+++ b/sci-electronics/geda/geda-1.8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -21,6 +21,7 @@ CDEPEND="
        x11-libs/gtk+:2
        >=x11-libs/cairo-1.2.0
        >=dev-scheme/guile-1.8[deprecated]
+       <dev-scheme/guile-2.2
        nls? ( virtual/libintl )
        stroke? ( >=dev-libs/libstroke-0.5.1 )"
 

diff --git a/sci-electronics/geda/geda-1.9.2.ebuild b/sci-electronics/geda/geda-1.9.2-r1.ebuild
similarity index 92%
rename from sci-electronics/geda/geda-1.9.2.ebuild
rename to sci-electronics/geda/geda-1.9.2-r1.ebuild
index c51bd3844de8bab902e6819993ec33ef14390388..9a6544d1aba368effea4d2c2a50cd89ffea05eb6 100644 (file)
--- a/sci-electronics/geda/geda-1.9.2.ebuild
+++ b/sci-electronics/geda/geda-1.9.2-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils fdo-mime gnome2-utils versionator
+EAPI=6
+inherit autotools eutils fdo-mime gnome2-utils versionator
 
 MY_PN=${PN}-gaf
 MY_P=${MY_PN}-${PV}
@@ -40,13 +40,19 @@ S=${WORKDIR}/${MY_P}
 
 DOCS="AUTHORS NEWS README"
 
+PATCHES=( "${FILESDIR}"/${P}-guile-2.2.patch )
+
 src_prepare() {
+       default
+
        if ! use doc ; then
                sed -i -e '/^SUBDIRS = /s/docs//' Makefile.in || die
        fi
        if ! use examples ; then
                sed -i -e 's/\texamples$//' Makefile.in || die
        fi
+
+       eautoreconf
 }
 
 src_configure() {