commit: ff82bc730056751a6400394102d03636076120b2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Wed Oct 24 14:19:04 2018 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Wed Oct 24 14:19:04 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff82bc73
www-misc/htdig: Added Debian patch to fix build issue. Closes: https://bugs.gentoo.org/638720 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 .../htdig-3.2.0_beta6-drop-bogus-assignment.patch | 16 ++++++++++++++++ www-misc/htdig/htdig-3.2.0_beta6-r5.ebuild | 19 +++++++++++-------- 2 files changed, 27 insertions(+), 8 deletions(-) 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 index 00000000000..2328280e317 --- /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 7596cb36167..eec36227e38 100644 --- 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 () {
