diff --git a/dev-util/cscope/cscope-15.8a-r2.ebuild b/dev-util/cscope/cscope-15.8a-r2.ebuild index b2707fe35459e..95facd63cb4f9 100644 --- a/dev-util/cscope/cscope-15.8a-r2.ebuild +++ b/dev-util/cscope/cscope-15.8a-r2.ebuild @@ -26,6 +26,7 @@ SITEFILE="50${PN}-gentoo.el" src_prepare() { eapply "${FILESDIR}/${PN}-15.7a-ocs-sysdir.patch" #269305 eapply "${FILESDIR}/${PN}-15.6-darwin.patch" + eapply "${FILESDIR}/${PN}-15.8a-pkgconfig.patch" eapply_user mv configure.{in,ac} || die eautoreconf # prevent maintainer mode later on diff --git a/dev-util/cscope/cscope-15.9.ebuild b/dev-util/cscope/cscope-15.9.ebuild index 1cad13f52943a..cdee9e4703fdc 100644 --- a/dev-util/cscope/cscope-15.9.ebuild +++ b/dev-util/cscope/cscope-15.9.ebuild @@ -25,6 +25,7 @@ SITEFILE="50${PN}-gentoo.el" src_prepare() { eapply "${FILESDIR}/${PN}-15.7a-ocs-sysdir.patch" #269305 + eapply "${FILESDIR}/${PN}-15.9-pkgconfig.patch" eapply_user mv configure.{in,ac} || die eautoreconf # prevent maintainer mode later on diff --git a/dev-util/cscope/files/cscope-15.8a-pkgconfig.patch b/dev-util/cscope/files/cscope-15.8a-pkgconfig.patch new file mode 100644 index 0000000000000..665b7169761e1 --- /dev/null +++ b/dev-util/cscope/files/cscope-15.8a-pkgconfig.patch @@ -0,0 +1,28 @@ +--- a/configure.in ++++ b/configure.in +@@ -22,6 +22,7 @@ if test "x$LEX" = "xlex" ; then AC_DEFINE(USING_LEX, 1, + [Define this if the scanner is run through lex, not flex]) + fi + AC_PROG_YACC ++PKG_PROG_PKG_CONFIG + + dnl === BEGIN CURSES CHECK + dnl Curses detection: Munged from Midnight Commander's configure.in +@@ -363,7 +364,7 @@ dnl Check for a GNOME installation + AC_DEFUN([AC_CHECK_GNOME],[ + has_gnome=false + AC_CHECK_PROG(gnome1, gnome-config, true) +- AC_CHECK_PROG(gnome2, pkg-config, true) ++ AC_CHECK_PROG(gnome2, $PKG_CONFIG, true) + + if test x$gnome1 = xtrue; then + has_gnome=true +@@ -373,7 +374,7 @@ AC_DEFUN([AC_CHECK_GNOME],[ + has_gnome=true + fi + +- AM_CONDITIONAL(USING_GNOME2, pkg-config --exists gtk+-2.0) ++ AM_CONDITIONAL(USING_GNOME2, $PKG_CONFIG --exists gtk+-2.0) + AM_CONDITIONAL(HAS_GNOME, test "$has_gnome" = true) + AM_CONDITIONAL(GNOME_LINUX, test "$host_os" = Linux) + ]) diff --git a/dev-util/cscope/files/cscope-15.9-pkgconfig.patch b/dev-util/cscope/files/cscope-15.9-pkgconfig.patch new file mode 100644 index 0000000000000..c031633a65592 --- /dev/null +++ b/dev-util/cscope/files/cscope-15.9-pkgconfig.patch @@ -0,0 +1,28 @@ +--- a/configure.in ++++ b/configure.in +@@ -18,6 +18,7 @@ if test "x$LEX" = "xlex" ; then AC_DEFINE(USING_LEX, 1, + [Define this if the scanner is run through lex, not flex]) + fi + AC_PROG_YACC ++PKG_PROG_PKG_CONFIG + + AC_SYS_LARGEFILE + +@@ -361,7 +362,7 @@ dnl Check for a GNOME installation + AC_DEFUN([AC_CHECK_GNOME],[ + has_gnome=false + AC_CHECK_PROG(gnome1, gnome-config, true) +- AC_CHECK_PROG(gnome2, pkg-config, true) ++ AC_CHECK_PROG(gnome2, $PKG_CONFIG, true) + + if test x$gnome1 = xtrue; then + has_gnome=true +@@ -371,7 +372,7 @@ AC_DEFUN([AC_CHECK_GNOME],[ + has_gnome=true + fi + +- AM_CONDITIONAL(USING_GNOME2, pkg-config --exists gtk+-2.0) ++ AM_CONDITIONAL(USING_GNOME2, $PKG_CONFIG --exists gtk+-2.0) + AM_CONDITIONAL(HAS_GNOME, test "$has_gnome" = true) + AM_CONDITIONAL(GNOME_LINUX, test "$host_os" = Linux) + ])