dev-libs/m17n-lib: fix build with USE=-X

Closes: https://bugs.gentoo.org/664778
Package-Manager: Portage-2.3.40, Repoman-2.3.9

diff --git a/dev-libs/m17n-lib/files/m17n-lib-pkg-config.patch b/dev-libs/m17n-lib/files/m17n-lib-pkg-config.patch
new file mode 100644 (file)
index 0000000..aabe12e
--- /dev/null
+++ b/dev-libs/m17n-lib/files/m17n-lib-pkg-config.patch
@@ -0,0 +1,19 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -120,7 +120,6 @@
+ M17N_EXT_LIBS=
+ 
+ AC_CHECK_PROG(HAVE_PKG_CONFIG, pkg-config, yes)
+-AM_CONDITIONAL([HAVE_PKG_CONFIG], [test x$HAVE_PKG_CONFIG = xyes])
+ 
+ if test "x$no_x" != "xyes"; then
+   AC_DEFINE(HAVE_X11, 1, [Define to 1 if you have X11.])
+@@ -318,6 +317,8 @@
+ 
+ fi
+ 
++AM_CONDITIONAL([HAVE_PKG_CONFIG], [test x$HAVE_PKG_CONFIG = xyes])
++
+ dnl Check for libxml2 usability.
+ save_CPPFLAGS="$CPPFLAGS"
+ save_LIBS="$LIBS"

diff --git a/dev-libs/m17n-lib/m17n-lib-1.8.0.ebuild b/dev-libs/m17n-lib/m17n-lib-1.8.0.ebuild
index ca3d353d0df50ed304296d1089ef8a00bcbc2287..c98449bc3429e8e570dee061edd263f84d13d0cf 100644 (file)
--- a/dev-libs/m17n-lib/m17n-lib-1.8.0.ebuild
+++ b/dev-libs/m17n-lib/m17n-lib-1.8.0.ebuild
@@ -38,6 +38,7 @@ PATCHES=(
        "${FILESDIR}"/${PN}-freetype.patch
        "${FILESDIR}"/${PN}-ispell.patch
        "${FILESDIR}"/${PN}-parallel-make.patch
+       "${FILESDIR}"/${PN}-pkg-config.patch
 )
 
 src_prepare() {