gentoo resync : 01.12.2017

18 files changed, 146 insertions, 297 deletions

diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index 92195b3c4830..fa53ec13c1ba 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index b2383e9f82b7..5a0e7e6fde93 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -1,22 +1,20 @@
 AUX haproxy-1.7-contrib.patch 1066 BLAKE2B 0fa639be8c0b816566f140970a73b360d58e38654744102609115184ca99828b78ec795ab75fe7af0fdf1af4d8f7f869498d8d712c34707732459bb984d63409 SHA512 a26846f3d970b288e6ba8c2cc67190242b41101ebb1b3b14a8ce543109b79d30a1f3257e1b2767033b3208dd223c1597b8a21824c622f16349bc849e9034f631
+AUX haproxy-1.8-contrib.patch 2763 BLAKE2B 89052df94bc6bb3255774791dbec7e1e091e47cb00e5beafc9347193bff0ac29bece83da352ef079f93848f049255dd3a2adf12a3cbcc19e71468af7146c764c SHA512 6279d1c5df16c255857fc5b521efb899d15b7940a4d4584b61c0da98821f05ba5f0b50ef54e62030a2772f91c4ee1230262f617617d4632346aa90982d0a629f
 AUX haproxy.confd 610 BLAKE2B 89c6ea0c2f623bbe7aa80a4f42de1d7fb38a2fa6e9edb5b9c758ee1c5140e750fa6be046e4854c94806a609bd3b487f2553bfeafb1db43871032731425b54f59 SHA512 80a6e109432c7e751e9e1063853f73d3269c4c3967728a90cf94230cb32308b396f9f9ad7795b74b919dae4f61e5a29a9ae7badf0908148accbe0e8ca2238913
 AUX haproxy.initd-r2 978 BLAKE2B b91b4cbd1ff95dc4dabcd62646b2ad03b4cfac253c89326c8e3e38e6c60f3c2175a01aa204ad284e072ce120f1552451b79755a017cf7a2b4ae55b80734b6931 SHA512 039f14980fd6acba7db76abb3c0e0f341bd1a741b126aa956ef2d07670a8e8d79176e378d8c1545701ec11d9779ca0f57298052f74912c58de7801fb06810e73
-AUX haproxy.initd-r4 1690 BLAKE2B 54fe1650a20c1e833cfeffe7fdeb364b1ac1974f77159a706be3cb830000e5f9c04bc97f2a6438e3a58a29fa3a478754877f798da7641e32d023e68b1c987866 SHA512 9431dcfcecf58fb0ee8681c5a649cca725c941a51f0073e67d0bd5ad67ee3f800999f8f4ae593cae06b859e58bc76d9374478c8efd81a36ccf18f54681f89de5
-AUX haproxy.initd-r5 1691 BLAKE2B 90a23428becc3cd4c27af405f69bcd0de2367b8bbb9d6ceb509b2c5a97809bb51eaa7b5ec997810d1f649f0a4534b62b482cddcecb74ecaf191bb42954d7b0fb SHA512 9eca44db0701ebbb418fd6ba27d2e44f2ec33a20b5aeac9b86faaddf026cb5ea99ab2d6fd4bc150480e53c08c673710bfbbdafd3806c213ceb6149909aa664a4
+AUX haproxy.initd-r6 1705 BLAKE2B af8b9ad2fcb499d7fec97fe4210af8685a15881aa98634551bad8ec90bd2fe412a7af337fcb5f3ced7715433fb1d98fa175ecb83fa61108802973976109a7c6d SHA512 59693dfb0ae004559e57fb751ebd4abc85a982733699230ff51aa94a2bb7db9875bc63f6a03355b7434448736beb513e923b2ad9c70661f4110e4b2ad2bba753
 DIST haproxy-1.5.14.tar.gz 1345345 SHA256 9565dd38649064d0350a2883fa81ccfe92eb17dcda457ebdc01535e1ab0c8f99 SHA512 83d6101fd402f37845ab3febc914335e4c6d9bdebbb0ff81c8e048d5252ffa5a1b77c4250a434fed5dd541ef1f1f2c47d969b59f7a51d6ab9aea38a8646a9798 WHIRLPOOL 7d2c580589b9b31e1eba169e4bf930ac42d2564e21eb1c25adbdd39b701abd221fd671ebc227167ab956a48b2c30eeb740a6394355a8fa748c408ee42fdff6fc
 DIST haproxy-1.5.19.tar.gz 1362834 SHA256 e00ae2a633da614967f2e3ebebdb817ec537cba8383b833fc8d9a506876e0d5e SHA512 3462458350d76fe5634428f7b443f21e2d8d4a171ab6254736db2d64587707d11d0df1d851d629c5a2cdfb2858e98cc9345d592859c6d6d8a352b57542dc465a WHIRLPOOL 0cb297dd48e8b9e0c2d6291aa7549c0b6b11e75c58ace3bd50205d7218cf95187129126b21cd13572e0287fc5b311c94ad2ccf664ff30d83a3bc782aea7714ff
 DIST haproxy-1.6.11.tar.gz 1574029 SHA256 62fe982edb102a9f55205792bc14b0d05745cc7993cd6bee5d73cd3c5ae16ace SHA512 73ff1c7301197b3bd75a3b1355787419676854d132ce2dcdacb2a296e297dcdfc52b0c571a4fb715e369f1126e1a58196fabb21f828c880f15904032da78e434 WHIRLPOOL 4454c51da89bb089579aefcf54093fd4c09b42918e81e41772d263ebc19f243a37b42135a02c4012705e4cc31370f377cf0b429e81707f307cffe9ed23f5183b
 DIST haproxy-1.6.13.tar.gz 1580214 SHA256 7d318583f3a1bf185e857bd40449004b29c95547c89bbb36718f284e29502a1b SHA512 ffed3b347e0cd9cefdc379c91890a3c104d6848b976a9f28984878a9c2d05ca7ddea678f7a93f75cb9d29ae2be921e5a5bd295b1a8771765b099d1c619ded7a3 WHIRLPOOL 70176ee090dacbbdc822c74bba137589f168482c560734c06b98dc23b4d957ed1e016309f11f25a0b486bc6917633455f1174dc6688d6aef53667c61b83a9ff3
-DIST haproxy-1.7.7.tar.gz 1745024 SHA256 81196ca449e4ada45fbd743fe3804bb82c25563ff9653e136872181ee5603ae2 SHA512 aa4720962e94b00c2b6090f62fb875e8977783256d877eb799b6a48c884833bac00b12d04fabd440011007e2af1914e0d67ab485026a447d8a61d58128d04a5a WHIRLPOOL d730dd21f1d8c2132297011e3dfbbbc12b6aa2cc61b67ee1cb9001b9f320e1e403ba917b81c8159fc7e2b43a0e3c95fd27172e1c86aada4963d3a4ecaebb3e2e
-DIST haproxy-1.7.8.tar.gz 1746321 SHA256 ec90153ccedd20ad4015d3eaf76b502ff1f61b431d54c22b8457b5784a9ae142 SHA512 e1d65c8a4607c01d52628f36f8c7342096267130a0f949474746f571158e4f795281f78765004c214a0527f74ce180760f9cc910d3650d30026776076d721c0c WHIRLPOOL f781963b2cf80bfb6219399120821a4dd035dd89c07dc4191d45e2a7e4eaf6e8439f4eaa3174dd7a93ceb6f156d9124806f9c6490f8715bf127f37f0b33f9e17
-DIST haproxy-1.7.9.tar.gz 1748159 SHA256 1072337e54fa188dc6e0cfe3ba4c2200b07082e321cbfe5a0882d85d54db068e SHA512 d1ed791bc9607dbeabcfc6a1853cf258e28b3a079923b63d3bf97504dd59e64a5f5f44f9da968c23c12b4279e8d45ff3bd39418942ca6f00d9d548c9a0ccfd73 WHIRLPOOL efd7671925bfd260c0fce9d611ca24f3253a5553677687e5a136f6371a85852caaa4069df9bd1ba3ebe0d86ebdeef5e3c139609fc922eb0c10467cf28570e151
+DIST haproxy-1.7.9.tar.gz 1748159 BLAKE2B 6826ad3519ff300fb1c91992014834543f971fade8a8b89956d4cd1fc0000b1b3e259586a21ee9fa8ca0ee1f4520517dfc328d83d7a858f469f0366df6e3da43 SHA512 d1ed791bc9607dbeabcfc6a1853cf258e28b3a079923b63d3bf97504dd59e64a5f5f44f9da968c23c12b4279e8d45ff3bd39418942ca6f00d9d548c9a0ccfd73
+DIST haproxy-1.8.0.tar.gz 2036854 BLAKE2B c7cebcb3e27f61f8fd65e084c8557c6ecbde07a9517c5950330b315cc76a4ced86272ca7b75a292380a867229be5e2b4e65514d4daae276472fa4d6a7919798c SHA512 7461c49cc00e7d6baf08dad9aba77e2b5cbbb532a902131838b0cc670a9ea85232f2da7187c3463c3bb76ca6955e17ce7eeec57378c002aaac3cf1dfbaf6cceb
 EBUILD haproxy-1.5.14.ebuild 3269 BLAKE2B fed37e73d128612260d8266045891a5e271ba399ee61af005409ab07b089297f4ca39adb67c50e0721efa9b7cdc112f0d5d30a65cb60ac027684ddb69e606c9c SHA512 41d1cfec30d177661f4402143ccf1335f5407adeb9f1581ea866011b1ec26c99da67fb2edd33e71e96b64665fa9c62641fd4b5dc1cd1383cc49877a0ce4292b4
-EBUILD haproxy-1.5.19-r1.ebuild 3283 BLAKE2B b923c67bb1c80acb33c082698e64b75e74039d85ea0a00821f3952bd02ed62bca97453b8fc7ee61e842f2a6aac7ef911cdc2c6a62322823ae62c8450762403e5 SHA512 2c789983ee584f5b917411c55fcfbedf52b284b0b13779b9f587970ae362d63f28013bcd07c858ad9a7de81ca6258336a1875375a1ed46c2b9c2a0e021408f27
-EBUILD haproxy-1.6.11-r1.ebuild 4672 BLAKE2B e4d5db67c992209e270358a6f6d15306ba65ec65136d4265d9c70788c5c3d128d14357f50ba68aeb9d14c133299fa99162e706d1634d8df4e5b8589a96bfb92b SHA512 26dd867d496ecad3d860c5563633e528bf6c41ac7abe1549d090c8d664dc9575788f7ba887b94d910a8b7d20b1732c2ffc336905ab3ea4a8c877ba5872b502cb
-EBUILD haproxy-1.6.13-r2.ebuild 4608 BLAKE2B 522e442ac65b557847423945368689b753821ec3a29b082841c85807063c8197cdfb297f1171cee12bd68604ba74d712a44b6647aa12ad7be0f5701dc9abe4d5 SHA512 3d1e9ddac3421d08ec325a762e8bbbe603242ef9c1deac0d3954a5c6178b0f6e3837533f6e4ebd3251d9329276c316c15e7239edc57c0c1607bef1865c17bb9d
-EBUILD haproxy-1.6.9999-r1.ebuild 4632 BLAKE2B 0704cfc05d79b83a1524291253555005a093b3049708c3dfd565ef0d774159208c439f5050cbcef2388a9418ca760dced787aaa4863a14302a5f2a71668634ba SHA512 4d2dc75aed69988b14e8a34b22d67fab99fefc6a4ae3b6ca03cd33e14a82f85a82325f10bb65a2423c8d1ba70723f8345f3bc3912d865a775a07a2935d0495c3
-EBUILD haproxy-1.7.7.ebuild 4632 BLAKE2B 0704cfc05d79b83a1524291253555005a093b3049708c3dfd565ef0d774159208c439f5050cbcef2388a9418ca760dced787aaa4863a14302a5f2a71668634ba SHA512 4d2dc75aed69988b14e8a34b22d67fab99fefc6a4ae3b6ca03cd33e14a82f85a82325f10bb65a2423c8d1ba70723f8345f3bc3912d865a775a07a2935d0495c3
-EBUILD haproxy-1.7.8.ebuild 4632 BLAKE2B 0704cfc05d79b83a1524291253555005a093b3049708c3dfd565ef0d774159208c439f5050cbcef2388a9418ca760dced787aaa4863a14302a5f2a71668634ba SHA512 4d2dc75aed69988b14e8a34b22d67fab99fefc6a4ae3b6ca03cd33e14a82f85a82325f10bb65a2423c8d1ba70723f8345f3bc3912d865a775a07a2935d0495c3
-EBUILD haproxy-1.7.9.ebuild 4632 BLAKE2B 0704cfc05d79b83a1524291253555005a093b3049708c3dfd565ef0d774159208c439f5050cbcef2388a9418ca760dced787aaa4863a14302a5f2a71668634ba SHA512 4d2dc75aed69988b14e8a34b22d67fab99fefc6a4ae3b6ca03cd33e14a82f85a82325f10bb65a2423c8d1ba70723f8345f3bc3912d865a775a07a2935d0495c3
-EBUILD haproxy-1.7.9999-r1.ebuild 4632 BLAKE2B 0704cfc05d79b83a1524291253555005a093b3049708c3dfd565ef0d774159208c439f5050cbcef2388a9418ca760dced787aaa4863a14302a5f2a71668634ba SHA512 4d2dc75aed69988b14e8a34b22d67fab99fefc6a4ae3b6ca03cd33e14a82f85a82325f10bb65a2423c8d1ba70723f8345f3bc3912d865a775a07a2935d0495c3
-MISC metadata.xml 1945 BLAKE2B 8e594d3046b9c80837f075949815b1f16744bc2f6be6a1072b4577fd652aea8dcb0f99625cb38c806e13d275217feaa5f4ef7154ca594f18f0e47cf84c904d46 SHA512 f5c13a273fcbf50e5d10f67d471b6f0e6cc8f7c5e08d5ed1cb24aa3e5db2c7c6c89f0d6d24d2a9bb4aa26b79b48738af9ded91232050126be145704a0c54b73a
+EBUILD haproxy-1.5.19-r2.ebuild 3283 BLAKE2B 698bb63a7c0b97aa62e1c3b12de9689ababa6407dc98870bd73fed0d7aad4f2e08f13faf466aa40d8c420618dcd82e2292a54b4a779772a8e106e7f88194c7b0 SHA512 f8056a851fb9800bcced3827d1294b8b81115c5da3ae603067bb4d10e276c9e053823ba72ebabf21955a7fe241911256e87d4f086eb029a5c1e3d144c15ebfc3
+EBUILD haproxy-1.6.11-r2.ebuild 4672 BLAKE2B 74b3adb390a7fa1d596e8e91f4ca5fbb46d7dfd201527956a514a3f0855f575b2fc1115b388126d8e54a1a80f13b5b62acb59f53eb92a5bd9ef3f02ab3867c38 SHA512 843c39796ab641d5036dc2f1d151da41acc5820713dd2c2857c551d684b0a5922abead4e9c2afb031bb75635842e9ead645ced6d9cebfa97ccc2f719caed8c58
+EBUILD haproxy-1.6.13-r3.ebuild 4608 BLAKE2B e0dca86f8ee6c089a066cf876a0444468c449021f990eb0d441531d0e42f8a452ba65bd9670ed11c7b297a5105b676ee89039cef6c999b7e97566af89b5c72db SHA512 22fe6a03bd8ca1ea7a521fe6e5b5c5c46de1b8d99885d4ad4c704c8ca1fa255da8381e6eda60fdd3b639f438c260dc4ea030ae746e8c2a234bf72f9b3e0d37c7
+EBUILD haproxy-1.6.9999-r2.ebuild 4632 BLAKE2B bae769008fcc70608d96b1b620d2b561b1f6bc6fc1eb0e6b49c42b20786532f489749947ee7f77aa9dcbf72ca58456e39323fe8e0b5713cbb3a9156318d62201 SHA512 ce18238aeedbdb806fe7f36d7af3d2725e137d20760f7d8812e0c16c8d2f09998800a2809849745176d2d3139c580e9c843454a8006d6115c03608f7828df950
+EBUILD haproxy-1.7.9-r1.ebuild 4632 BLAKE2B bae769008fcc70608d96b1b620d2b561b1f6bc6fc1eb0e6b49c42b20786532f489749947ee7f77aa9dcbf72ca58456e39323fe8e0b5713cbb3a9156318d62201 SHA512 ce18238aeedbdb806fe7f36d7af3d2725e137d20760f7d8812e0c16c8d2f09998800a2809849745176d2d3139c580e9c843454a8006d6115c03608f7828df950
+EBUILD haproxy-1.7.9999-r2.ebuild 4632 BLAKE2B bae769008fcc70608d96b1b620d2b561b1f6bc6fc1eb0e6b49c42b20786532f489749947ee7f77aa9dcbf72ca58456e39323fe8e0b5713cbb3a9156318d62201 SHA512 ce18238aeedbdb806fe7f36d7af3d2725e137d20760f7d8812e0c16c8d2f09998800a2809849745176d2d3139c580e9c843454a8006d6115c03608f7828df950
+EBUILD haproxy-1.8.0.ebuild 5060 BLAKE2B a8ee1bcd2cb8c3d014dcf5829c822eb0558d898225ccba2fb5789bb0a760cbad2da3adf94eb93af12d810c5f2ea70a6707419ad11d44ba9ecdd4ed8de3446487 SHA512 30124108ce3f09ecb91f83f87e4485687b7f05c78d6a584053cf0d7bbca98e55d38e6154a6220c2b43d76b6949feec4088995f528260ec327b1c28a5d30f0d79
+MISC metadata.xml 2071 BLAKE2B 303b68ae0788743ec5a8d893e69a87fd2d22188b2166f75c23cd2a47c06e69bfe43745016fafd64b5b298f7b56453fcbfb6b4d9bfede1e08e0c603bce7b0955f SHA512 4ac7fd3dcae2293fa3cdb54fba7dfd9cfbc28f5fca33442dd970861ca26672a0b21d825d36099fbf234831a403fb41eabe02d48eca2a971eaef857516427394b
diff --git a/net-proxy/haproxy/files/haproxy-1.8-contrib.patch b/net-proxy/haproxy/files/haproxy-1.8-contrib.patch
new file mode 100644
index 000000000000..a3e336a57734
--- /dev/null
+++ b/net-proxy/haproxy/files/haproxy-1.8-contrib.patch
@@ -0,0 +1,81 @@
+From c702537864f7e062d18f4ccce3e29d14d4ccf05f Mon Sep 17 00:00:00 2001
+From: Christian Ruppert <idl0r@gentoo.org>
+Date: Thu, 30 Nov 2017 10:11:36 +0100
+Subject: [PATCH] Fix LDFLAGS vs. LIBS re linking order
+
+Signed-off-by: Christian Ruppert <idl0r@gentoo.org>
+---
+ contrib/mod_defender/Makefile | 5 ++---
+ contrib/modsecurity/Makefile  | 5 ++---
+ contrib/spoa_example/Makefile | 5 ++---
+ 3 files changed, 6 insertions(+), 9 deletions(-)
+
+diff --git a/contrib/mod_defender/Makefile b/contrib/mod_defender/Makefile
+index ac17774d..efc7d7f6 100644
+--- a/contrib/mod_defender/Makefile
++++ b/contrib/mod_defender/Makefile
+@@ -28,9 +28,8 @@ EVENT_INC := /usr/include
+ endif
+
+ CFLAGS  += -g -Wall -pthread
+-LDFLAGS += -lpthread  $(EVENT_LIB) -levent_pthreads -lapr-1 -laprutil-1 -lstdc++ -lm
+ INCS += -I../../include -I../../ebtree -I$(MOD_DEFENDER_SRC) -I$(APACHE2_INC) -I$(APR_INC) -I$(EVENT_INC)
+-LIBS =
++LIBS += -lpthread  $(EVENT_LIB) -levent_pthreads -lapr-1 -laprutil-1 -lstdc++ -lm
+
+ CXXFLAGS = -g -std=gnu++11
+ CXXINCS += -I$(MOD_DEFENDER_SRC) -I$(MOD_DEFENDER_SRC)/deps -I$(APACHE2_INC) -I$(APR_INC)
+@@ -43,7 +42,7 @@ CXXSRCS = $(wildcard $(MOD_DEFENDER_SRC)/*.cpp)
+ CXXOBJS = $(patsubst %.cpp, %.o, $(CXXSRCS))
+
+ defender: $(OBJS) $(CXXOBJS)
+-	$(LD) -o $@ $^ $(LDFLAGS) $(LIBS)
++	$(LD) $(LDFLAGS) -o $@ $^ $(LIBS)
+
+ install: defender
+	install defender $(DESTDIR)$(BINDIR)
+diff --git a/contrib/modsecurity/Makefile b/contrib/modsecurity/Makefile
+index bb918c30..aa0d6e38 100644
+--- a/contrib/modsecurity/Makefile
++++ b/contrib/modsecurity/Makefile
+@@ -34,14 +34,13 @@ EVENT_INC := /usr/include
+ endif
+
+ CFLAGS  += -g -Wall -pthread
+-LDFLAGS += -lpthread  $(EVENT_LIB) -levent_pthreads -lcurl -lapr-1 -laprutil-1 -lxml2 -lpcre -lyajl
+ INCS += -I../../include -I../../ebtree -I$(MODSEC_INC) -I$(APACHE2_INC) -I$(APR_INC) -I$(LIBXML_INC) -I$(EVENT_INC)
+-LIBS =
++LIBS += -lpthread  $(EVENT_LIB) -levent_pthreads -lcurl -lapr-1 -laprutil-1 -lxml2 -lpcre -lyajl
+
+ OBJS = spoa.o modsec_wrapper.o
+
+ modsecurity: $(OBJS)
+-	$(LD) $(LDFLAGS) $(LIBS) -o $@ $^ $(MODSEC_LIB)/standalone.a
++	$(LD) $(LDFLAGS) -o $@ $^ $(MODSEC_LIB)/standalone.a $(LIBS)
+
+ install: modsecurity
+	install modsecurity $(DESTDIR)$(BINDIR)
+diff --git a/contrib/spoa_example/Makefile b/contrib/spoa_example/Makefile
+index d04a01e1..c44c2b87 100644
+--- a/contrib/spoa_example/Makefile
++++ b/contrib/spoa_example/Makefile
+@@ -6,15 +6,14 @@ CC = gcc
+ LD = $(CC)
+
+ CFLAGS  = -g -O2 -Wall -Werror -pthread
+-LDFLAGS = -lpthread -levent -levent_pthreads
+ INCS += -I../../ebtree -I./include
+-LIBS =
++LIBS = -lpthread -levent -levent_pthreads
+
+ OBJS = spoa.o
+
+
+ spoa: $(OBJS)
+-	$(LD) $(LDFLAGS) $(LIBS) -o $@ $^
++	$(LD) $(LDFLAGS) -o $@ $^ $(LIBS)
+
+ install: spoa
+	install spoa $(DESTDIR)$(BINDIR)
+--
+2.13.6
diff --git a/net-proxy/haproxy/files/haproxy.initd-r4 b/net-proxy/haproxy/files/haproxy.initd-r4
deleted file mode 100644
index c37719b16752..000000000000
--- a/net-proxy/haproxy/files/haproxy.initd-r4
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_commands="checkconfig"
-extra_started_commands="reload"
-
-command="/usr/bin/haproxy"
-
-pidfile="${HAPROXY_PIDFILE:-/run/${SVCNAME}.pid}"
-
-configs=
-
-if [ -z "${CONFIGS}" ]; then
-	if [ -f "/etc/haproxy/${SVCNAME}.cfg" ]; then
-		CONFIGS=/etc/haproxy/${SVCNAME}.cfg
-	elif [ -f "/etc/${SVCNAME}.cfg" ]; then
-		CONFIGS=/etc/${SVCNAME}.cfg # Deprecated
-	fi
-fi
-
-for conf in $CONFIGS; do
-	configs="${configs} -f ${conf}"
-done
-
-command_args="-D -p ${pidfile} ${configs} ${HAPROXY_OPTS}"
-
-depend() {
-	need net
-	use dns logger
-}
-
-checkconfig() {
-	if [ -z "${CONFIGS}" ]; then
-		eerror "No config(s) has been specified"
-		return 1
-	fi
-
-	for conf in $CONFIGS; do
-		if [ ! -f "${conf}" ]; then
-			eerror "${conf} does not exist!"
-			return 1
-		fi
-	done
-
-	ebegin "Checking ${CONFIGS}"
-	$command -q -c $configs $HAPROXY_OPTS
-	eend $?
-}
-
-start_pre() {
-	if [ "${RC_CMD}" != "restart" ]; then
-		checkconfig || return 1
-	fi
-}
-
-stop_pre() {
-	if [ "${RC_CMD}" = "restart" ]; then
-		checkconfig || return 1
-	fi
-}
-
-stop() {
-	local _t _pid
-
-	_t="$(mktemp)"
-	for _pid in $(cat ${pidfile}) ; do
-		echo "${_pid}" > "${_t}"
-		pidfile="${_t}" default_stop
-	done
-	rm -f "${_t}"
-}
-
-reload() {
-	checkconfig || { eerror "Reloading failed, please fix your config(s) first"; return 1; }
-
-	if [ "$(command -v reload_seamless)" = "reload_seamless" ]; then
-		einfo "Calling user-defined reload_seamless()"
-		reload_seamless || { eerror "reload_seamless() failed!"; return 1; }
-	fi
-
-	ebegin "Reloading ${SVCNAME}"
-	$command -D -p "${pidfile}" $configs $HAPROXY_OPTS -sf $(cat "${pidfile}")
-	eend $?
-}
diff --git a/net-proxy/haproxy/files/haproxy.initd-r5 b/net-proxy/haproxy/files/haproxy.initd-r6
index 0f2435f74339..9b7c5fe973ba 100644
--- a/net-proxy/haproxy/files/haproxy.initd-r5
+++ b/net-proxy/haproxy/files/haproxy.initd-r6
@@ -66,7 +66,7 @@ stop() {
 	_t="$(mktemp)"
 	for _pid in $(cat ${pidfile}) ; do
 		echo "${_pid}" > "${_t}"
-		pidfile="${_t}" default_stop
+		start-stop-daemon --stop --pidfile="${_t}"
 	done
 	rm -f "${_t}"
 }
diff --git a/net-proxy/haproxy/haproxy-1.5.19-r1.ebuild b/net-proxy/haproxy/haproxy-1.5.19-r2.ebuild
index 2b0bc8af0a4b..7b4655b91afa 100644
--- a/net-proxy/haproxy/haproxy-1.5.19-r1.ebuild
+++ b/net-proxy/haproxy/haproxy-1.5.19-r2.ebuild
@@ -91,7 +91,7 @@ src_install() {
 	dosbin haproxy
 	dosym /usr/sbin/haproxy /usr/bin/haproxy
 
-	newinitd "${FILESDIR}/haproxy.initd-r5" haproxy
+	newinitd "${FILESDIR}/haproxy.initd-r6" haproxy
 
 	# Don't install useless files
 #	rm examples/build.cfg doc/*gpl.txt
diff --git a/net-proxy/haproxy/haproxy-1.6.11-r1.ebuild b/net-proxy/haproxy/haproxy-1.6.11-r2.ebuild
index 06254314e424..9b9f889a0e0e 100644
--- a/net-proxy/haproxy/haproxy-1.6.11-r1.ebuild
+++ b/net-proxy/haproxy/haproxy-1.6.11-r2.ebuild
@@ -108,7 +108,7 @@ src_install() {
 	dobin haproxy
 
 	newconfd "${FILESDIR}/${PN}.confd" $PN
-	newinitd "${FILESDIR}/${PN}.initd-r4" $PN
+	newinitd "${FILESDIR}/${PN}.initd-r6" $PN
 
 	doman doc/haproxy.1
 
diff --git a/net-proxy/haproxy/haproxy-1.6.13-r2.ebuild b/net-proxy/haproxy/haproxy-1.6.13-r3.ebuild
index 5d3f45d2f516..1f40cd754eb7 100644
--- a/net-proxy/haproxy/haproxy-1.6.13-r2.ebuild
+++ b/net-proxy/haproxy/haproxy-1.6.13-r3.ebuild
@@ -101,7 +101,7 @@ src_install() {
 	dosym /usr/sbin/haproxy /usr/bin/haproxy
 
 	newconfd "${FILESDIR}/${PN}.confd" $PN
-	newinitd "${FILESDIR}/${PN}.initd-r5" $PN
+	newinitd "${FILESDIR}/${PN}.initd-r6" $PN
 
 	doman doc/haproxy.1
 
diff --git a/net-proxy/haproxy/haproxy-1.7.9.ebuild b/net-proxy/haproxy/haproxy-1.6.9999-r2.ebuild
index 43c58bdf5bc1..6c77e7061acc 100644
--- a/net-proxy/haproxy/haproxy-1.7.9.ebuild
+++ b/net-proxy/haproxy/haproxy-1.6.9999-r2.ebuild
@@ -102,7 +102,7 @@ src_install() {
 	dosym /usr/sbin/haproxy /usr/bin/haproxy
 
 	newconfd "${FILESDIR}/${PN}.confd" $PN
-	newinitd "${FILESDIR}/${PN}.initd-r5" $PN
+	newinitd "${FILESDIR}/${PN}.initd-r6" $PN
 
 	doman doc/haproxy.1
 
diff --git a/net-proxy/haproxy/haproxy-1.6.9999-r1.ebuild b/net-proxy/haproxy/haproxy-1.7.9-r1.ebuild
index 43c58bdf5bc1..6c77e7061acc 100644
--- a/net-proxy/haproxy/haproxy-1.6.9999-r1.ebuild
+++ b/net-proxy/haproxy/haproxy-1.7.9-r1.ebuild
@@ -102,7 +102,7 @@ src_install() {
 	dosym /usr/sbin/haproxy /usr/bin/haproxy
 
 	newconfd "${FILESDIR}/${PN}.confd" $PN
-	newinitd "${FILESDIR}/${PN}.initd-r5" $PN
+	newinitd "${FILESDIR}/${PN}.initd-r6" $PN
 
 	doman doc/haproxy.1
 
diff --git a/net-proxy/haproxy/haproxy-1.7.9999-r1.ebuild b/net-proxy/haproxy/haproxy-1.7.9999-r1.ebuild
deleted file mode 100644
index 43c58bdf5bc1..000000000000
--- a/net-proxy/haproxy/haproxy-1.7.9999-r1.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit user versionator 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://haproxy.1wt.eu"
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI="http://haproxy.1wt.eu/download/$(get_version_component_range 1-2)/src/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc ~x86"
-else
-	EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(get_version_component_range 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 ssl tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
-REQUIRED_USE="pcre-jit? ( pcre )
-	device-atlas? ( pcre )
-	?? ( slz zlib )"
-
-DEPEND="
-	pcre? (
-		dev-libs/libpcre
-		pcre-jit? ( dev-libs/libpcre[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 )
-version_is_at_least 1.7.0 $PV && PATCHES=( "${FILESDIR}"/haproxy-1.7-contrib.patch )
-CONTRIBS=( halog iprange )
-# ip6range is present in 1.6, but broken.
-version_is_at_least 1.7.0 $PV && CONTRIBS+=( ip6range spoa_example tcploop )
-
-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=(
-		TARGET=linux2628
-		USE_GETADDRINFO=1
-		USE_TFO=1
-	)
-
-	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 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) )
-
-	# 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
-			emake -C contrib/${contrib} \
-				CFLAGS="${CFLAGS}" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
-		done
-	fi
-}
-
-src_install() {
-	dosbin haproxy
-	dosym /usr/sbin/haproxy /usr/bin/haproxy
-
-	newconfd "${FILESDIR}/${PN}.confd" $PN
-	newinitd "${FILESDIR}/${PN}.initd-r5" $PN
-
-	doman doc/haproxy.1
-
-	dosbin haproxy-systemd-wrapper
-	dosym /usr/sbin/haproxy-systemd-wrapper /usr/bin/haproxy-systemd-wrapper
-	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
-	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-1.7.7.ebuild b/net-proxy/haproxy/haproxy-1.7.9999-r2.ebuild
index 43c58bdf5bc1..6c77e7061acc 100644
--- a/net-proxy/haproxy/haproxy-1.7.7.ebuild
+++ b/net-proxy/haproxy/haproxy-1.7.9999-r2.ebuild
@@ -102,7 +102,7 @@ src_install() {
 	dosym /usr/sbin/haproxy /usr/bin/haproxy
 
 	newconfd "${FILESDIR}/${PN}.confd" $PN
-	newinitd "${FILESDIR}/${PN}.initd-r5" $PN
+	newinitd "${FILESDIR}/${PN}.initd-r6" $PN
 
 	doman doc/haproxy.1
 
diff --git a/net-proxy/haproxy/haproxy-1.7.8.ebuild b/net-proxy/haproxy/haproxy-1.8.0.ebuild
index 43c58bdf5bc1..80e41f24b2ab 100644
--- a/net-proxy/haproxy/haproxy-1.7.8.ebuild
+++ b/net-proxy/haproxy/haproxy-1.8.0.ebuild
@@ -20,8 +20,11 @@ fi
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-IUSE="+crypt doc examples libressl slz net_ns +pcre pcre-jit ssl tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
+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 )"
 
@@ -30,6 +33,10 @@ DEPEND="
 		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= )
@@ -44,9 +51,12 @@ S="${WORKDIR}/${MY_P}"
 
 DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
 version_is_at_least 1.7.0 $PV && PATCHES=( "${FILESDIR}"/haproxy-1.7-contrib.patch )
+version_is_at_least 1.8.0 $PV && PATCHES=( "${FILESDIR}"/haproxy-1.8-contrib.patch )
 CONTRIBS=( halog iprange )
 # ip6range is present in 1.6, but broken.
 version_is_at_least 1.7.0 $PV && CONTRIBS+=( ip6range spoa_example tcploop )
+# TODO: mod_defender - requires apache / APR, modsecurity - the same
+version_is_at_least 1.8.0 $PV && CONTRIBS+=( hpack )
 
 haproxy_use() {
 	(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
@@ -71,6 +81,8 @@ src_compile() {
 		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) )
@@ -82,6 +94,7 @@ src_compile() {
 	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
@@ -102,12 +115,10 @@ src_install() {
 	dosym /usr/sbin/haproxy /usr/bin/haproxy
 
 	newconfd "${FILESDIR}/${PN}.confd" $PN
-	newinitd "${FILESDIR}/${PN}.initd-r5" $PN
+	newinitd "${FILESDIR}/${PN}.initd-r6" $PN
 
 	doman doc/haproxy.1
 
-	dosbin haproxy-systemd-wrapper
-	dosym /usr/sbin/haproxy-systemd-wrapper /usr/bin/haproxy-systemd-wrapper
 	systemd_dounit contrib/systemd/haproxy.service
 
 	einstalldocs
@@ -130,6 +141,7 @@ src_install() {
 		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
diff --git a/net-proxy/haproxy/metadata.xml b/net-proxy/haproxy/metadata.xml
index ddb31ac2bb8b..6a09dde73e29 100644
--- a/net-proxy/haproxy/metadata.xml
+++ b/net-proxy/haproxy/metadata.xml
@@ -6,21 +6,23 @@
 		<name>Christian Ruppert</name>
 	</maintainer>
 	<longdescription>
-HAProxy is a free, very fast and reliable solution offering high availability, load balancing, and proxying for TCP and HTTP-based applications. It is particularly suited for web sites crawling under very high loads while needing persistence or Layer7 processing. Supporting tens of thousands of connections is clearly realistic with todays hardware. Its mode of operation makes its integration into existing architectures very easy and riskless, while still offering the possibility not to expose fragile web servers to the Net.
+		HAProxy is a free, very fast and reliable solution offering high availability, load balancing, and proxying for TCP and HTTP-based applications. It is particularly suited for web sites crawling under very high loads while needing persistence or Layer7 processing. Supporting tens of thousands of connections is clearly realistic with todays hardware. Its mode of operation makes its integration into existing architectures very easy and riskless, while still offering the possibility not to expose fragile web servers to the Net.
 
-It can:
- - route HTTP requests depending on statically assigned cookies
- - spread the load among several servers while assuring server persistence through the use of HTTP cookies
- - switch to backup servers in the event a main one fails
- - accept connections to special ports dedicated to service monitoring
- - stop accepting connections without breaking existing ones
- - add/modify/delete HTTP headers both ways
- - block requests matching a particular pattern
-Its event-driven architecture allows it to easily handle thousands of simultaneous connections on hundreds of instances without risking the system's stability.
+		It can:
+		- route HTTP requests depending on statically assigned cookies
+		- spread the load among several servers while assuring server persistence through the use of HTTP cookies
+		- switch to backup servers in the event a main one fails
+		- accept connections to special ports dedicated to service monitoring
+		- stop accepting connections without breaking existing ones
+		- add/modify/delete HTTP headers both ways
+		- block requests matching a particular pattern
+		Its event-driven architecture allows it to easily handle thousands of simultaneous connections on hundreds of instances without risking the system's stability.
 	</longdescription>
 	<use>
 		<flag name="net_ns">Enable network namespace support (CONFIG_NET_NS)</flag>
 		<flag name="pcre-jit">Use JIT support for PCRE</flag>
+		<flag name="pcre2">Enable PCRE2 RegEx support</flag>
+		<flag name="pcre2-jit">Use JIT support for PCRE2</flag>
 		<flag name="slz">Use <pkg>dev-libs/libslz</pkg> compression library</flag>
 		<flag name="tools">Install additional tools (halog, iprange)</flag>
 		<flag name="device-atlas">Use <pkg>dev-libs/device-atlas-api-c</pkg> library</flag>
diff --git a/net-proxy/nutcracker/Manifest b/net-proxy/nutcracker/Manifest
index ee6a39c35b9f..5995ebe5adc3 100644
--- a/net-proxy/nutcracker/Manifest
+++ b/net-proxy/nutcracker/Manifest
@@ -10,4 +10,4 @@ DIST nutcracker-0.4.1.tar.gz 1163442 SHA256 00c2940f91947bea9457a348316aac1aa1d4
 EBUILD nutcracker-0.2.4.ebuild 901 BLAKE2B fd8f7bbee630207041c31018312c9be1e79b8e9449f098d1a4414eba7ea87383ffa8bc45b1c4a88ce503e9dd0adcb22c6a8d366d7042d6dfebf2f370bb4cc1ad SHA512 e481f1d96bab41538208c62261d9191d4f643c53c99b4ce68e16f698e1b6532324a4bc801b27bb557b7f6842fee7998c4a04b85c4a7cde89be24421099d5f096
 EBUILD nutcracker-0.3.0.ebuild 901 BLAKE2B 638008c4ecacc469f20a9498bf8faea6aa717654197166750e83d05df5b02027ee79da726d210e860b9a4bd82f5b2e0f8a71ee3dfe338d400502db9cbe3c0b3e SHA512 12bf64d1e36468e55cef8e60578b17817a808c0fcd354393ee9bfda8f3611aa409ebf4fbdce84c42957209891c09f47405ca72ea5460bd8e769533e78834e030
 EBUILD nutcracker-0.4.1-r1.ebuild 967 BLAKE2B 3ed30384cf917745e8b14fc5e40266a47aa3f1c3119e9b641b6c6f719be5132edbf19118cc3a93380a2e18009a7a7a7e52cfd44dee0621fb62bc694c472e33ca SHA512 b0de762f155724a1f431ec0662001ec1206aa64551bcb107fc9464f6c2f49fcf1d287818be7d56587e6d73d4d39e9b52390a868e62df457e3ea7995635175267
-MISC metadata.xml 335 BLAKE2B 97379bf3ed3f0a208003548f72bb7031542bfdd3b50da201ae1092ad58f2787c587fb12b2e0277ab31ded6db8d5dcaf4db1382d309bbc5d26923d280190d2e27 SHA512 5b3b0aaefb2f4e9ed98835a29767288b85ce89139209e1aeb194d22870907b4ff78d152b71482af61635e5554b5707305d19fe3ba48692de4bfb2f8623f9f754
+MISC metadata.xml 329 BLAKE2B c3b117fab3b6d2d5f01572e797c946d89bfead4d46853df0aa03da840fde527fbaec9d070446872aabd632a3a27f2a0ad82a4164df0c58fa132a8b51e38828ea SHA512 26a39f6d3e84b5ec4f59c9f7167593f3f340be020401213a0339d027ddcbbcebbb512313c39ed1a3e61007b16f85737dc23e2f091413a4ef91d3675fd2ea2034
diff --git a/net-proxy/nutcracker/metadata.xml b/net-proxy/nutcracker/metadata.xml
index a681c7f99620..4fca877b654e 100644
--- a/net-proxy/nutcracker/metadata.xml
+++ b/net-proxy/nutcracker/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>patrick@gentoo.org</email>
-    <name>Patrick Lauer</name>
-  </maintainer>
+	<maintainer type="person">
+		<email>patrick@gentoo.org</email>
+		<name>Patrick Lauer</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">twitter/twemproxy</remote-id>
 	</upstream>
diff --git a/net-proxy/shadowsocks-libev/Manifest b/net-proxy/shadowsocks-libev/Manifest
index fa23a3fe8c25..f36d03e870f8 100644
--- a/net-proxy/shadowsocks-libev/Manifest
+++ b/net-proxy/shadowsocks-libev/Manifest
@@ -10,4 +10,4 @@ DIST shadowsocks-libev-3.0.6.tar.xz 1512740 SHA256 c890bd96d73b89d9bb28031fa17d6
 EBUILD shadowsocks-libev-2.5.6.ebuild 2110 BLAKE2B 0c719bb90bcb7d5b90f2f3a8c17eab9326b5a1300c25d00fee889df541a7c5476f682f741ab4dcddfc55b75f4e3d0f6cc608811ad4bb0f3d99b40d0f5e90ae65 SHA512 67cbee9fff5e617deb1ead4a65e4d6814ca2493dff9b49f70b8e88fba85dddc0ce2c5e55651876a06ccb8819c11063a2d2065818e4c4965f60aee4dbe2d35fb7
 EBUILD shadowsocks-libev-2.6.2.ebuild 2110 BLAKE2B b3b3f2d438dfeb50e71720a7097daab0e912b7d1f724c40d92416bfa3579442e2f04b0355c2bcdee3cc6c1fa3d143b4bfee9fcf40a8494d3ad7b73c14e9950d9 SHA512 15f335a2c8ed7de3213388031903f96a565b40440ca43c338382673230a87c19637c332801d430387ac75cb6b03f08e5adc86a2c768b5d9332f02f6319cafd66
 EBUILD shadowsocks-libev-3.0.6.ebuild 1945 BLAKE2B 4393b6c36604a82a480ce4606123b36ad2dd38e3e79fc2b36a117c89d1b1bb666c60416f6dd29de098a54b12c97355c4c44a4b74f85dc79aa0d989b6da783875 SHA512 94899a6a4acb1471b2bd920fe86d0cb275eb69aa5878accf7a95f0f9e1fa52db5fe67518157ee60e3dfa6807584e05a66729a5d511cf599fff6679c6caa16830
-MISC metadata.xml 637 BLAKE2B ff90b4e487e9c40c44c81a7c9f416d99e41c09b7326a3203b0f292920c54cab8e43b3f8760936b8624d365cda0f0667e1698973038f8e526fddb3b7091830128 SHA512 2668d0cb112e83a8200e0574a49b4db712303e34431abfd23f02f46deabddc50fd20161bcb7a357701f1008f17f42f8bb29cc63cd9a23820cb37be655b3fc876
+MISC metadata.xml 622 BLAKE2B fa547e21ce3b156a691b899356a9de0643934e6405f3ee57bdfcd4efa93c626e75182b21cf1c3e620ca72d5f244b72a94a0d05d15f405189ffd0edfa1f466fdf SHA512 caf36c6be998243ae50957c561cd62485d5316f776ad2dfde3d4e9df922d602c0bc1c4c99279139f3e590a0ce447a14e7e361280f5c4c9e3530622a7b45ebffd
diff --git a/net-proxy/shadowsocks-libev/metadata.xml b/net-proxy/shadowsocks-libev/metadata.xml
index cb44189bcda5..8771f7c6a926 100644
--- a/net-proxy/shadowsocks-libev/metadata.xml
+++ b/net-proxy/shadowsocks-libev/metadata.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>dlan@gentoo.org</email>
-    <name>Yixun Lan</name>
-  </maintainer>
-  <use>
-    <flag name="openssl">Use <pkg>dev-libs/openssl</pkg> as crypto backend</flag>
-    <flag name="mbedtls">Use <pkg>net-libs/mbedtls</pkg> as crypto backend</flag>
-	<flag name="system-libs">Use system libraries instead of the ones included in the upstream distribution</flag>
-  </use>
-  <upstream>
-    <remote-id type="github">shadowsocks/shadowsocks-libev</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>dlan@gentoo.org</email>
+		<name>Yixun Lan</name>
+	</maintainer>
+	<use>
+		<flag name="openssl">Use <pkg>dev-libs/openssl</pkg> as crypto backend</flag>
+		<flag name="mbedtls">Use <pkg>net-libs/mbedtls</pkg> as crypto backend</flag>
+		<flag name="system-libs">Use system libraries instead of the ones included in the upstream distribution</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">shadowsocks/shadowsocks-libev</remote-id>
+	</upstream>
 </pkgmetadata>