[patch] patch to add libedit USE flag and explicitly specify readline library

bind-tools-explicit-readline.patch (text/plain), 1.46 KB, created by Matt Whitlock on 2017-07-11 19:36:10 UTC

--- bind-tools-9.11.1_p3.ebuild~	2017-07-10 09:11:08.000000000 +0000
+++ bind-tools-9.11.1_p3.ebuild	2017-07-11 19:27:36.248686709 +0000
@@ -17,7 +17,7 @@
 LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc gost gssapi idn ipv6 libressl readline seccomp ssl urandom xml"
+IUSE="doc gost gssapi idn ipv6 libedit libressl readline seccomp ssl urandom xml"
 # no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
 
 REQUIRED_USE="gost? ( !libressl ssl )"
@@ -31,7 +31,8 @@
 	xml? ( dev-libs/libxml2 )
 	idn? ( net-dns/idnkit )
 	gssapi? ( virtual/krb5 )
-	readline? ( sys-libs/readline:0= )
+	libedit? ( dev-libs/libedit )
+	readline? ( !libedit? ( sys-libs/readline:0= ) )
 	seccomp? ( sys-libs/libseccomp )"
 DEPEND="${CDEPEND}
 	virtual/pkgconfig"
@@ -69,6 +70,15 @@
 		myconf="${myconf} --with-randomdev=/dev/random"
 	fi
 
+	# bug 607400
+	if use libedit ; then
+		myconf+=' --with-readline=-ledit'
+	elif use readline ; then
+		myconf+=' --with-readline=-lreadline'
+	else
+		myconf+=' --without-readline'
+	fi
+
 	# bug 344029
 	append-cflags "-DDIG_SIGCHASE"
 
@@ -88,7 +98,6 @@
 		$(use_with ssl openssl) \
 		$(use_with xml libxml2) \
 		$(use_with gssapi) \
-		$(use_with readline) \
 		$(use_with gost) \
 		${myconf}