[gentoo-commits] repo/gentoo:master commit in: dev-libs/m17n-lib/files/, dev-libs/m17n-lib/

[Akinori Hattori]

commit:     6d3ea1686de4ffe3bf6ee380e4d6cb5271950916
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 29 12:45:23 2018 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Wed Aug 29 12:46:33 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d3ea168

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

 dev-libs/m17n-lib/files/m17n-lib-pkg-config.patch | 19 +++++++++++++++++++
 dev-libs/m17n-lib/m17n-lib-1.8.0.ebuild           |  1 +
 2 files changed, 20 insertions(+)

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
index 00000000000..aabe12e586d
--- /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 ca3d353d0df..c98449bc342 100644
--- 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() {