gentoo resync : 27.10.2018

3 files changed, 29 insertions, 9 deletions

diff --git a/www-misc/htdig/Manifest b/www-misc/htdig/Manifest
index 32a76c669692..df54be57427c 100644
--- a/www-misc/htdig/Manifest
+++ b/www-misc/htdig/Manifest
@@ -1,8 +1,9 @@
 AUX htdig-3.2.0_beta6-as-needed.patch 2215 BLAKE2B 1a76aadd8ac574b515b0737f7570beeaf2b60253da09adad660a83dcfa4fb48dd698f6ccedd6b00723ded056f2986c7fd2d4215dc684e110030ea1c30726d214 SHA512 248555727a1b696e152dfa6d60aede6565ecc0cdf886845602a8a3411cdca17aaa1a91b3841c7cc5d8f143e7a8c02a7cdf3d898464eec5bb61a539af80e41e88
+AUX htdig-3.2.0_beta6-drop-bogus-assignment.patch 485 BLAKE2B 4dcb910bc5a90e7d8a3b778721a55d1b187f90a52768351bf086aa9ebf989ba04398ade579bad1f0bd0eb05d63d0d4472c76523312a522a4710ca4b2b147e89b SHA512 5c1d3bbbeb0aa33c6030f2cdb4e1dd898bda49b5e46c6b950f5d534bfe8df9a33175b4ae838023f21339cd1af7bde2b36f9bfab7e7e94548bdf684a38b013eb1
 AUX htdig-3.2.0_beta6-gcc4.patch 512 BLAKE2B ca4b30f55f6edd2a9ac5b9fe43d86d13ffcf689f93f8e607f33dd9a0441c28742d69c721a4dc96cda0dc533776e2cbac217dfb644bd7c5914c0dab13f3425a46 SHA512 254234878eb397732b4e153ec644248287cee3a1c7f68883c4caa1920f60ae23d74a812efca6364a1231104a9d41541d8871b0fd067d0a95f6b33e9b5742e14b
 AUX htdig-3.2.0_beta6-gcc6.patch 3673 BLAKE2B 819647e4b323f795645e7375b301559ac79706ec86348c6862cc2918fdf2b6beab759a9a54ff55c2038ce1e9edeff0ca38a59f73d2b466b7a844c02cae1c7c58 SHA512 e0bc9555ff09005791410a2202062e9cad5216fd09c45493268a8155d65f170e90670ecbc197737a2223e1038f6c0a7210b008ef8f608956a59269e50434cee5
 AUX htdig-3.2.0_beta6-musl.patch 1188 BLAKE2B f481706f23d60ff5c72086c4ff9539a280f1b0cde19e834edacfbc2bec080819ecb4d087147b182aaa60cbafa639de9194ce35473f5b4ccc33516f51346894f7 SHA512 2c766f4d49e941de8c56b3858ed32d9e90efff9f43ec699cd30c0a87c19bab786e113412087a5bec698de26b4454f5df4306a95f9e16c6cd829f5ef8572ea0a3
 AUX htdig-3.2.0_beta6-quoting.patch 1130 BLAKE2B 0257d3f79e544c13f4d17caa71bf4265aa7668c91e15f5c38b502fbc50415feb6a378430af6a147f6a2e3f087ad79fc2ab426b97b6191166a1c930e7a416e2e6 SHA512 7edadb8cecb378eac8352e43ce12d5fa6af711f847f1e1ca0a49303daedffb1cef9795b74eb8cd64120e981c57c947f082f60d857985ee5ac0d54537fd6b4181
 DIST htdig-3.2.0b6.tar.gz 3104936 BLAKE2B aa70026ce6fb10910c42b4091900980c78f81fc9d07b1dec4071811aee21c6d6a67a7fbb2ca59b785c457b13b508773f8ca8f96042f23def82b071fc40b00870 SHA512 29832f4aebd2b1f944cc4d800a5202342c8ce66936980476d49f679ec169c0268a902e85cd7440a3b6bea9db0a3b640bb1a9719c680d857ff00d34590af63064
-EBUILD htdig-3.2.0_beta6-r5.ebuild 1652 BLAKE2B 37ddab0812951c781f85f0b62d95f327f2bfbad2abeae9b1fbdf7d748a71d8f2033e7900f9e6250a72a362777ce5b76aff7c6bb5b44e15667927814f0ac8960f SHA512 286a5059de57d7ba2e1d5774f871eddf701486073e31cc39943b489de24c135bf8d461fd57099caaa80180c7561c9f9d5f8203ede801327eba6a0a7958505273
+EBUILD htdig-3.2.0_beta6-r5.ebuild 1735 BLAKE2B 5258ec38af05466385f31522cc5c697f2d37d84e751b7865116e6d8d4656689c239e3e33f3ebdc9727038644f49027863ed6e133e74cc5232959f9bc11f8a476 SHA512 363fbb73975f4791364e6af66f20178e38c0f3a37cc717f8672419b17def7e7055c38678f31b80e5a49299eaca9008fb4abf24fd716f799b171086c29927663b
 MISC metadata.xml 246 BLAKE2B 6bdcea4d16a06756a1ab24fb076af6d88134c134f9239e658b7e5facb8cf6ed2f30d98938fd92bc8a3690e54273fd7f72420ccab04e7a6f7319e257a9f9ed618 SHA512 1181711d3b020b2ca7beae0a539a9b7f1abe70962cd8561900e5f06e14c9c871c61ca6088fb674de19ef3b844a1b3c29cf0f84f638b2d0cb7c030f60cd1d42ed
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 000000000000..2328280e3174
--- /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 7596cb361676..eec36227e380 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 () {