gentoo resync : 22.06.2019

8 files changed, 3 insertions, 170 deletions

diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index e2b8b996538d..4047646faba3 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 13da759532cd..6201b77ec2b0 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -11,6 +11,7 @@ DIST haproxy-1.8.19.tar.gz 2080757 BLAKE2B 46a97620f3b5c3f205e8b9d6e49acca8e107a
 DIST haproxy-1.8.9.tar.gz 2057051 BLAKE2B d81d18f68a27ae8a77660c1ecb1dfc28599263ebfd57f25ea574af2b101b35eb7a1a89ba4034b55dfa89673ae6ac4c0dca5428b4b494a02184b1b157850ce96b SHA512 e59c29af3a39d6212f012ae8341b169436e10e42fadaf8f1aa68d2bb7ee181fd1fe3b74640bfcd8c37c17dfc5062b36bd69d90290d7c59cd3e4648ef2ab1c8dd
 DIST haproxy-1.9.6.tar.gz 2363063 BLAKE2B b3ccf1b7f9d82144b42f2ee5db7b4367a380d3d8d14145ed097b5329831fb9c9454023c04c3e542d9591e377f5f9c4e0630801414ce44b950b99718a971d88af SHA512 3b823005f02d035435838689ddbf50c4fd9fc14af20450c413526cda7a29eb01ee01f68d6867545ebf966235688eedeeb3d00f5e6011727486d53e881d8e73b6
 DIST haproxy-1.9.7.tar.gz 2373430 BLAKE2B 604eb99a15baa885c8956871a418b99a8ad1f6a08a9afb3d9c423ecf1d5dd0ba77e312bb325b09ede6471b1663619b77a2d9c25d66b52274f6c904bf1fa5ca85 SHA512 3a901849fa4db15676e22dd11f8309a810fcfc38519d1e8488c1e3cd8341c82dccbfe3b083c37920a0d04d5c8b7fa7a2f0910e488693c2e8ffda1511a307bc09
+DIST haproxy-2.0.0.tar.gz 2527523 BLAKE2B 0f33a7eb3d539900647b3efb9f9e45ed8858cbe9b10e33aea7baeb103b65d8f1a531664e39656e6273ec531360bd16884ef78763bac143d792aba72658f5836d SHA512 c5beb85522733a6df9741d8a6369cb4e476d6a49aa55163ea61b442715a6893aa7c5063221ff1c36c80ee124653b597499754bdd5764e306a755216b3af1908e
 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
@@ -22,4 +23,6 @@ EBUILD haproxy-1.8.9.ebuild 4885 BLAKE2B beb86eb5714d77b8dad4ac0abc55b46a0e4727c
 EBUILD haproxy-1.9.6-r1.ebuild 5017 BLAKE2B 233cbeaa89b0a689b27b2e134d2b47afd6ea06ac0b69adbe700ac4fd3e6fb32bfc98c297518a95c3cb56d1c26b201680e7aab5261cee0b3c83cd60c112e25286 SHA512 8f03e430049386fc115c9d62ca1b5d8ae2d060d45abcea72ccd81d5fb51063525bbc9eb16d1fe88e7afd81c9add9c9c1ecb4efd13fda431db48620125b11ce08
 EBUILD haproxy-1.9.7.ebuild 5017 BLAKE2B 233cbeaa89b0a689b27b2e134d2b47afd6ea06ac0b69adbe700ac4fd3e6fb32bfc98c297518a95c3cb56d1c26b201680e7aab5261cee0b3c83cd60c112e25286 SHA512 8f03e430049386fc115c9d62ca1b5d8ae2d060d45abcea72ccd81d5fb51063525bbc9eb16d1fe88e7afd81c9add9c9c1ecb4efd13fda431db48620125b11ce08
 EBUILD haproxy-1.9.9999.ebuild 5017 BLAKE2B 233cbeaa89b0a689b27b2e134d2b47afd6ea06ac0b69adbe700ac4fd3e6fb32bfc98c297518a95c3cb56d1c26b201680e7aab5261cee0b3c83cd60c112e25286 SHA512 8f03e430049386fc115c9d62ca1b5d8ae2d060d45abcea72ccd81d5fb51063525bbc9eb16d1fe88e7afd81c9add9c9c1ecb4efd13fda431db48620125b11ce08
+EBUILD haproxy-2.0.0.ebuild 5094 BLAKE2B c0fdf13fc7ddb77e0ee6242368a00456893e641a9b723ef1e61a159d44f083c8d9f4c246f1a4e000b89ebcffae66c1457fb8da5a535100090ba5b9d172082bc3 SHA512 09ea9959281af079f4228290180ab53b1359b970203bfe223dc6dad081c110e67de2d1f7696a0b795b655261c0ae0dca3b9339e9815abb631ef4b24243d490fd
+EBUILD haproxy-2.0.9999.ebuild 5094 BLAKE2B c0fdf13fc7ddb77e0ee6242368a00456893e641a9b723ef1e61a159d44f083c8d9f4c246f1a4e000b89ebcffae66c1457fb8da5a535100090ba5b9d172082bc3 SHA512 09ea9959281af079f4228290180ab53b1359b970203bfe223dc6dad081c110e67de2d1f7696a0b795b655261c0ae0dca3b9339e9815abb631ef4b24243d490fd
 MISC metadata.xml 2071 BLAKE2B 303b68ae0788743ec5a8d893e69a87fd2d22188b2166f75c23cd2a47c06e69bfe43745016fafd64b5b298f7b56453fcbfb6b4d9bfede1e08e0c603bce7b0955f SHA512 4ac7fd3dcae2293fa3cdb54fba7dfd9cfbc28f5fca33442dd970861ca26672a0b21d825d36099fbf234831a403fb41eabe02d48eca2a971eaef857516427394b
diff --git a/net-proxy/nylon/Manifest b/net-proxy/nylon/Manifest
deleted file mode 100644
index 5a362a750a17..000000000000
--- a/net-proxy/nylon/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX nylon-1.21-libevent.patch 1854 BLAKE2B 3ee6de7ad563138e987ba242c25a9d117146f1301d82be70d12464418998f0893870c0e6b6e637d6394caf12cc8758a03ca6e592c93c13de04c1369520e0909c SHA512 0a960cd2ef775b53358f9eabc39a73b43534b82ab84eb0cdc2491d69c9f1aa5a69321a84e91a9d759ab65c152b0f6e0a3e93ca4d16e25f3a637215aaccab5fb0
-AUX nylon.conf 787 BLAKE2B d8385c46085e5cf18e27917d7b53a107f07f5f08128f1b79b98344cafeef391a0b9ed9243c841d061b084627edb11eca633f95285c363a4c4f8000ecc0eceb95 SHA512 0f93db98c62e59c97946c70a568e83a4bd08ebed494313bc6062d44cb96298d04ee688089714458733e5fdc668910c80eec318aa765023d388046afe7039dcd8
-AUX nylon.init 402 BLAKE2B 231d031a2fa543b33e4cf2a5d5e7a78cc0e2223ae511dc680b4fb0224e70a592c4417367feb77dc097f6d295e443f7bc87710dbbccb36a96f6f912fb8df39823 SHA512 37b7b1b974d09fc0bbe2df62d85517fd0a3ba7fc4942e7e74e6ab3eaf60a194ad8fb8ae0789e6aa32223ec4d834b4a98dd69c3473aaa9d6f0fd2ee03bb9e9ca5
-DIST nylon-1.21.tar.gz 115954 BLAKE2B e4fd7422349d51edb3f5ac52ba7da8dfe1cc0eeb88effe968d22670a9b2d0ccd395f2ac851f80344a0606cb31ec1bb91cee8d4d66bb5ef30e45b080cc0798132 SHA512 7338ebf376843a49777bfc2c04dc0f9b14a25162efb008a555b6d74991bfbddbe5eb8fa6371c8c6a4dae9739f15d6d85135ba9d39472bc2646293a39777b5cfa
-EBUILD nylon-1.21-r2.ebuild 657 BLAKE2B 0d0ad84094c055a9cb030552714f5c89c89d45008d746db718d48a215d29344b90be176a3c9465a45aeefa305004ff0aac67998ff0305d665a47e959616196af SHA512 5aef47b5392470bfb93b859cdcadb74ac60347c45b2233355a35cfb1a70953ab6186dc78c69498fec0e74675828e58e31950e7f044cf0f39790f59ff5579c62e
-MISC metadata.xml 351 BLAKE2B e845f98be7922de657a4119c7e10e5a66b8dcf96aaf14055fb446e9559b66fff9d456c9cc2997960d75c2ebae5e2bb3405777fc324544d878a7d363a45b339a0 SHA512 a0d51135d2e19f2435e49c7ed375926b19a468c03f6531552df0cd7e002893a8affb8812a43513dc747e302a0914bb23407561d4f1ce99bc14495511a282f733
diff --git a/net-proxy/nylon/files/nylon-1.21-libevent.patch b/net-proxy/nylon/files/nylon-1.21-libevent.patch
deleted file mode 100644
index d7ca2a1ab0e9..000000000000
--- a/net-proxy/nylon/files/nylon-1.21-libevent.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -95,44 +95,10 @@
- AC_REPLACE_FUNCS(strlcpy strlcat strsep setproctitle daemon)
- 
- dnl Checks for libevent
--AC_MSG_CHECKING(for libevent)
--AC_ARG_WITH(libevent,
--[  --with-libevent=DIR     use libevent in DIR],
--[ case "$withval" in
--  yes|no)
--     AC_MSG_RESULT(no)
--     ;;
--  *)
--     AC_MSG_RESULT($withval)
--     if test -f $withval/include/event.h -a -f $withval/lib/libevent.a; then
--        owd=`pwd`
--        if cd $withval; then withval=`pwd`; cd $owd; fi
--        EVENTINC="-I$withval/include"
--        EVENTLIB="-L$withval/lib -levent"
--     elif test -f $withval/event.h -a -f $withval/libevent.a; then
--        owd=`pwd`
--        if cd $withval; then withval=`pwd`; cd $owd; fi
--        EVENTINC="-I$withval"
--        EVENTLIB="-L$withval -levent"
--     else
--        AC_ERROR(event.h or libevent.a not found in $withval)
--     fi
--     ;;
--  esac ],
--[ if test -f ${prefix}/include/event.h -a -f ${prefix}/lib/libevent.a;
--then
--     EVENTINC="-I${prefix}/include"
--     EVENTLIB="-L${prefix}/lib -levent"
--  elif test -f /usr/include/event.h; then
--     EVENTLIB="-levent"
--  else
--     AC_MSG_RESULT(no)
--     AC_ERROR(libevent not found)
--  fi
--  AC_MSG_RESULT(yes) ]
--)
--AC_SUBST(EVENTINC)
--AC_SUBST(EVENTLIB)
-+PKG_CHECK_MODULES(LIBEVENT,libevent,,)
-+
-+AC_SUBST(LIBEVENT_CFLAGS)
-+AC_SUBST(LIBEVENT_LIBS)
- 
- if test "x${sysconfdir}" = 'x${prefix}/etc'; then
-     csysconfdir="${prefix}/etc"
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -5,7 +5,7 @@
- nylon_SOURCES = nylon.c print.c cfg.c expanda.c net.c access.c atomicio.c \
-                 socks4.c socks5.c mirror.c cleanup.c misc.c
- 
--AM_CFLAGS = @EVENTINC@ -Wall -g
--LDADD = @EVENTLIB@ @LIBOBJS@
-+AM_CFLAGS = @LIBEVENT_CFLAGS@
-+LDADD = @LIBEVENT_LIBS@ @LIBOBJS@
- 
- EXTRA_DIST = strlcpy.c strlcat.c setproctitle.c strsep.c err.c daemon.c
diff --git a/net-proxy/nylon/files/nylon.conf b/net-proxy/nylon/files/nylon.conf
deleted file mode 100644
index 80d11cc8806a..000000000000
--- a/net-proxy/nylon/files/nylon.conf
+++ /dev/null
@@ -1,37 +0,0 @@
-# sample configuration
-# marius aamodt eriksen (marius@umich.edu)
-# $Id: nylon.conf,v 1.11 2002/03/27 07:39:53 beriksen Exp $
-# general settings 
-[General]
-
-# number of simultaneous connections allowed
-No-Simultaneous-Conn=10
-
-# log connections and other information to syslog? 1: on, 0: off
-Log=1
-
-# be verbose on the console? 1: on, 0: off
-Verbose=0
-
-# store pid file
-#PIDfile=/var/run/nylon.pid
-
-# server settings
-[Server]
-
-# interface to listen to connections
-#Binding-Interface=fxp1
-
-# interface to bind outgoing connections to
-#Connecting-Interface=fxp0
-
-# listening port to bind to
-Port=1080
-
-# allowed is processed first, then deny
-
-# allowable connect ips/ranges
-#Allow-IP=141.0.0.0/8 127.0.0.1 10.0.0.0/24
-Allow-IP=127.0.0.1/32
-# denied connect ips/ranges
-#Deny-IP=10.0.0.0/24
diff --git a/net-proxy/nylon/files/nylon.init b/net-proxy/nylon/files/nylon.init
deleted file mode 100644
index 7c58d3c9bc32..000000000000
--- a/net-proxy/nylon/files/nylon.init
+++ /dev/null
@@ -1,22 +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 Nylon"
-	start-stop-daemon --start --quiet --pidfile /var/run/nylon.pid \
-		--startas /usr/bin/nylon 
-	eend $?
-}
-
-stop()	{
-	ebegin "Stopping Nylon"
-	start-stop-daemon --stop --quiet --pidfile /var/run/nylon.pid
-	eend $?
-}
-
-
diff --git a/net-proxy/nylon/metadata.xml b/net-proxy/nylon/metadata.xml
deleted file mode 100644
index 5a6f202af08a..000000000000
--- a/net-proxy/nylon/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-<longdescription>nylon is a proxy server, developed on OpenBSD. It supports SOCKS version 4 and 5,
-as well as a mirror mode so that services can be mirrored directly.</longdescription>
-</pkgmetadata>
diff --git a/net-proxy/nylon/nylon-1.21-r2.ebuild b/net-proxy/nylon/nylon-1.21-r2.ebuild
deleted file mode 100644
index ec11be51135c..000000000000
--- a/net-proxy/nylon/nylon-1.21-r2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-DESCRIPTION="A lightweight SOCKS proxy server"
-HOMEPAGE="http://monkey.org/~marius/nylon/"
-SRC_URI="http://monkey.org/~marius/nylon/${P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/libevent-0.6"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-DOCS=( README THANKS )
-
-src_prepare() {
-	default
-
-	eapply "${FILESDIR}"/${P}-libevent.patch
-	eautoreconf
-}
-
-src_install() {
-	default
-	insinto /etc ; doins "${FILESDIR}/nylon.conf"
-	newinitd "${FILESDIR}/nylon.init" nylond
-}