www-misc/htdig: Added Debian patch to fix build issue.

Closes: https://bugs.gentoo.org/638720
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

diff --git a/www-misc/htdig/files/htdig-3.2.0_beta6-drop-bogus-assignment.patch b/www-misc/htdig/files/htdig-3.2.0_beta6-drop-bogus-assignment.patch
new file mode 100644 (file)
index 0000000..2328280
--- /dev/null
+++ b/www-misc/htdig/files/htdig-3.2.0_beta6-drop-bogus-assignment.patch
@@ -0,0 +1,16 @@
+--- htdig-3.2.0b6.orig/htdig/Parsable.cc
++++ htdig-3.2.0b6/htdig/Parsable.cc
+@@ -74,7 +74,6 @@ Parsable::addString(Retriever& retriever
+           retriever.got_word(w, wordindex++, slot); // slot for img_alt
+       w = HtWordToken(0);
+     }
+-    w = '\0';
+ }
+ 
+ //*****************************************************************************
+@@ -92,5 +91,4 @@ Parsable::addKeywordString(Retriever& re
+           retriever.got_word(w, wordindex++, 9);
+       w = HtWordToken(0);
+     }
+-    w = '\0';
+ }

diff --git a/www-misc/htdig/htdig-3.2.0_beta6-r5.ebuild b/www-misc/htdig/htdig-3.2.0_beta6-r5.ebuild
index 7596cb3616768eea82a1bf82c4c09349141cf375..eec36227e38084bb01371aa53b8a6498f3c624d2 100644 (file)
--- a/www-misc/htdig/htdig-3.2.0_beta6-r5.ebuild
+++ b/www-misc/htdig/htdig-3.2.0_beta6-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -31,6 +31,7 @@ PATCHES=(
        "${FILESDIR}"/${P}-quoting.patch
        "${FILESDIR}"/${P}-gcc6.patch
        "${FILESDIR}"/${P}-musl.patch
+       "${FILESDIR}"/${P}-drop-bogus-assignment.patch #638720
 )
 
 HTML_DOCS=( htdoc )
@@ -42,14 +43,16 @@ src_prepare() {
 }
 
 src_configure() {
-       econf \
-               --with-config-dir="${EPREFIX}"/etc/${PN} \
-               --with-default-config-file="${EPREFIX}"/etc/${PN}/${PN}.conf \
-               --with-database-dir="${EPREFIX}"/var/lib/${PN}/db \
-               --with-cgi-bin-dir="${EPREFIX}"/var/www/localhost/cgi-bin \
-               --with-search-dir="${EPREFIX}"/var/www/localhost/htdocs/${PN} \
-               --with-image-dir="${EPREFIX}"/var/www/localhost/htdocs/${PN} \
+       local myeconfargs=(
+               --with-config-dir="${EPREFIX}"/etc/${PN}
+               --with-default-config-file="${EPREFIX}"/etc/${PN}/${PN}.conf
+               --with-database-dir="${EPREFIX}"/var/lib/${PN}/db
+               --with-cgi-bin-dir="${EPREFIX}"/var/www/localhost/cgi-bin
+               --with-search-dir="${EPREFIX}"/var/www/localhost/htdocs/${PN}
+               --with-image-dir="${EPREFIX}"/var/www/localhost/htdocs/${PN}
                $(use_with ssl)
+       )
+       econf "${myeconfargs[@]}"
 }
 
 src_install () {