From 28ae7bdc6fe3b3a7ec70f49b96cb2f1edad518a6 Mon Sep 17 00:00:00 2001
From: Simon Reiser <me@sfxr.de>
Date: Fri, 9 Aug 2019 16:16:02 +0200
Subject: [PATCH] update

---
 emacs-vcs-27.0.9999.ebuild | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/emacs-vcs-27.0.9999.ebuild b/emacs-vcs-27.0.9999.ebuild
index 3717709..bf9e0db 100644
--- a/emacs-vcs-27.0.9999.ebuild
+++ b/emacs-vcs-27.0.9999.ebuild
@@ -28,8 +28,8 @@ HOMEPAGE="https://www.gnu.org/software/emacs/"
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="27"
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gtk2 gzip-el imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
-REQUIRED_USE="?? ( aqua X )"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gtk2 gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libotf libxml2 livecd m17n-lib mailutils motif +pdumper png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
+REQUIRED_USE="?? ( aqua X ) harfbuzz? ( !m17n-lib ) m17n-lib? ( !harfbuzz libotf )"
 RESTRICT="test"
 
 RDEPEND="sys-libs/ncurses:0=
@@ -74,11 +74,12 @@ RDEPEND="sys-libs/ncurses:0=
 		xft? (
 			media-libs/fontconfig
 			media-libs/freetype
+			harfbuzz? ( media-libs/harfbuzz )
+			libotf? ( >=dev-libs/libotf-0.9.4 )
 			x11-libs/libXft
 			x11-libs/libXrender
 			cairo? ( >=x11-libs/cairo-1.12.18 )
 			m17n-lib? (
-				>=dev-libs/libotf-0.9.4
 				>=dev-libs/m17n-lib-1.5.1
 			)
 		)
@@ -171,6 +172,12 @@ src_configure() {
 		myconf+=" --with-sound=$(usex sound oss)"
 	fi
 
+	if use pdumper; then
+		myconf+=" --with-pdumper=yes"
+	else
+		myconf+=" --with-pdumper=no"
+	fi
+
 	if use X; then
 		myconf+=" --with-x --without-ns"
 		myconf+=" $(use_with gconf)"
@@ -188,16 +195,22 @@ src_configure() {
 		if use xft; then
 			myconf+=" --with-xft"
 			myconf+=" $(use_with cairo)"
-			myconf+=" $(use_with m17n-lib libotf)"
+			myconf+=" $(use_with harfbuzz)"
+			myconf+=" $(use_with libotf)"
 			myconf+=" $(use_with m17n-lib m17n-flt)"
 		else
 			myconf+=" --without-xft"
 			myconf+=" --without-cairo"
+			myconf+=" --without-harfbuzz"
 			myconf+=" --without-libotf --without-m17n-flt"
 			use cairo && ewarn \
 				"USE flag \"cairo\" has no effect if \"xft\" is not set."
+			use harfbuzz && ewarn \
+				"USE flag \"harfbuzz\" has no effect if \"xft\" is not set."
 			use m17n-lib && ewarn \
 				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
+			use libotf  && ewarn \
+				"USE flag \"libotf\" has no effect if \"xft\" is not set."
 		fi
 
 		local f line
-- 
2.22.0