Merge branch 'next'

12 files changed, 4 insertions, 447 deletions

diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index 8039c31d267c..7d2b0fa704ce 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 4374609dec35..4e8aa50de6d0 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -6,25 +6,23 @@ DIST haproxy-1.6.14.tar.gz 1583859 BLAKE2B 91695f0b3d901ba70b6bce6572c2f549479c2
 DIST haproxy-1.7.10.tar.gz 1750937 BLAKE2B 26d970862e415b079d4130fd00564677584a7aad74d6812cabed36de9a629321330434b7d4fdf7c2e8b2945b7f394ca33e444158e7fa9b49937db501ea33e78a SHA512 ca6c50848c559ee2ffb9af2d281c3931473dd90d1686d95d962cf604cd92d2feb2b63e006e217cf9078cf08fdd73dc523318c97e13400bc0ef325de47111394e
 DIST haproxy-1.7.11.tar.gz 1752129 BLAKE2B 1947ab837f6b81761eec931e97c7349462561abecc78b2b58b285ebb4b0ae498753d236f3a243d3b5c1115a9ff6e5fe9392d428314a6342e2c1907d6886e09e4 SHA512 48ee30a1057e92971c041b088b6aef16d6843da9ecee9b738aaa64bb55d3c3b0be090a37bb5fc63ac42fe34ce994820349cc770756136c823051039fa6d01f74
 DIST haproxy-1.8.13.tar.gz 2063046 BLAKE2B 9ebccf2520719cdf209bc9a87bf28d015b5b673e0d017d5387af4025f930ac401f6a2cfa851583ffe6b6645b7b91ad255bb5db737688a1f310958072a11c8a80 SHA512 54d4cb0721a3868267d7e085b3d3bb050384e4279eb49e88abb925bb3ea8cc39ef9069bdc99b7b18a23fd22e0d29e24dfcb8a0507ddca9243a845e4418be9cc5
-DIST haproxy-1.8.19.tar.gz 2080757 BLAKE2B 46a97620f3b5c3f205e8b9d6e49acca8e107a1e6918ac18c036b9c3408666348400f8d9f6f4a4103e7f206c6373b25a224536c0969e2dad1013c2320b07b0ced SHA512 f62b0a18f19295986d26c5c60b6b1ad55850a175bed67a359282cc37a4c630a0c2be51d608226b4316f2e69c3008c20a1cb91ce10f86311219355973a050e65b
 DIST haproxy-1.8.20.tar.gz 2083917 BLAKE2B a73e01bacd6c3d256f92bba3dc5f1d38feea686d92d9ba2d93c33c082b10f84e0f150b3ce3e98cddaa664443c3661220f2993fea2d52bc3d6c32d5c913e70471 SHA512 c288ccf223da71a29ae0f08f3c9753002735816229ea83ca497d46c860fb8a4bd422077a94652aa475e48aefb78787979cdce7f1bd0b5919dc671ba25212c133
+DIST haproxy-1.8.21.tar.gz 2097089 BLAKE2B 359dba31685d4213721deb7bd553f2e037b960522e6b7727af45b87f4161b52bd02f47e5337e8003e5ae78dfcf1b0de1626af55dc1d177e98608c5d9799e8756 SHA512 a5244146150fd0e6d00eab3b1be0b778a242b393d72b09033d8edd99c434c4c8a25c326bf639ca7f7f7387a5cecd5033bd6e7159eca4c6dc18b580e893d2d274
 DIST haproxy-1.8.9.tar.gz 2057051 BLAKE2B d81d18f68a27ae8a77660c1ecb1dfc28599263ebfd57f25ea574af2b101b35eb7a1a89ba4034b55dfa89673ae6ac4c0dca5428b4b494a02184b1b157850ce96b SHA512 e59c29af3a39d6212f012ae8341b169436e10e42fadaf8f1aa68d2bb7ee181fd1fe3b74640bfcd8c37c17dfc5062b36bd69d90290d7c59cd3e4648ef2ab1c8dd
 DIST haproxy-1.9.10.tar.gz 2386066 BLAKE2B 4dea3f42686cd41d9f6f6849c42f9cf604b26f33925747ec5311243117bcf51729d16e5c09c5eb2cfc9fea88cf49c976a0542dcd90ddee4016b467de699e8bdc SHA512 b204c91633949d20dd06c29c69d2c783134819493f132430aaedddd2aad74eac08da7de7ddc1c45b250446273c35b268ab37fcb3b98eaa6b97b6caf5530ed628
-DIST haproxy-1.9.9.tar.gz 2383704 BLAKE2B 1596d6a96ba8d4b61343ede78e39b7a08b34619396a81ebfa44e42df26770ee3d425e8c091918af1471e7687d52b88131cc67f3de2c58af456b619638eb48985 SHA512 96d650097ef4840634987b31df181848e4940fc9a27a1d92f09c9ed304da299811c1b6592cb7e502c500607a7a0450c1fc50831168d44bf14492ed73b6e75ae5
-DIST haproxy-2.0.3.tar.gz 2534678 BLAKE2B 1753c1ac1cabbe50bd8c20a9b95ac317b9f726ae20bd22e402936b5cb4ee69bbe554b85331c8268704a564f437b1990d831a3e21737df2f9b6c709fb58f638ec SHA512 dd7eaf7e05c9b3ee162fcc17bc116f81184523437d6f4dbd940b0a6a8e4d01e1984fc8fabafcfc20261203e60e8bd0bc5b0bf813f5eff47b9ba364465bd0633c
 DIST haproxy-2.0.4.tar.gz 2538442 BLAKE2B 95dd770d1424a7d783a2bcbdc4b2a39271b633826e458edf8e9323a20422e25ebeaf4d866195f9bafe464cb457f62d7a4ea50ba03821a0910d81e02513a73135 SHA512 38b5dc86b2947418b4af0bb746958abb1b40dec64f1f6969e8643f3e6ac7f553c9ea2b37ef21086f5c795834c0943feedee31cc4498b095037630bb16987ac75
+DIST haproxy-2.0.5.tar.gz 2539226 BLAKE2B 63218261ff4c5b4efb26ec1d255270d1c5cfca6744c325dbe5c65fff09bf922f6623702b67ca0253791a6fe626170008cb6dbc70c7e8547733006a1cc784b871 SHA512 501de6d81e0d07dbe5f57f416d485ebe125144745441c0f5341d6000c92514f723f35a7402f2cb7b404e1d6e6b4ba4148ef7360799b2ecf3bd6b1e3d6805097b
 EBUILD haproxy-1.6.11-r2.ebuild 4672 BLAKE2B 74b3adb390a7fa1d596e8e91f4ca5fbb46d7dfd201527956a514a3f0855f575b2fc1115b388126d8e54a1a80f13b5b62acb59f53eb92a5bd9ef3f02ab3867c38 SHA512 843c39796ab641d5036dc2f1d151da41acc5820713dd2c2857c551d684b0a5922abead4e9c2afb031bb75635842e9ead645ced6d9cebfa97ccc2f719caed8c58
 EBUILD haproxy-1.6.14.ebuild 4608 BLAKE2B d85f4160498f8af8fcc05ccdbe68d771b9d8b5cc71412be2c7430cf769c091f75030d678bf29f56d3bbb432c04f26fd45686333c8b2e282c25ae2dee7eceeb00 SHA512 32ae8badac30ea423613301815c4ccb07a6b81368dc92dc561f13d7432cde041048735cc4790659b4f1827a77e7009120e7977a54a15d164229a41d54d1b1e1b
 EBUILD haproxy-1.7.10.ebuild 4628 BLAKE2B 267e5228e4c1eb2386ab13a6f21d018e8f8643d9adcdb61851d150b281e2241eda97c701b4577fef8feee00c01409f8f2fc715a9681874fc05fc3f89c09da440 SHA512 941f9c3e0982ee44d51339b3feef43d93c7259413f2d77f8919e63056a0d0504468bd0637965141842af6c8dbb223f23155ffc0728f54bc1bbf539eef678c235
 EBUILD haproxy-1.7.11.ebuild 4632 BLAKE2B 06dd613111ce7410ce9190b2cbd825f4b9acd16d3c9995ca507fda90a77696e6c931b2f2caeb916ed0f6894110edaa056df5923c204107230af6a4f596c061ab SHA512 bb080ed92cbef8e2851262648519b5e0563749e3bd92396707791775801bf19f029e57fbe4fa029ea240cbc8f55b14e91d5656e85101fb2dc1e8ae219d111d51
 EBUILD haproxy-1.8.13.ebuild 4886 BLAKE2B 61bc37ea42b0dd5bc447b68cb45532c184f14ad40461faddb940e041682e88ac81af36ce44d961d1011bc54b788ad9baa4c9447950a97708ea33dcb9d677fc32 SHA512 5dad241368a64aba2b07e429ab82adff67df556fc2b5a447d4863a12d50098545127f30725887b447e6ed583e39177458267777c5b321636211aab5a61b85a65
-EBUILD haproxy-1.8.19.ebuild 4886 BLAKE2B 94d1654d71261f4d4e3d4984cf2afae1721c3f5d85f5caec1f7ba7be2a2f3c0889a2de02fd542b18f8a2fe0222debfd35f47c3fdcde0cbb8122dc493fec021a5 SHA512 a006987c4cf8f56bca0347537cf86e9282d5f0b5cb1864665104d1e93da53084711bac338dce99b1f6cdccfa1fec7534dc58cb7139c126fcc3b6131d371b7dce
 EBUILD haproxy-1.8.20.ebuild 4886 BLAKE2B 94d1654d71261f4d4e3d4984cf2afae1721c3f5d85f5caec1f7ba7be2a2f3c0889a2de02fd542b18f8a2fe0222debfd35f47c3fdcde0cbb8122dc493fec021a5 SHA512 a006987c4cf8f56bca0347537cf86e9282d5f0b5cb1864665104d1e93da53084711bac338dce99b1f6cdccfa1fec7534dc58cb7139c126fcc3b6131d371b7dce
+EBUILD haproxy-1.8.21.ebuild 4886 BLAKE2B 94d1654d71261f4d4e3d4984cf2afae1721c3f5d85f5caec1f7ba7be2a2f3c0889a2de02fd542b18f8a2fe0222debfd35f47c3fdcde0cbb8122dc493fec021a5 SHA512 a006987c4cf8f56bca0347537cf86e9282d5f0b5cb1864665104d1e93da53084711bac338dce99b1f6cdccfa1fec7534dc58cb7139c126fcc3b6131d371b7dce
 EBUILD haproxy-1.8.9.ebuild 4885 BLAKE2B beb86eb5714d77b8dad4ac0abc55b46a0e4727ceae1a503ff1febe3943f6393f8ce99f97c098e4046c17de04a32c4f9d0a8708fd4c81eeb69e82f900f156285a SHA512 93290df98b67334d2c89ced563d15d25943a5c87c691fdce2ace423ca38acc364f9307f8a28a6654fb390d41c72ec627e005d0179d10138d92396365496ab8b8
 EBUILD haproxy-1.9.10.ebuild 5018 BLAKE2B 93d3a44ccbdbc8abb196df919c8e7515ef58507b208341d5490391590b005ce4a43f91a1c62f810fe5559d21de349611f9d4da05a7d2b1418a3b405b67b603d9 SHA512 c5c4627a42bea17e1a459e4eb5b427ef469959bfe1882fb3ec6f1aba3462d4389c425399caeb2822ee2952af01b75d04e0b770a520c22e5487652d455676955d
-EBUILD haproxy-1.9.9.ebuild 5018 BLAKE2B 93d3a44ccbdbc8abb196df919c8e7515ef58507b208341d5490391590b005ce4a43f91a1c62f810fe5559d21de349611f9d4da05a7d2b1418a3b405b67b603d9 SHA512 c5c4627a42bea17e1a459e4eb5b427ef469959bfe1882fb3ec6f1aba3462d4389c425399caeb2822ee2952af01b75d04e0b770a520c22e5487652d455676955d
 EBUILD haproxy-1.9.9999.ebuild 5018 BLAKE2B 93d3a44ccbdbc8abb196df919c8e7515ef58507b208341d5490391590b005ce4a43f91a1c62f810fe5559d21de349611f9d4da05a7d2b1418a3b405b67b603d9 SHA512 c5c4627a42bea17e1a459e4eb5b427ef469959bfe1882fb3ec6f1aba3462d4389c425399caeb2822ee2952af01b75d04e0b770a520c22e5487652d455676955d
-EBUILD haproxy-2.0.3.ebuild 5245 BLAKE2B 39175f93f60e5ed921e0b176eaa380eac45d85c59ace787f151224e79f53e4915865ef3e68ffead27a0e5d57afda3e29b30de58d4b14f87da563163e6605b84b SHA512 240fb06ccb7e0a9830d6d20807dab2c8d789d4912397a77b6cf8047b947a59389f2e34d980fde0aad06d313249e2abc7510a6120af6b9b6230d5f3d0979da4cc
 EBUILD haproxy-2.0.4.ebuild 5245 BLAKE2B 39175f93f60e5ed921e0b176eaa380eac45d85c59ace787f151224e79f53e4915865ef3e68ffead27a0e5d57afda3e29b30de58d4b14f87da563163e6605b84b SHA512 240fb06ccb7e0a9830d6d20807dab2c8d789d4912397a77b6cf8047b947a59389f2e34d980fde0aad06d313249e2abc7510a6120af6b9b6230d5f3d0979da4cc
+EBUILD haproxy-2.0.5.ebuild 5245 BLAKE2B 39175f93f60e5ed921e0b176eaa380eac45d85c59ace787f151224e79f53e4915865ef3e68ffead27a0e5d57afda3e29b30de58d4b14f87da563163e6605b84b SHA512 240fb06ccb7e0a9830d6d20807dab2c8d789d4912397a77b6cf8047b947a59389f2e34d980fde0aad06d313249e2abc7510a6120af6b9b6230d5f3d0979da4cc
 EBUILD haproxy-2.0.9999.ebuild 5095 BLAKE2B d61671818bd8045a2f3330c4bc2b99cbfcac57ea17beb9047de23dcbbd9b91cf617e00043845900da2c3e9c085c398b1ab9be7295e3c9e77e84907b5b79f80f2 SHA512 ce7ed08cf23efa5898c4ba3179c2b7ff0c1612a0b1d2c1a7811a0514c711ba0c4a06c0cdb80a88707d36e7fccc3b4e42a4163b4bcf89ef4fbc589a99eb8fc936
 MISC metadata.xml 2148 BLAKE2B 2f273c8d5c4704b482cf5b09e038415e0faa6ecba7297f99d0c55d96ba0b8f0bfa50b21dc857680951c3b4794be98f8781a6d1dcfb622ec5f6827648cfdd247e SHA512 91834d33a145ce6f887f83849ea90da984cf131e657824e63fb44b49761dc9999c00796fb20879cc670b83a2f4aae2263aeacc1dc6bf71b9db34a21ef9a3026d
diff --git a/net-proxy/haproxy/haproxy-1.8.19.ebuild b/net-proxy/haproxy/haproxy-1.8.21.ebuild
index be9a23a9cd27..be9a23a9cd27 100644
--- a/net-proxy/haproxy/haproxy-1.8.19.ebuild
+++ b/net-proxy/haproxy/haproxy-1.8.21.ebuild
diff --git a/net-proxy/haproxy/haproxy-1.9.9.ebuild b/net-proxy/haproxy/haproxy-1.9.9.ebuild
deleted file mode 100644
index 0eacacdc48d8..000000000000
--- a/net-proxy/haproxy/haproxy-1.9.9.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit user toolchain-funcs flag-o-matic systemd linux-info $SCM
-
-MY_P="${PN}-${PV/_beta/-dev}"
-
-DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
-HOMEPAGE="http://www.haproxy.org"
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc ~x86"
-else
-	EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
-	EGIT_BRANCH=master
-fi
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-IUSE="+crypt doc examples libressl slz net_ns +pcre pcre-jit pcre2 pcre2-jit ssl
-systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
-REQUIRED_USE="pcre-jit? ( pcre )
-	pcre2-jit? ( pcre2 )
-	pcre? ( !pcre2 )
-	device-atlas? ( pcre )
-	?? ( slz zlib )"
-
-DEPEND="
-	pcre? (
-		dev-libs/libpcre
-		pcre-jit? ( dev-libs/libpcre[jit] )
-	)
-	pcre2? (
-		dev-libs/libpcre
-		pcre2-jit? ( dev-libs/libpcre2[jit] )
-	)
-	ssl? (
-		!libressl? ( dev-libs/openssl:0=[zlib?] )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	slz? ( dev-libs/libslz:= )
-	zlib? ( sys-libs/zlib )
-	lua? ( dev-lang/lua:5.3 )
-	device-atlas? ( dev-libs/device-atlas-api-c )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
-CONTRIBS=( halog iprange )
-# ip6range is present in 1.6, but broken.
-ver_test $PV -ge 1.7.0 && CONTRIBS+=( ip6range spoa_example tcploop )
-# TODO: mod_defender - requires apache / APR, modsecurity - the same
-ver_test $PV -ge 1.8.0 && CONTRIBS+=( hpack )
-
-haproxy_use() {
-	(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
-
-	usex "${1}" "USE_${2}=1" "USE_${2}="
-}
-
-pkg_setup() {
-	enewgroup haproxy
-	enewuser haproxy -1 -1 -1 haproxy
-
-	if use net_ns; then
-		CONFIG_CHECK="~NET_NS"
-		linux-info_pkg_setup
-	fi
-}
-
-src_compile() {
-	local -a args=(
-		V=1
-		TARGET=linux2628
-		USE_GETADDRINFO=1
-		USE_TFO=1
-	)
-
-	# TODO: PCRE2_WIDTH?
-	args+=( $(haproxy_use threads THREAD) )
-	args+=( $(haproxy_use crypt LIBCRYPT) )
-	args+=( $(haproxy_use net_ns NS) )
-	args+=( $(haproxy_use pcre PCRE) )
-	args+=( $(haproxy_use pcre-jit PCRE_JIT) )
-	args+=( $(haproxy_use pcre2 PCRE2) )
-	args+=( $(haproxy_use pcre2-jit PCRE2_JIT) )
-	args+=( $(haproxy_use ssl OPENSSL) )
-	args+=( $(haproxy_use slz SLZ) )
-	args+=( $(haproxy_use zlib ZLIB) )
-	args+=( $(haproxy_use lua LUA) )
-	args+=( $(haproxy_use 51degrees 51DEGREES) )
-	args+=( $(haproxy_use device-atlas DEVICEATLAS) )
-	args+=( $(haproxy_use wurfl WURFL) )
-	args+=( $(haproxy_use systemd SYSTEMD) )
-
-	# For now, until the strict-aliasing breakage will be fixed
-	append-cflags -fno-strict-aliasing
-
-	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
-	emake -C contrib/systemd SBINDIR=/usr/sbin
-
-	if use tools ; then
-		for contrib in ${CONTRIBS[@]} ; do
-			# Those two includes are a workaround for hpack Makefile missing those
-			emake -C contrib/${contrib} \
-				CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
-		done
-	fi
-}
-
-src_install() {
-	dosbin haproxy
-	dosym ../sbin/haproxy /usr/bin/haproxy
-
-	newconfd "${FILESDIR}/${PN}.confd" $PN
-	newinitd "${FILESDIR}/${PN}.initd-r6" $PN
-
-	doman doc/haproxy.1
-
-	systemd_dounit contrib/systemd/haproxy.service
-
-	einstalldocs
-
-	# The errorfiles are used by upstream defaults.
-	insinto /etc/haproxy/errors/
-	doins examples/errorfiles/*
-
-	if use doc; then
-		dodoc ROADMAP doc/*.txt
-		#if use lua; then
-		# TODO: doc/lua-api/
-		#fi
-	fi
-
-	if use tools ; then
-		has halog "${CONTRIBS[@]}" && dobin contrib/halog/halog
-		has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange
-		has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range
-		has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example
-		has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example
-		has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop
-		has "hpack" "${CONTRIBS[@]}" && newbin contrib/hpack/gen-rht haproxy_hpack
-	fi
-
-	if use examples ; then
-		docinto examples
-		dodoc examples/*.cfg
-		dodoc examples/seamless_reload.txt
-	fi
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins examples/haproxy.vim
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then
-		ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service."
-		ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
-		ewarn "Make use of them with the \"user\" and \"group\" directives."
-
-		if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then
-			einfo "Please consult the installed documentation for learning the configuration file's syntax."
-			einfo "The documentation and sample configuration files are installed here:"
-			einfo "   ${EROOT}/usr/share/doc/${PF}"
-		fi
-	fi
-}
diff --git a/net-proxy/haproxy/haproxy-2.0.3.ebuild b/net-proxy/haproxy/haproxy-2.0.5.ebuild
index 06e10c936692..06e10c936692 100644
--- a/net-proxy/haproxy/haproxy-2.0.3.ebuild
+++ b/net-proxy/haproxy/haproxy-2.0.5.ebuild
diff --git a/net-proxy/http-replicator/Manifest b/net-proxy/http-replicator/Manifest
index e9d7d1636578..4dc74aabb5cd 100644
--- a/net-proxy/http-replicator/Manifest
+++ b/net-proxy/http-replicator/Manifest
@@ -1,18 +1,11 @@
-AUX http-replicator-3-missing-directory.patch 1776 BLAKE2B 66b3b0190512b77a62487f8a2828a46de8af27bce4393d14152de3542a4e9eac61855d2d9e5da196f7f4271a9432cc2b8bb599215d7fdc2012ce0c498dcca346 SHA512 8c4d9f563bb73ee2b237fadc7c062c8cfbc1510c9f7fc597974fbc727f61fffc9b3d79285904fcac755dc12c7603d7d4efd1d25978df6ddfc797b44c6c17570b
-AUX http-replicator-3-unique-cache-name.patch 1195 BLAKE2B c988c7f5f2beaa480ca01a46bc6f28a8158d975b8951c8373be23b64d12a3c141c0d87bd603439ae21788c64f315c64b1b313f36907ddfa890cf54540e294445 SHA512 c1fd6d4c5e7dee1e58b6289dee5b7aa97c577ccf0099b02dc99b6a80a64b25f5e2f5321563fac9fa86beeb51b77edce321b9997144a0bf23104560577b857291
 AUX http-replicator-3.0-callrepcacheman-0.1 86 BLAKE2B 70095254d21cdbf403cc81998c879b80fa6df52c8a4e8be677dfa1960d0faa044eadfc44948c699d5dcec1a481275a8c5527f600e322a8b06dcd63531654a2a2 SHA512 144490fd854e22fce95e6a6891a3e65e8af001b5e421bec39b20ee4cf39709424a922f7852bf48ecf43b5b9755213e7149a2a3784bbc3a3e5542072d8d3bda3d
 AUX http-replicator-3.0-repcacheman-0.44-r2 5337 BLAKE2B 3b6c8b16b34cb3ef9b98408cb0272aa2fec51b87d011dc9de7014e6d7fc5e995343a7447ca79a8b951544a642e38d685ec0ac7f0137a1975780686a6e4a62791 SHA512 c917d47327a55699deb346e53aef1ba9a5eda81f6947ac4efe8422422a2cba668a3ed12c0f89bf840e4ad94dd6272b3d6eb705d1e78e58ddef90b21307ff8d15
-AUX http-replicator-3.0-sighup.patch 993 BLAKE2B 82709484ea1f5e63ae5eb883339f4561f7ed05625453c18c8d74207c8ea33b5a6bcc6aab69b9e1e8fd86e2d49e4b4d94fe0a438f1939cc34e6ec60543894e43c SHA512 25da23acd8c235f2b0dbe2f424a92a161d3f4e96e5bea67973004c7bb0642640b73d528b1675174a611bef35f34cc18de08d78c3464cb6080f4f44f833173aee
-AUX http-replicator-3.0.conf 1704 BLAKE2B d496ff21d492ca89fdfb64467de902481fe2c7bbec96227cac6ade3dd05850c74875062058dba491778fb06409b396cad7e4876106cc521bc642268976129479 SHA512 c56031c303f79a44a006781b3796abaae24f1b8ea368eb0436a7ada8defe0f92382649098aef7c41372bfbf1889a17468af201669756912e0c55985c5981fb4c
-AUX http-replicator-3.0.init 620 BLAKE2B 48e44e912233e58e598d9c041e6f1ad4bea48fb67cceb41ae13c008067e28bef2b4a6c35205b0f274c5124a54d48fb32f3334e12716b33c0bf2a29c1c5bc84f8 SHA512 e69143963155cdc03874b51dc0eef8a46bee3d7828bf20bdb50b4ea9ea6bb2e4fd705e1d9ee4864e53488e4035aa91ebd47f02a597bfa1ee6d5b7121ac5fd68d
 AUX http-replicator-4.0_alpha2-ipv6.patch 2266 BLAKE2B c5f7f87346adc5c237eb34a7cb1497eac2de58388c296eaf00d80a02f0d0bd34619e0044fb4674065e43489461d506c76dc52b04b80c1be2ea92a52b21eed4eb SHA512 70793ee864630156cd25453c2bae4c1bde40b7378d938f45e39b94e8ac8fa1e7a779d6535fbe3a5a5f1b44a4297c6910ac51ce4cb80321f96d26a08559b1f22e
 AUX http-replicator-4.0_alpha2-r2.conf 1440 BLAKE2B 1ab4c03ff638ec90c6c29884713522c4b7f2092618752309e66ae93d4e7955e09bb9f9941e87d6b14223f7b27edb0cb8c29510ce259437719099d3ad11cb1e29 SHA512 e6237c8b7eeb319615d45abdef4feaca6bbeb741bc75e80173e42328e4eb5f4192edfbf42c7e6e307c14d258e7ec67a0ae6451ff7daef631b2d1e39fe17a48fb
 AUX http-replicator-4.0_alpha2-r3-pid.patch 2681 BLAKE2B 4ae5e263c5476f402dde1bcb2f1b668e648611c46a785bbdeb58dfc75abab4ddabf95783848eb20c3d447448b1c9c5aa210601669de2a4926aba9ff08ee04103 SHA512 9ceb6ede3ec31fd7f702ac77a51897301fd7b16baee869a82180f388949ff7388f0917d667786b45643603c0e9d655cd8686948d5e34896c1fe5932fd76e42b5
 AUX http-replicator-4.0_alpha2-r3.init 644 BLAKE2B cf017fcd078532960e16e4c9735ab4df62d65794ac961798ffd39760fb860199d87322e0792ec759f48d2e9ddaa3134bbc52d9ed39c6d4f564b981d6873cdb72 SHA512 b1a8bd956d35cc536b835aac6cb82202f0b6b775d7eae81ac30f501d1c72877d093711e0f00a28eb7645a383e211d3196379b37da1e0421773c1b91ed6d3837b
 AUX http-replicator.service 258 BLAKE2B 15b50f430e58794115060e37350c5e6cc18225a0fbe27b07fc71a12979e3420cf5029554ee031bed8762af883a165d2b27f3f1c661124410569231fe16437102 SHA512 0da767205c21c226563eb2210a12d92d7933431245fad9bf8766eda59b1f4a16905cadcfb796b3aef86978eb06b153eb976b12f4f7e19d468654c1722e266352
 AUX http-replicator.service.conf 164 BLAKE2B 28006ec4c4b27eb1f75276432e30c0f9b33cb432ea0123794db0b25c5f36d4fd9f771c23d6852b8e061a9d30ab0ed2b86b42b0cdf3d8b2f29be0ac6cf4276c35 SHA512 0a1854ddb9f5b8631bdf6a837f1c91b895652803b3e1b6b98fba8f67dba0488a61f8864ddd4128d8072353a38349d9848e91a5109b317c37e1ca2598d0ac2333
-DIST http-replicator_3.0.tar.gz 39291 BLAKE2B a97d8b6b32f5d4ca4feefa9abaa7da7cb6570f76566c79d7371134c0edd74b2333a02480deff02fa1bf5b6cd6f2bfbfe4aaa649633d70bd2efbdd22701422651 SHA512 d98a608c38201db6f2d8ba809a4777ab5588f5ed395882bdf542c2788df1770c61a2de160604c09297d847f2c73463ba0530d7f2c2e482467f8e8f35be068d57
 DIST http-replicator_4.0alpha2.tgz 27575 BLAKE2B 48138bc8fa9695ddb31ce89c4638adda4a1d1b58c904cd98d0ee1dbab006f79ef7d19495db8eb4de0113f8e45da425950524c48ec9e3e864d8595ccdef9f7cfa SHA512 437e0cc881af0cb8f84bfd1366bb6edeee4f76112c4b2ac2af4bcb8809462852b96e9c99e04c8f370492c9e1eb33ddc68a85c4f09b073694242cd6c05b4d3a6c
-EBUILD http-replicator-3.0-r8.ebuild 3440 BLAKE2B b248cb96be039e50c74700c71432255868e909947f3b574181e0f60bc504d390e25492aee3b6b6b3ec8c893a12b67e66102aa9e3eaec1c54f093919852aac177 SHA512 566f524981543de73a1b9f878b49a547b41b618130a950ba7b92b12590eb191fc79468d23fd659f414dd0fdabf1f1b0aff9b873b88a0686cb1fef231f463acb4
 EBUILD http-replicator-4.0_alpha2-r7.ebuild 2043 BLAKE2B cbd3074454afce3164e8ee2fc81a8af29c9b991ea8c3098a2f2fa482165e3dac4bcc9745e07fd6c55361c8c0294d00d0f0f1f1d91516b4cdad29a0db0c6fa705 SHA512 16231c53131e94f63fe401acfb155354e83313895dc0596ab5d945f8f6fac6fbbb57bd257db0763e9a285afb5cc5ca8149e4c10f6a570f9e3688862b2f95f385
 MISC metadata.xml 252 BLAKE2B 5386635b038f2498cadf1730fa7ae823427900b961296f4acca678ea12eb7c66ed7ad6cbca15afd26042c7af8d687958c702a9c48fc00856b460e2b49e55b2ac SHA512 ffd7c4cd77545f753618c9e9cfeba05b557044879ce332c01deaad820e184329cf383c8488ba777e9653029d3f75e5c99936ca225ebc4a5fb9b4d4e257ba8e7d
diff --git a/net-proxy/http-replicator/files/http-replicator-3-missing-directory.patch b/net-proxy/http-replicator/files/http-replicator-3-missing-directory.patch
deleted file mode 100644
index 37c2ce2361f3..000000000000
--- a/net-proxy/http-replicator/files/http-replicator-3-missing-directory.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Author: Matthew Ogilvie
-Date:   Sat Jan 17 09:24:34 2015 -0700
-
-    add some suggestions to the missing-directory error message
-    
-    Also wait until directory confirmed before forking.
-    
-    See gentoo bug 502574 and bug 442874
-
-diff --git a/http-replicator b/http-replicator
-index bbc163c..81e254d 100755
---- a/http-replicator
-+++ b/http-replicator
-@@ -636,13 +636,6 @@ def main ():
- 				parser.error('user %r does not exist' % options.user)
- 			except OSError:
- 				parser.error('no permission for changing to user %r' % options.user)
--		pid = os.fork() # fork process
--		if pid: # parent process
--			pidfile.write(str(pid)) # store child's pid
--			pidfile.close()
--			return
--		else:
--			signal.signal(signal.SIGHUP, signal.SIG_IGN)
- 	else:
- 		handler = logging.StreamHandler(sys.stdout) # log to stdout
- 		handler.setFormatter(logging.Formatter('%(levelname)s: %(name)s %(message)s'))
-@@ -651,10 +644,22 @@ def main ():
- 	try:
- 		os.chdir(options.dir) # change to cache directory
- 	except OSError:
--		parser.error('invalid directory %r' % options.dir)
-+		parser.error('invalid directory %r\n' \
-+		             'Try running repcacheman, and/or see\n' \
-+		             'http://forums.gentoo.org/viewtopic-t-173226.html' \
-+				 % options.dir)
- 	if not os.access(os.curdir, os.R_OK | os.W_OK): # check permissions for cache directory
- 		parser.error('no read/write permission for directory %r' % options.dir)
- 
-+	if options.daemon:
-+		pid = os.fork() # fork process
-+		if pid: # parent process
-+			pidfile.write(str(pid)) # store child's pid
-+			pidfile.close()
-+			return
-+		else:
-+			signal.signal(signal.SIGHUP, signal.SIG_IGN)
-+
- 	sys.stdout = sys.stderr = open('/dev/null', 'w') # redirect all output to bit bucket
- 	logging.root.name = 'HttpReplicator'
- 	try:
diff --git a/net-proxy/http-replicator/files/http-replicator-3-unique-cache-name.patch b/net-proxy/http-replicator/files/http-replicator-3-unique-cache-name.patch
deleted file mode 100644
index 3ad0529ed16a..000000000000
--- a/net-proxy/http-replicator/files/http-replicator-3-unique-cache-name.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Author: Matthew Ogilvie
-Date:   Sun Dec 28 20:14:15 2014 -0700
-
-    honor x-unique-cache-name header in flat mode, if present
-    
-    This allows things like different versions of the adobe-flash
-    downloader that are given different names in a flat download
-    directory (like in gentoo) to work in an http-replicator cache
-    as well.  As long as the fetcher passes the custom name through
-    the experimental header...
-    
-    See gentoo bug # 442874
-
-diff --git a/http-replicator b/http-replicator
-index 19ae427..befe9f2 100755
---- a/http-replicator
-+++ b/http-replicator
-@@ -311,7 +311,12 @@ class HttpClient (Http):
- 			self.log.info('requested range: bytes %s to %s' % self.range) # log request
- 
- 		head = ''
--		for tail in self.path.split('/'): # iterate over items in path
-+		adjUrlPath = self.path
-+		if not self.direct and self.flat:
-+			uniqueCacheName = body.get('x-unique-cache-name')
-+			if uniqueCacheName:
-+				adjUrlPath = uniqueCacheName
-+		for tail in adjUrlPath.split('/'): # iterate over items in path
- 			head = os.path.join(head, tail) # build target path
- 			if head in self.alias: # path up till now hos an alias
- 				head = self.alias[head] # replace by alias
diff --git a/net-proxy/http-replicator/files/http-replicator-3.0-sighup.patch b/net-proxy/http-replicator/files/http-replicator-3.0-sighup.patch
deleted file mode 100644
index 969bbc91f9da..000000000000
--- a/net-proxy/http-replicator/files/http-replicator-3.0-sighup.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/http-replicator	2007-07-09 20:09:44.000000000 +0200
-+++ b/http-replicator	2007-07-09 20:11:48.433913445 +0200
-@@ -5,7 +5,7 @@
- #  Because of this the server runs as a single process, multiplexing I/O with its various client and server connections within a single process/thread.
- #  According to the readme <http://www.nightmare.com/medusa/README.html> this means it is capable of smoother and higher performance than most other servers, while placing a dramatically reduced load on the server machine.
- 
--import asyncore, socket, os, time, calendar, sys, re, optparse, logging
-+import asyncore, socket, os, time, calendar, sys, re, optparse, logging, signal
- 
- #  LISTENER
- #
-@@ -636,6 +636,8 @@
- 			pidfile.write(str(pid)) # store child's pid
- 			pidfile.close()
- 			return
-+		else:
-+			signal.signal(signal.SIGHUP, signal.SIG_IGN)
- 	else:
- 		handler = logging.StreamHandler(sys.stdout) # log to stdout
- 		handler.setFormatter(logging.Formatter('%(levelname)s: %(name)s %(message)s'))
diff --git a/net-proxy/http-replicator/files/http-replicator-3.0.conf b/net-proxy/http-replicator/files/http-replicator-3.0.conf
deleted file mode 100644
index 35671fd262c0..000000000000
--- a/net-proxy/http-replicator/files/http-replicator-3.0.conf
+++ /dev/null
@@ -1,46 +0,0 @@
-## Config file for http-replicator
-## sourced by init scripts automatically
-## GENERAL_OPTS used by repcacheman
-## DAEMON_OPTS used by http-replicator
-
-
-## Set the cache dir
-GENERAL_OPTS="--dir /var/cache/http-replicator"
-
-## Change UID/GID to user after opening the log and pid file.
-## 'user' must have read/write access to cache dir:
-GENERAL_OPTS="$GENERAL_OPTS --user portage"
-
-## Don't change or comment this out:
-DAEMON_OPTS="$GENERAL_OPTS"
-
-## Do you need a proxy to reach the internet?
-## This will forward requests to an external proxy server:
-## Use one of the following, not both:
-#DAEMON_OPTS="$DAEMON_OPTS --external somehost:1234"
-#DAEMON_OPTS="$DAEMON_OPTS --external username:password@host:port"
-
-## Local dir to serve clients.  Great for serving binary packages
-## See PKDIR and PORTAGE_BINHOST settings in 'man make.conf'
-## --alias /path/to/serve:location will make /path/to/serve
-## browsable at http://http-replicator.com:port/location
-DAEMON_OPTS="$DAEMON_OPTS --alias /usr/portage/packages:packages"
-
-## Dir to hold the log file:
-DAEMON_OPTS="$DAEMON_OPTS --log /var/log/http-replicator.log"
-
-## Make the log messages less and less verbose.
-## Up to four times to make it extremely quiet.
-#DAEMON_OPTS="$DAEMON_OPTS --quiet"
-#DAEMON_OPTS="$DAEMON_OPTS --quiet"
-
-## Make the log messages extra verbose for debugging.
-#DAEMON_OPTS="$DAEMON_OPTS --debug"
-
-## The ip addresses from which access is allowed. Can be used as many times
-## as necessary. Access from localhost is allowed by default.
-DAEMON_OPTS="$DAEMON_OPTS --ip 192.168.*.*"
-DAEMON_OPTS="$DAEMON_OPTS --ip 10.*.*.*"
-
-## The proxy port on which the server listens for http requests:
-DAEMON_OPTS="$DAEMON_OPTS --port 8080"
diff --git a/net-proxy/http-replicator/files/http-replicator-3.0.init b/net-proxy/http-replicator/files/http-replicator-3.0.init
deleted file mode 100644
index 7fc3d5e108da..000000000000
--- a/net-proxy/http-replicator/files/http-replicator-3.0.init
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting Http-Replicator"
-	start-stop-daemon --start --pidfile /var/run/http-replicator.pid --name http-replicator \
-		--exec /usr/bin/http-replicator -- -s -f --pid /var/run/http-replicator.pid --daemon $DAEMON_OPTS
-	eend $? "Failed to start Http-Replicator"
-}
-
-stop() {
-	ebegin "Stopping Http-Replicator"
-	start-stop-daemon --stop --pidfile /var/run/http-replicator.pid --name http-replicator --signal 2
-	eend $? "Failed to stop Http-Replicator"
-}
diff --git a/net-proxy/http-replicator/http-replicator-3.0-r8.ebuild b/net-proxy/http-replicator/http-replicator-3.0-r8.ebuild
deleted file mode 100644
index 28f535c83dca..000000000000
--- a/net-proxy/http-replicator/http-replicator-3.0-r8.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 ) # not 2.6 bug #33907, not 3.0 bug #411083
-
-inherit eutils python-single-r1 systemd
-
-MY_P="${PN}_${PV}"
-
-DESCRIPTION="Proxy cache for Gentoo packages"
-HOMEPAGE="https://sourceforge.net/projects/http-replicator"
-SRC_URI="mirror://sourceforge/http-replicator/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 hppa ppc ~sparc x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/http-replicator-3.0-sighup.patch"
-	"${FILESDIR}/http-replicator-3-unique-cache-name.patch"
-	"${FILESDIR}/http-replicator-3-missing-directory.patch"
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_install() {
-	# Daemon and repcacheman into /usr/bin
-	python_scriptinto /usr/bin
-	python_doscript http-replicator
-	python_newscript "${FILESDIR}/http-replicator-3.0-repcacheman-0.44-r2" repcacheman.py
-
-	exeinto /usr/bin
-	newexe "${FILESDIR}/http-replicator-3.0-callrepcacheman-0.1" repcacheman
-
-	# init.d scripts
-	newinitd "${FILESDIR}/http-replicator-3.0.init" http-replicator
-	newconfd "${FILESDIR}/http-replicator-3.0.conf" http-replicator
-
-	systemd_dounit "${FILESDIR}"/http-replicator.service
-	systemd_install_serviced "${FILESDIR}"/http-replicator.service.conf
-
-	# Docs
-	dodoc README debian/changelog
-
-	# Man Page - Not Gentooified yet
-	doman http-replicator.1
-
-	insinto /etc/logrotate.d
-	newins debian/logrotate http-replicator
-}
-
-pkg_postinst() {
-	elog
-	ewarn "Before starting http-replicator, please follow the next few steps:"
-	elog "- Modify /etc/conf.d/http-replicator if required."
-	ewarn "- Run /usr/bin/repcacheman to set up the cache."
-	elog "- Add http_proxy=\"http://serveraddress:8080\" to make.conf on"
-	elog "  the server as well as on the client machines."
-	elog "- Make sure FETCHCOMMAND adds the X-unique-cache-name header to"
-	elog "  HTTP requests in make.conf (or maybe portage will add it to"
-	elog "  the default make.globals someday).  Example:"
-	elog '   FETCHCOMMAND="wget -t 3 -T 60 --passive-ftp -O \"\${DISTDIR}/\${FILE}\" --header=\"X-unique-cache-name: \${FILE}\" \"\${URI}\""'
-	elog '   RESUMECOMMAND="wget -c -t 3 -T 60 --passive-ftp -O \"\${DISTDIR}/\${FILE}\" --header=\"X-unique-cache-name: \${FILE}\" \"\${URI}\""'
-	elog "- Arrange to periodically run repcacheman on this server,"
-	elog "  to clean up the local /usr/portage/distfiles directory."
-	elog "- Arrange to periodically run something like the following"
-	elog "  on this server.  'eclean' is in app-portage/gentoolkit."
-	elog "    ( export DISTDIR=/var/cache/http-replicator/"
-	elog "      eclean -i distfiles )"
-	elog "- Even with FETCHCOMMAND fixing most cases, occasionally"
-	elog "  an older invalid version of a file may end up in the cache,"
-	elog "  causing checksum failures when portage tries to fetch"
-	elog "  it.  To recover, either use eclean (above), manually delete"
-	elog "  the relevant file from the cache, or temporarily comment"
-	elog "  out the http_proxy setting.  Commenting only requires"
-	elog "  access to client config, not server cache."
-	elog "- Make sure GENTOO_MIRRORS in /etc/portage/make.conf starts"
-	elog "  with several good http mirrors."
-	elog
-	elog "For more information please refer to the following forum thread:"
-	elog "  http://forums.gentoo.org/viewtopic-t-173226.html"
-	elog
-}