gentoo resync : 09.06.2018

6 files changed, 4 insertions, 133 deletions

diff --git a/www-misc/Manifest.gz b/www-misc/Manifest.gz
index 95f0eda3a21c..06cb0272e6fc 100644
--- a/www-misc/Manifest.gz
+++ b/www-misc/Manifest.gz
diff --git a/www-misc/htdig/Manifest b/www-misc/htdig/Manifest
index ba27bb1bedbb..32a76c669692 100644
--- a/www-misc/htdig/Manifest
+++ b/www-misc/htdig/Manifest
@@ -4,7 +4,5 @@ AUX htdig-3.2.0_beta6-gcc6.patch 3673 BLAKE2B 819647e4b323f795645e7375b301559ac7
 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-r3.ebuild 1788 BLAKE2B 63ec1684dd3debd62411cd2301a246de02d53fc0a15b39a16c849a13a60ee8acf58290be2690928d755ff547a3d8927919601e8aa58cbcc950ea05c12f05b5cb SHA512 1f2926dd50e2a39805bf3403937b1a39f289afd7a7c023b0dabf3aa20e49085c2bce70894219a95a5fef30ab31d0f557e8c7bc8a9d77826f8e8622be8428873d
-EBUILD htdig-3.2.0_beta6-r4.ebuild 1796 BLAKE2B abe4df41e6cbbdaf41901934e00b3693d74ef5cbfbae91caa82249ce90eb88a1f577c5eee2bbdf2b0224b2532960ab691e1fe9b20ebd5505e816ed4c4f337ae3 SHA512 ebe4ec3a20208249e1cd45952a30617f8af49b1bc575f492962d55b2e97864dcdc519363f0e225beb21c208c0c498cca4642ff25b1f32d887519b787c3e7e256
 EBUILD htdig-3.2.0_beta6-r5.ebuild 1652 BLAKE2B 37ddab0812951c781f85f0b62d95f327f2bfbad2abeae9b1fbdf7d748a71d8f2033e7900f9e6250a72a362777ce5b76aff7c6bb5b44e15667927814f0ac8960f SHA512 286a5059de57d7ba2e1d5774f871eddf701486073e31cc39943b489de24c135bf8d461fd57099caaa80180c7561c9f9d5f8203ede801327eba6a0a7958505273
 MISC metadata.xml 246 BLAKE2B 6bdcea4d16a06756a1ab24fb076af6d88134c134f9239e658b7e5facb8cf6ed2f30d98938fd92bc8a3690e54273fd7f72420ccab04e7a6f7319e257a9f9ed618 SHA512 1181711d3b020b2ca7beae0a539a9b7f1abe70962cd8561900e5f06e14c9c871c61ca6088fb674de19ef3b844a1b3c29cf0f84f638b2d0cb7c030f60cd1d42ed
diff --git a/www-misc/htdig/htdig-3.2.0_beta6-r3.ebuild b/www-misc/htdig/htdig-3.2.0_beta6-r3.ebuild
deleted file mode 100644
index 554832d3049d..000000000000
--- a/www-misc/htdig/htdig-3.2.0_beta6-r3.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils autotools
-
-MY_PV=${PV/_beta/b}
-S=${WORKDIR}/${PN}-${MY_PV}
-
-DESCRIPTION="HTTP/HTML indexing and searching system"
-HOMEPAGE="http://www.htdig.org"
-SRC_URI="http://www.htdig.org/files/${PN}-${MY_PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="ssl"
-
-DEPEND=">=sys-libs/zlib-1.1.3
-	app-arch/unzip
-	ssl? ( dev-libs/openssl )"
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gcc4.patch
-	epatch "${FILESDIR}"/${P}-as-needed.patch
-	epatch "${FILESDIR}"/${P}-quoting.patch
-	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.in db/configure.in || die
-	eautoreconf
-}
-
-src_compile() {
-	use prefix || EPREFIX=
-
-	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} \
-		$(use_with ssl)
-
-#		--with-image-url-prefix="file://${EPREFIX}/var/www/localhost/htdocs/${PN}" \
-
-	emake || die "emake failed"
-}
-
-src_install () {
-	use prefix || ED="${D}"
-
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	dodoc ChangeLog README
-	dohtml -r htdoc
-
-	sed -i "s:${D}::g" \
-		"${ED}"/etc/${PN}/${PN}.conf \
-		"${ED}"/usr/bin/rundig \
-		|| die "sed failed (removing \${D} from installed files)"
-
-	# symlink htsearch so it can be easily found. see bug #62087
-	dosym ../../var/www/localhost/cgi-bin/htsearch /usr/bin/htsearch
-}
diff --git a/www-misc/htdig/htdig-3.2.0_beta6-r4.ebuild b/www-misc/htdig/htdig-3.2.0_beta6-r4.ebuild
deleted file mode 100644
index 3a45503a87a8..000000000000
--- a/www-misc/htdig/htdig-3.2.0_beta6-r4.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils autotools
-
-MY_PV=${PV/_beta/b}
-S=${WORKDIR}/${PN}-${MY_PV}
-
-DESCRIPTION="HTTP/HTML indexing and searching system"
-HOMEPAGE="http://www.htdig.org"
-SRC_URI="http://www.htdig.org/files/${PN}-${MY_PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="libressl ssl"
-
-DEPEND=">=sys-libs/zlib-1.1.3
-	app-arch/unzip
-	ssl? (
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
-	)"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc4.patch
-	epatch "${FILESDIR}"/${P}-as-needed.patch
-	epatch "${FILESDIR}"/${P}-quoting.patch
-	epatch "${FILESDIR}"/${P}-gcc6.patch
-	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.in db/configure.in || die
-	eautoreconf
-}
-
-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} \
-		$(use_with ssl)
-
-#		--with-image-url-prefix="file://${EPREFIX}/var/www/localhost/htdocs/${PN}" \
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	dodoc ChangeLog README
-	dohtml -r htdoc
-
-	sed -i "s:${D}::g" \
-		"${ED}"/etc/${PN}/${PN}.conf \
-		"${ED}"/usr/bin/rundig \
-		|| die "sed failed (removing \${D} from installed files)"
-
-	# symlink htsearch so it can be easily found. see bug #62087
-	dosym ../../var/www/localhost/cgi-bin/htsearch /usr/bin/htsearch
-}
diff --git a/www-misc/urlwatch/Manifest b/www-misc/urlwatch/Manifest
index 24a6ab5602d5..9e8d06a3c278 100644
--- a/www-misc/urlwatch/Manifest
+++ b/www-misc/urlwatch/Manifest
@@ -1,7 +1,7 @@
-DIST urlwatch-2.11.tar.gz 36092 BLAKE2B fc8b99d9edb9dc7f860b66e1bb72ccae9cf6aeb27ea2401009b26dca26c3c1fbcd8fedc5ae66ebeb8fcf50cd317c4ea3c1de6e667af158578d8bb2bb9373a021 SHA512 fc7a9cce7de946ddce6a83cdab7f785399806704ab440d29436d8ceff14cb4dab6e85a0284eaba1b71e5d27a88f5434d4d8d447a6d0de7bfd025d090c6f12cec
+DIST urlwatch-2.13.tar.gz 34312 BLAKE2B 6ac618d4f1f78b0a3f6d17dd2283704e8d1fc7173ce6d79fcf0f9177f48463a610a4c20d8483a4a9c22e56eca67730ef25982981f310ca8e9927e48e298a1b1d SHA512 5ca6ad3de54c2e1d63cb545ae0d213a4483ef175dad947be00994bc990d047c7aec1f3b0a8b23290672db940001a9cc31c919aa7d9c280ab4792299e2dba684c
 DIST urlwatch-2.5.tar.gz 25322 BLAKE2B 637fa254fe565d9a3909fc80879a7b40a72a92e01cdca3a2e95f905c768238e4a2ef7559e32ae4295357d3391109f08149e721564e4c14b6c8be281a416cc45a SHA512 993d2596288d014a3b84ae22c29ce89282c4320dd95b339c9892db07997059fc80a96198cb89ba04d935f68d2d051da96dc981f8e8b3657492443b060d2126a1
 DIST urlwatch-2.6.tar.gz 30412 BLAKE2B 3d9495a418f8180a788db27bec13f9c20d92476851404d0f78dc6fec664a90c4bf9749cbe26323741a31175abf5b6ca01c066da8a8db6e63da73b46bb524e293 SHA512 52d71984972c6888ade01fcc635d33a60c024424b82ac9319554f548438f8a4e2f32a8b7d3047ed86654c8ef67e3b6eac99728f9409b60cdffe7e842fd8fe16c
-EBUILD urlwatch-2.11.ebuild 1425 BLAKE2B f40c2f3cd5796b59b0ce3c2b91a3f0d53557400087a6561ff72754cbd6bcaf0075c89499e977637f5ee30164ab0c6f4e31350766d2c6243e55b789148229baba SHA512 431ef36ab1b48f164c5e63393d4d72d36dc6fc519b2c6e29c1c60a197b7066ed4a051cbf13fd69f424290b58ea293f02d0a51d216037b7a15ee766ada149361a
+EBUILD urlwatch-2.13.ebuild 1458 BLAKE2B b9c5403048f8cb150b49cd88494179819cdc34abe2175eb551a0208f9355dd49670fb182015dc2280f1cea8ae4fc3181149c65d2453671e44156442858515a31 SHA512 7e109c4fcec4bb3c2de046329c0968d36b1eed80c3838be533eb9a36583a4c0168472e06a7f9abe3d2fcfd9c135ba04c8e4bb62083318c9b8df009a460921a68
 EBUILD urlwatch-2.5.ebuild 963 BLAKE2B 6e774d31e763b0d12e8d2c3024892a95e7d1fd5bd22878751ba2f54c774dae9bfb5d12cb6d90ec14c015ba095676b3abb36e4155f2ddce2a651d6f9a1be97559 SHA512 95f43f1ab3f8cac44c123af9281bb81b2af0f249aa51168903a2460d468b7003b06a9f9944bca416998d4bc4db00b18c25325707e1ec8924769c33cc6785d23a
 EBUILD urlwatch-2.6.ebuild 1184 BLAKE2B f92a6c0a5ed70b2e4d931c72854588843be12db4607cb435b6c13968f9151e5867a80685526fc79bfc8613b497611cb631f794aa90768d155c047ce8d4e34247 SHA512 ec414c8118640182470b86594d7e459bc4fbb339ac9b30b05d53df6e4da923a7f955e71c374e8bc76b1317ae74bd2b7782d01121ecfbd894a979e4049c4d73df
 MISC metadata.xml 434 BLAKE2B b2c560e4555c172065797654d97842cd2caf1b0f5943c6f29d478f1a972c36594c2fa516558417957c816308c99123e41e1aa640db983dc409c99c9c3873c1b3 SHA512 e9364ac1375b0f6a86f2be3cc1bb5ace69397ec1e1fe4d737db572d56cea20d6df1abdeeea12d9c8dc2b532cbc14736d51ec35686b370098cc9ea8677506667f
diff --git a/www-misc/urlwatch/urlwatch-2.11.ebuild b/www-misc/urlwatch/urlwatch-2.13.ebuild
index 88437f6feb0e..3b6ef8f5e92e 100644
--- a/www-misc/urlwatch/urlwatch-2.11.ebuild
+++ b/www-misc/urlwatch/urlwatch-2.13.ebuild
@@ -31,6 +31,8 @@ DEPEND="
 	)
 "
 
+DOCS=( CHANGELOG.md README.md )
+
 python_test() {
 	nosetests test || die "tests failed with ${EPYTHON}"
 }