gentoo resync : 15.12.2019

26 files changed, 333 insertions, 511 deletions

diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index 21bc23f83a25..883fc46ad96b 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 74b0cdf6b1ec..2a10f63d613c 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -1,30 +1,26 @@
-AUX haproxy-1.7-contrib.patch 1066 BLAKE2B 0fa639be8c0b816566f140970a73b360d58e38654744102609115184ca99828b78ec795ab75fe7af0fdf1af4d8f7f869498d8d712c34707732459bb984d63409 SHA512 a26846f3d970b288e6ba8c2cc67190242b41101ebb1b3b14a8ce543109b79d30a1f3257e1b2767033b3208dd223c1597b8a21824c622f16349bc849e9034f631
 AUX haproxy.confd 610 BLAKE2B 89c6ea0c2f623bbe7aa80a4f42de1d7fb38a2fa6e9edb5b9c758ee1c5140e750fa6be046e4854c94806a609bd3b487f2553bfeafb1db43871032731425b54f59 SHA512 80a6e109432c7e751e9e1063853f73d3269c4c3967728a90cf94230cb32308b396f9f9ad7795b74b919dae4f61e5a29a9ae7badf0908148accbe0e8ca2238913
 AUX haproxy.initd-r6 1705 BLAKE2B af8b9ad2fcb499d7fec97fe4210af8685a15881aa98634551bad8ec90bd2fe412a7af337fcb5f3ced7715433fb1d98fa175ecb83fa61108802973976109a7c6d SHA512 59693dfb0ae004559e57fb751ebd4abc85a982733699230ff51aa94a2bb7db9875bc63f6a03355b7434448736beb513e923b2ad9c70661f4110e4b2ad2bba753
-DIST haproxy-1.6.11.tar.gz 1574029 BLAKE2B 553f74c2c24a1b07cef2acc6fbc4def1bbe81e41a7b01ba44937c6ff2e14c1f1a4f1472dde229ecef1ed3170f4e89d356324cb2ce1e7d7064837f37fbd4c3b46 SHA512 73ff1c7301197b3bd75a3b1355787419676854d132ce2dcdacb2a296e297dcdfc52b0c571a4fb715e369f1126e1a58196fabb21f828c880f15904032da78e434
-DIST haproxy-1.6.15.tar.gz 1589782 BLAKE2B d65684b75c9577644d88a2ca17bf90f5cb845ca8c4c149ddf95a06b0ad2d25bb6a457c4c380c6cae4745bac2c00ec49cdb89df60ba8704965239cb0f2951670a SHA512 fd50c8451a357494a7c767347d1d9d957e07664e2388f3f8f0d492823e6d974d55b9f8699bd98c8d37d9829e4180c395569d0d7a4da2dc3c0f4849607598e9c0
-DIST haproxy-1.7.10.tar.gz 1750937 BLAKE2B 26d970862e415b079d4130fd00564677584a7aad74d6812cabed36de9a629321330434b7d4fdf7c2e8b2945b7f394ca33e444158e7fa9b49937db501ea33e78a SHA512 ca6c50848c559ee2ffb9af2d281c3931473dd90d1686d95d962cf604cd92d2feb2b63e006e217cf9078cf08fdd73dc523318c97e13400bc0ef325de47111394e
-DIST haproxy-1.7.12.tar.gz 1760527 BLAKE2B da46b21140c242eda7df09a91d2f6fd88912e62aa0c316cd3cd6a7726be96cd9b579b3c908ec5aabec6a3e98a77e2b40f930c0e491e806ba2c1c857e5676fabc SHA512 66c099ff3057e5a18e0ac6155382cc208fe583a215ae530541056eb634e5c30062558ce182360772684c403b6574b5f02f900d90c847ffc5f6a823c41bfb7766
 DIST haproxy-1.8.13.tar.gz 2063046 BLAKE2B 9ebccf2520719cdf209bc9a87bf28d015b5b673e0d017d5387af4025f930ac401f6a2cfa851583ffe6b6645b7b91ad255bb5db737688a1f310958072a11c8a80 SHA512 54d4cb0721a3868267d7e085b3d3bb050384e4279eb49e88abb925bb3ea8cc39ef9069bdc99b7b18a23fd22e0d29e24dfcb8a0507ddca9243a845e4418be9cc5
-DIST haproxy-1.8.22.tar.gz 2100471 BLAKE2B cb42d01bd61d457c1c8ea2372073d424a4a37058843d7b8acd1c28f36449f88328ed3536b71c9f2b7cb4e3663910311378c93ee4353c1c5b74a2abb9793048cf SHA512 fd017288e9bd21fe2568f0fb2bdd90daa2e2bf72ef0d6fda123280cdbd1edff1b928c90ccd641eb00416b908321f5d146b293871d67fc4666377e46a214fabee
+DIST haproxy-1.8.23.tar.gz 2101424 BLAKE2B e1be06fd604f8715d52ad66ea77a1eb56d38eae46442eca9d497bd4eb5f34124ba32f5c9f44d0232063af3f3803e37b205eda9bd21266064de6db287b49fabe6 SHA512 bfd65179345285f6f4581a7dce42e638b89e12717d4cb9218afa085759161e04b6c78307d04265a6c97cd484b67949781639da5236edb89137585c625130be4f
 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.12.tar.gz 2392981 BLAKE2B 2cf32cf34d5c555645fb411189136564e7ff08e8797041821219e981f3734d996cec5a1367c1c064ec3a4fe0d3f52cb06c10cd8d68f743712387b13c0d91c3c4 SHA512 6f8c30f7111a0fbd4b63e964cfb2b4e45f541905e53d9abd040581cf7801f6403d4f2ea48e4fc62be473a1d920760f6481eade1672920abe8bb65e15fd04761f
+DIST haproxy-1.9.13.tar.gz 2395999 BLAKE2B 1b54aa732e7972b151ea00d76c6dd152fd6e0537f2885a75adf7cee9237ea344b79d7e45cf384c7836bfd2484848fbd8dbe6df0b146a7b6cfce8854caecb049b SHA512 3b5f76da7ebfa9ed6aefa5c3b49c43c103591c1d52168d587f787724cc88d7f13b2cf4ee6a643fb3ecbcbac31ef8c507ad71bde68156d44efe61d4b758e7e0a8
+DIST haproxy-2.0.10.tar.gz 2557865 BLAKE2B 0e98fd2461414b4b55fc2bf100c80f17cbc34da2cae6d5c09fdbf708b4606f564c51bf54f77b98a2f455b61f31ac793fdc92873beb269dcbd15ea45379f0aca1 SHA512 d3f0c0a7cce49d394dda7553ed79102cfef2c21ea6d640fbc325246806c93d862cb48c40f4717d9e1b50b2390698466282fe8c4d8b305259e3057f3711e69a39
 DIST haproxy-2.0.6.tar.gz 2541637 BLAKE2B 52d88ef3c944437fbee7128163621cc9aae541eac16a71cd3aa1d7396b44e84b643d45a0b3cd990a73686a9d254855633bcc38b0ad1d8a13f8c8e1a2c444bfff SHA512 78c8483a97845928dc3ec7da68bedfda73303c88e8146a6b38c3d2b4e2089af5668817f0675180d41274c6337d5fae7cad5534013bd15d9b06071b89a09a86b5
 DIST haproxy-2.0.7.tar.gz 2542573 BLAKE2B a312244087a3730c7837aebb99c64e40ac98ed06e6dc65f02151356ca4130a7d9b3eddc08b92fcb8d9658b98d19ad95ad3dd3e0945ff7824ee3ce2bf0aac8ce7 SHA512 3257bb90555cb7ccf1b5ef71815f8258598aa87239ec46a24d250929811bd49fef21e4c2d0a12ee9f7aca2cca33367f972e4e62e9b01274b8c644a97e4353574
 DIST haproxy-2.0.8.tar.gz 2546661 BLAKE2B 2e8ec27398e6515c8e5b3cd51b4a219682dcfe798d0ad545ac2933ff5ca8c2ff78568935900c8523a703c3d96da64b61160dd967a832307455e63f1bd64f8d3f SHA512 61cb7274d96bde1c542e9f0cd5c9dc8f7ee5fa710eb8867bd70040718ce696505d533713f867199d6f0780fe0f8c7e989bf25ee93e806c0e3fe6f593382814a6
-EBUILD haproxy-1.6.11-r2.ebuild 4672 BLAKE2B 74b3adb390a7fa1d596e8e91f4ca5fbb46d7dfd201527956a514a3f0855f575b2fc1115b388126d8e54a1a80f13b5b62acb59f53eb92a5bd9ef3f02ab3867c38 SHA512 843c39796ab641d5036dc2f1d151da41acc5820713dd2c2857c551d684b0a5922abead4e9c2afb031bb75635842e9ead645ced6d9cebfa97ccc2f719caed8c58
-EBUILD haproxy-1.6.15.ebuild 4605 BLAKE2B 350ec95b85eeec8cfc856ee685e9fe55867a053ff97640a76a4823b8ecfc053c5d359cd488d6c55dc93a1f8dac6fd4d0d1f4efadc05b734fbeaa9de356d9d412 SHA512 0833c89242f3366c2aef5205044da5efcbc4b16dd72ff71b9d87851fe449c7ae77385d3c6ac8e0edfd94d1252d26bb74ba4c8033d5c6406c1a883c61d6744a18
-EBUILD haproxy-1.7.10.ebuild 4628 BLAKE2B 267e5228e4c1eb2386ab13a6f21d018e8f8643d9adcdb61851d150b281e2241eda97c701b4577fef8feee00c01409f8f2fc715a9681874fc05fc3f89c09da440 SHA512 941f9c3e0982ee44d51339b3feef43d93c7259413f2d77f8919e63056a0d0504468bd0637965141842af6c8dbb223f23155ffc0728f54bc1bbf539eef678c235
-EBUILD haproxy-1.7.12.ebuild 4629 BLAKE2B 344a6f4ae5a13d95553466bec159432b50b7e776c49f69dd6787addd026b2f0fffe676c5cfc9f52321d99fabf7636ac2f39ebfb175951d8425d646a084e9a1d3 SHA512 f81436170276910d1228e588eef6e493a58881d6117f2f7ac633a8cce845aca80b69b9ab6ee2aedce21ee0a220c4ba0610ebd5f9e32984be4657feb8598e6114
+DIST haproxy-2.1.0.tar.gz 2583210 BLAKE2B 275d32a0070300745f99c8cccb700f765df7b5877bff3d3c6f90f5b42b3754b0107cfdcf1fb3fbc1c7f17eb62e6576e3f295296768a0ba8c5c0c6cd1f835174f SHA512 fb4cd61ba190d66dc96871dfff3651983592bdc17752ee9d93a04f58820e31fe6096ad5ad692cc3d3e571e901aac8f51125fd99488046324037530ff6a62086a
 EBUILD haproxy-1.8.13.ebuild 4886 BLAKE2B 61bc37ea42b0dd5bc447b68cb45532c184f14ad40461faddb940e041682e88ac81af36ce44d961d1011bc54b788ad9baa4c9447950a97708ea33dcb9d677fc32 SHA512 5dad241368a64aba2b07e429ab82adff67df556fc2b5a447d4863a12d50098545127f30725887b447e6ed583e39177458267777c5b321636211aab5a61b85a65
-EBUILD haproxy-1.8.22.ebuild 4886 BLAKE2B 94d1654d71261f4d4e3d4984cf2afae1721c3f5d85f5caec1f7ba7be2a2f3c0889a2de02fd542b18f8a2fe0222debfd35f47c3fdcde0cbb8122dc493fec021a5 SHA512 a006987c4cf8f56bca0347537cf86e9282d5f0b5cb1864665104d1e93da53084711bac338dce99b1f6cdccfa1fec7534dc58cb7139c126fcc3b6131d371b7dce
+EBUILD haproxy-1.8.23.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.12.ebuild 5018 BLAKE2B 93d3a44ccbdbc8abb196df919c8e7515ef58507b208341d5490391590b005ce4a43f91a1c62f810fe5559d21de349611f9d4da05a7d2b1418a3b405b67b603d9 SHA512 c5c4627a42bea17e1a459e4eb5b427ef469959bfe1882fb3ec6f1aba3462d4389c425399caeb2822ee2952af01b75d04e0b770a520c22e5487652d455676955d
+EBUILD haproxy-1.9.13.ebuild 5018 BLAKE2B 93d3a44ccbdbc8abb196df919c8e7515ef58507b208341d5490391590b005ce4a43f91a1c62f810fe5559d21de349611f9d4da05a7d2b1418a3b405b67b603d9 SHA512 c5c4627a42bea17e1a459e4eb5b427ef469959bfe1882fb3ec6f1aba3462d4389c425399caeb2822ee2952af01b75d04e0b770a520c22e5487652d455676955d
 EBUILD haproxy-1.9.9999.ebuild 5018 BLAKE2B 93d3a44ccbdbc8abb196df919c8e7515ef58507b208341d5490391590b005ce4a43f91a1c62f810fe5559d21de349611f9d4da05a7d2b1418a3b405b67b603d9 SHA512 c5c4627a42bea17e1a459e4eb5b427ef469959bfe1882fb3ec6f1aba3462d4389c425399caeb2822ee2952af01b75d04e0b770a520c22e5487652d455676955d
+EBUILD haproxy-2.0.10.ebuild 5245 BLAKE2B 39175f93f60e5ed921e0b176eaa380eac45d85c59ace787f151224e79f53e4915865ef3e68ffead27a0e5d57afda3e29b30de58d4b14f87da563163e6605b84b SHA512 240fb06ccb7e0a9830d6d20807dab2c8d789d4912397a77b6cf8047b947a59389f2e34d980fde0aad06d313249e2abc7510a6120af6b9b6230d5f3d0979da4cc
 EBUILD haproxy-2.0.6.ebuild 5245 BLAKE2B 39175f93f60e5ed921e0b176eaa380eac45d85c59ace787f151224e79f53e4915865ef3e68ffead27a0e5d57afda3e29b30de58d4b14f87da563163e6605b84b SHA512 240fb06ccb7e0a9830d6d20807dab2c8d789d4912397a77b6cf8047b947a59389f2e34d980fde0aad06d313249e2abc7510a6120af6b9b6230d5f3d0979da4cc
 EBUILD haproxy-2.0.7.ebuild 5245 BLAKE2B 39175f93f60e5ed921e0b176eaa380eac45d85c59ace787f151224e79f53e4915865ef3e68ffead27a0e5d57afda3e29b30de58d4b14f87da563163e6605b84b SHA512 240fb06ccb7e0a9830d6d20807dab2c8d789d4912397a77b6cf8047b947a59389f2e34d980fde0aad06d313249e2abc7510a6120af6b9b6230d5f3d0979da4cc
 EBUILD haproxy-2.0.8.ebuild 5245 BLAKE2B 39175f93f60e5ed921e0b176eaa380eac45d85c59ace787f151224e79f53e4915865ef3e68ffead27a0e5d57afda3e29b30de58d4b14f87da563163e6605b84b SHA512 240fb06ccb7e0a9830d6d20807dab2c8d789d4912397a77b6cf8047b947a59389f2e34d980fde0aad06d313249e2abc7510a6120af6b9b6230d5f3d0979da4cc
-EBUILD haproxy-2.0.9999.ebuild 5095 BLAKE2B d61671818bd8045a2f3330c4bc2b99cbfcac57ea17beb9047de23dcbbd9b91cf617e00043845900da2c3e9c085c398b1ab9be7295e3c9e77e84907b5b79f80f2 SHA512 ce7ed08cf23efa5898c4ba3179c2b7ff0c1612a0b1d2c1a7811a0514c711ba0c4a06c0cdb80a88707d36e7fccc3b4e42a4163b4bcf89ef4fbc589a99eb8fc936
+EBUILD haproxy-2.0.9999.ebuild 5245 BLAKE2B 39175f93f60e5ed921e0b176eaa380eac45d85c59ace787f151224e79f53e4915865ef3e68ffead27a0e5d57afda3e29b30de58d4b14f87da563163e6605b84b SHA512 240fb06ccb7e0a9830d6d20807dab2c8d789d4912397a77b6cf8047b947a59389f2e34d980fde0aad06d313249e2abc7510a6120af6b9b6230d5f3d0979da4cc
+EBUILD haproxy-2.1.0.ebuild 5245 BLAKE2B 39175f93f60e5ed921e0b176eaa380eac45d85c59ace787f151224e79f53e4915865ef3e68ffead27a0e5d57afda3e29b30de58d4b14f87da563163e6605b84b SHA512 240fb06ccb7e0a9830d6d20807dab2c8d789d4912397a77b6cf8047b947a59389f2e34d980fde0aad06d313249e2abc7510a6120af6b9b6230d5f3d0979da4cc
+EBUILD haproxy-2.1.9999.ebuild 5245 BLAKE2B 39175f93f60e5ed921e0b176eaa380eac45d85c59ace787f151224e79f53e4915865ef3e68ffead27a0e5d57afda3e29b30de58d4b14f87da563163e6605b84b SHA512 240fb06ccb7e0a9830d6d20807dab2c8d789d4912397a77b6cf8047b947a59389f2e34d980fde0aad06d313249e2abc7510a6120af6b9b6230d5f3d0979da4cc
 MISC metadata.xml 2148 BLAKE2B 2f273c8d5c4704b482cf5b09e038415e0faa6ecba7297f99d0c55d96ba0b8f0bfa50b21dc857680951c3b4794be98f8781a6d1dcfb622ec5f6827648cfdd247e SHA512 91834d33a145ce6f887f83849ea90da984cf131e657824e63fb44b49761dc9999c00796fb20879cc670b83a2f4aae2263aeacc1dc6bf71b9db34a21ef9a3026d
diff --git a/net-proxy/haproxy/files/haproxy-1.7-contrib.patch b/net-proxy/haproxy/files/haproxy-1.7-contrib.patch
deleted file mode 100644
index 9ecffe7e3c78..000000000000
--- a/net-proxy/haproxy/files/haproxy-1.7-contrib.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -Nuar --exclude '*~' haproxy-1.7.9999.orig/contrib/tcploop/Makefile haproxy-1.7.9999/contrib/tcploop/Makefile
---- haproxy-1.7.9999.orig/contrib/tcploop/Makefile	2016-12-04 16:08:05.497256646 -0800
-+++ haproxy-1.7.9999/contrib/tcploop/Makefile	2016-12-04 16:12:20.558141392 -0800
-@@ -5,7 +5,7 @@
- OBJS     = tcploop
- 
- tcploop: tcploop.c
--	$(CC) $(OPTIMIZE) $(DEFINE) $(INCLUDE) -o $@ $^
-+	$(CC) $(OPTIMIZE) $(DEFINE) $(INCLUDE) $(LDFLAGS) -o $@ $^ $(LIBS)
- 
- clean:
- 	rm -f $(OBJS) *.[oas] *~
-diff -Nuar --exclude '*~' haproxy-1.7.9999.orig/contrib/spoa_example/Makefile haproxy-1.7.9999/contrib/spoa_example/Makefile
---- haproxy-1.7.9999.orig/contrib/spoa_example/Makefile	2016-12-04 15:56:49.068302156 -0800
-+++ haproxy-1.7.9999/contrib/spoa_example/Makefile	2016-12-04 15:58:51.360644213 -0800
-@@ -6,13 +6,13 @@
- LD = $(CC)
- 
- CFLAGS  = -g -O2 -Wall -Werror -pthread
--LDFLAGS = -lpthread
-+LIBS = -lpthread
- 
- OBJS = spoa.o
- 
- 
- spoa: $(OBJS)
--	$(LD) $(LDFLAGS) -o $@ $^
-+	$(LD) $(LDFLAGS) -o $@ $^ $(LIBS)
- 
- install: spoa
- 	install spoa $(DESTDIR)$(BINDIR)
diff --git a/net-proxy/haproxy/haproxy-1.6.11-r2.ebuild b/net-proxy/haproxy/haproxy-1.6.11-r2.ebuild
deleted file mode 100644
index 9b9f889a0e0e..000000000000
--- a/net-proxy/haproxy/haproxy-1.6.11-r2.ebuild
+++ /dev/null
@@ -1,164 +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 )
-	?? ( 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_prepare() {
-	default
-
-	sed -e 's:@SBINDIR@:'/usr/bin':' contrib/systemd/haproxy.service.in \
-		> contrib/systemd/haproxy.service || die
-
-	sed -ie 's:/usr/sbin/haproxy:/usr/bin/haproxy:' src/haproxy-systemd-wrapper.c || die
-}
-
-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[@]}
-
-	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() {
-	dobin haproxy
-
-	newconfd "${FILESDIR}/${PN}.confd" $PN
-	newinitd "${FILESDIR}/${PN}.initd-r6" $PN
-
-	doman doc/haproxy.1
-
-	dobin 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.10.ebuild b/net-proxy/haproxy/haproxy-1.7.10.ebuild
deleted file mode 100644
index 2848b4df6351..000000000000
--- a/net-proxy/haproxy/haproxy-1.7.10.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2018 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-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
-
-	# 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.8.22.ebuild b/net-proxy/haproxy/haproxy-1.8.23.ebuild
index be9a23a9cd27..be9a23a9cd27 100644
--- a/net-proxy/haproxy/haproxy-1.8.22.ebuild
+++ b/net-proxy/haproxy/haproxy-1.8.23.ebuild
diff --git a/net-proxy/haproxy/haproxy-1.9.12.ebuild b/net-proxy/haproxy/haproxy-1.9.13.ebuild
index 0eacacdc48d8..0eacacdc48d8 100644
--- a/net-proxy/haproxy/haproxy-1.9.12.ebuild
+++ b/net-proxy/haproxy/haproxy-1.9.13.ebuild
diff --git a/net-proxy/haproxy/haproxy-1.7.12.ebuild b/net-proxy/haproxy/haproxy-2.0.10.ebuild
index 0b2ddea1094e..06e10c936692 100644
--- a/net-proxy/haproxy/haproxy-1.7.12.ebuild
+++ b/net-proxy/haproxy/haproxy-2.0.10.ebuild
@@ -1,27 +1,30 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 [[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit user versionator toolchain-funcs flag-o-matic systemd linux-info $SCM
+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://haproxy.1wt.eu"
+HOMEPAGE="http://www.haproxy.org"
 if [[ ${PV} != *9999 ]]; then
-	SRC_URI="http://haproxy.1wt.eu/download/$(get_version_component_range 1-2)/src/${MY_P}.tar.gz"
+	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-$(get_version_component_range 1-2).git/"
+	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 ssl tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
+IUSE="+crypt doc examples libressl slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter
+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= )
@@ -43,10 +50,11 @@ 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 )
+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>"
@@ -66,15 +74,18 @@ pkg_setup() {
 
 src_compile() {
 	local -a args=(
-		TARGET=linux2628
-		USE_GETADDRINFO=1
-		USE_TFO=1
+		V=1
+		TARGET=linux-glibc
 	)
 
+	# 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) )
@@ -82,32 +93,37 @@ 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
 
-	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
+	if use prometheus-exporter; then
+		EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o"
+	fi
+
+	# HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing
+	emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) EXTRA_OBJS="${EXTRA_OBJS}" ${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}" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
+				CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
 		done
 	fi
 }
 
 src_install() {
 	dosbin haproxy
-	dosym /usr/sbin/haproxy /usr/bin/haproxy
+	dosym ../sbin/haproxy /usr/bin/haproxy
 
 	newconfd "${FILESDIR}/${PN}.confd" $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,17 +146,18 @@ 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
 		docinto examples
 		dodoc examples/*.cfg
-		dodoc examples/seamless_reload.txt
+		dodoc doc/seamless_reload.txt
 	fi
 
 	if use vim-syntax ; then
 		insinto /usr/share/vim/vimfiles/syntax
-		doins examples/haproxy.vim
+		doins contrib/syntax-highlight/haproxy.vim
 	fi
 }
 
@@ -153,7 +170,7 @@ pkg_postinst() {
 		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}"
+			einfo "   ${EROOT}/usr/share/doc/${PF}"
 		fi
 	fi
 }
diff --git a/net-proxy/haproxy/haproxy-2.0.9999.ebuild b/net-proxy/haproxy/haproxy-2.0.9999.ebuild
index c920acfec53a..06e10c936692 100644
--- a/net-proxy/haproxy/haproxy-2.0.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.0.9999.ebuild
@@ -20,8 +20,8 @@ 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"
+IUSE="+crypt doc examples libressl slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter
+ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
 REQUIRED_USE="pcre-jit? ( pcre )
 	pcre2-jit? ( pcre2 )
 	pcre? ( !pcre2 )
@@ -98,8 +98,12 @@ src_compile() {
 	# For now, until the strict-aliasing breakage will be fixed
 	append-cflags -fno-strict-aliasing
 
+	if use prometheus-exporter; then
+		EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o"
+	fi
+
 	# HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing
-	emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
+	emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) EXTRA_OBJS="${EXTRA_OBJS}" ${args[@]}
 	emake -C contrib/systemd SBINDIR=/usr/sbin
 
 	if use tools ; then
diff --git a/net-proxy/haproxy/haproxy-1.6.15.ebuild b/net-proxy/haproxy/haproxy-2.1.0.ebuild
index 634b436d8353..06e10c936692 100644
--- a/net-proxy/haproxy/haproxy-1.6.15.ebuild
+++ b/net-proxy/haproxy/haproxy-2.1.0.ebuild
@@ -1,27 +1,31 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 [[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit user versionator toolchain-funcs flag-o-matic systemd linux-info $SCM
+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://haproxy.1wt.eu"
+HOMEPAGE="http://www.haproxy.org"
 if [[ ${PV} != *9999 ]]; then
-	SRC_URI="http://haproxy.1wt.eu/download/$(get_version_component_range 1-2)/src/${MY_P}.tar.gz"
+	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-$(get_version_component_range 1-2).git/"
+	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 ssl tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
+IUSE="+crypt doc examples libressl slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter
+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="
@@ -29,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= )
@@ -42,10 +50,11 @@ 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 )
+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>"
@@ -65,15 +74,18 @@ pkg_setup() {
 
 src_compile() {
 	local -a args=(
-		TARGET=linux2628
-		USE_GETADDRINFO=1
-		USE_TFO=1
+		V=1
+		TARGET=linux-glibc
 	)
 
+	# 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) )
@@ -81,32 +93,37 @@ 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
 
-	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
+	if use prometheus-exporter; then
+		EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o"
+	fi
+
+	# HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing
+	emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) EXTRA_OBJS="${EXTRA_OBJS}" ${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}" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
+				CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
 		done
 	fi
 }
 
 src_install() {
 	dosbin haproxy
-	dosym /usr/sbin/haproxy /usr/bin/haproxy
+	dosym ../sbin/haproxy /usr/bin/haproxy
 
 	newconfd "${FILESDIR}/${PN}.confd" $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
@@ -129,17 +146,18 @@ 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
 		docinto examples
 		dodoc examples/*.cfg
-		dodoc examples/seamless_reload.txt
+		dodoc doc/seamless_reload.txt
 	fi
 
 	if use vim-syntax ; then
 		insinto /usr/share/vim/vimfiles/syntax
-		doins examples/haproxy.vim
+		doins contrib/syntax-highlight/haproxy.vim
 	fi
 }
 
@@ -152,7 +170,7 @@ pkg_postinst() {
 		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}"
+			einfo "   ${EROOT}/usr/share/doc/${PF}"
 		fi
 	fi
 }
diff --git a/net-proxy/haproxy/haproxy-2.1.9999.ebuild b/net-proxy/haproxy/haproxy-2.1.9999.ebuild
new file mode 100644
index 000000000000..06e10c936692
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-2.1.9999.ebuild
@@ -0,0 +1,176 @@
+# 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 prometheus-exporter
+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=linux-glibc
+	)
+
+	# 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
+
+	if use prometheus-exporter; then
+		EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o"
+	fi
+
+	# HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing
+	emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) EXTRA_OBJS="${EXTRA_OBJS}" ${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 doc/seamless_reload.txt
+	fi
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins contrib/syntax-highlight/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/nutcracker/Manifest b/net-proxy/nutcracker/Manifest
index 5d83e66bd834..8d8ddc3f3d68 100644
--- a/net-proxy/nutcracker/Manifest
+++ b/net-proxy/nutcracker/Manifest
@@ -7,7 +7,7 @@ AUX nutcracker.initd.2 891 BLAKE2B c643a511d2e402477c0862b67cdebb244fc2205466d78
 DIST nutcracker-0.2.4.tar.gz 1723439 BLAKE2B 58287d9dfa51f6661fd1f288308c2172856dc284053e211df83f142d1314b89869b5eccb95412b71dc385726eb4a878cec0e2e9a79d5f2850214dab154c437b4 SHA512 13d7d2a778a5d85a1d73eaa220f2e95eb7765eff0c8af390ab916f099b12d6c1a99cb61ff418b9a909ff7e2b416b271ba034eb9f50cd7df1ee53600d8b681409
 DIST nutcracker-0.3.0.tar.gz 1825106 BLAKE2B e98a7a4a8d6599b14bdd21204cd0d1894d4474f32a2a9184d991217e6c087a504f51d8b822a0ad687b35c9119a63d5d338e6df4137f059784efd05c3b512aa65 SHA512 81ba21c54b9a15fbb1d0a42b426643b65bcd20b7bb4b35cf3427235703a01a44188b762edff412afe20c193a4e75bf618f69d8c77bae9d66cd2c4e619416f565
 DIST nutcracker-0.4.1.tar.gz 1163442 BLAKE2B 6838fbb5623ad49ef564176ba4c7d4e61cedb9693851cacc06d8ed09e3045b8cff9df1af8e21790cfa0e3f988b81a9c9cfa852449d532a432c05f3f4c3eace56 SHA512 581fae1d12feb983ed25b22cd6f597fd28b7070906ac29d3990669ae5c626a468914021cee152a6a2299a2838c838ad907e4c911b911ef04166ac7bbb2982da1
-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
+EBUILD nutcracker-0.2.4.ebuild 879 BLAKE2B a4b7aa9527bc78e5362c7b6da396c2589167e3d1c2268263c72ea7163b07b70869e79a44282ab7491eb83546856fd979a59b6b1cc5d0d51a205b2fce4665b7fa SHA512 ce16532d9984d34b6b62e114d32938a7afe350b3b67bbbf1db23b8a1f51d2f5576e7a84a11f86f325a56026d2436609e1cfa532eae979f8d48952b7a3c6ad9f9
+EBUILD nutcracker-0.3.0.ebuild 879 BLAKE2B bce999e160912b0235e387045048fe93fcb7d757128bce065b64ae39094a99af16a4319beef4e68caac96bf279c305deab1c7f94a46b5b673091471e109e386b SHA512 f6bf0c8bbf6c0564d8f91fc06236da22e4c9938cc4c88ca79f622eb303857cef5575e8fe176d4bf4a841a2949d6692c5515806ea365a3243b72cad1da8b89c41
+EBUILD nutcracker-0.4.1-r1.ebuild 945 BLAKE2B 035e4388a33b31aca64ff31265b2ca9b7009bed0c63b621cf5d6002f08643ef0e44d3870755c66ec416e1bff3ed2dc4acd928b470ae9dab7e52a7308bb87d412 SHA512 5253d7d16427ad5f25650a741aa835b8130f632df98be16b92a9ae52f5d81da620cf578752e39ef42ff080188ba203b57dd922de9ddf53332d7e3ffca85ce3f8
 MISC metadata.xml 329 BLAKE2B c3b117fab3b6d2d5f01572e797c946d89bfead4d46853df0aa03da840fde527fbaec9d070446872aabd632a3a27f2a0ad82a4164df0c58fa132a8b51e38828ea SHA512 26a39f6d3e84b5ec4f59c9f7167593f3f340be020401213a0339d027ddcbbcebbb512313c39ed1a3e61007b16f85737dc23e2f091413a4ef91d3675fd2ea2034
diff --git a/net-proxy/nutcracker/nutcracker-0.2.4.ebuild b/net-proxy/nutcracker/nutcracker-0.2.4.ebuild
index 3a41d6658396..fa6a1948951b 100644
--- a/net-proxy/nutcracker/nutcracker-0.2.4.ebuild
+++ b/net-proxy/nutcracker/nutcracker-0.2.4.ebuild
@@ -25,7 +25,7 @@ src_prepare() {
 }
 
 src_configure() {
-	econf $(use debug) || die "Econf failed"
+	econf $(use debug)
 }
 
 src_install() {
diff --git a/net-proxy/nutcracker/nutcracker-0.3.0.ebuild b/net-proxy/nutcracker/nutcracker-0.3.0.ebuild
index 123d9cb88672..bd06f918d24a 100644
--- a/net-proxy/nutcracker/nutcracker-0.3.0.ebuild
+++ b/net-proxy/nutcracker/nutcracker-0.3.0.ebuild
@@ -25,7 +25,7 @@ src_prepare() {
 }
 
 src_configure() {
-	econf $(use debug) || die "Econf failed"
+	econf $(use debug)
 }
 
 src_install() {
diff --git a/net-proxy/nutcracker/nutcracker-0.4.1-r1.ebuild b/net-proxy/nutcracker/nutcracker-0.4.1-r1.ebuild
index 2b8f82b4c02d..7fa901b297c4 100644
--- a/net-proxy/nutcracker/nutcracker-0.4.1-r1.ebuild
+++ b/net-proxy/nutcracker/nutcracker-0.4.1-r1.ebuild
@@ -27,7 +27,7 @@ src_prepare() {
 }
 
 src_configure() {
-	econf $(use debug) || die "Econf failed"
+	econf $(use debug)
 }
 
 src_install() {
diff --git a/net-proxy/obfs4proxy/Manifest b/net-proxy/obfs4proxy/Manifest
index dffc26c1cf57..19a017e27614 100644
--- a/net-proxy/obfs4proxy/Manifest
+++ b/net-proxy/obfs4proxy/Manifest
@@ -5,5 +5,5 @@ DIST github.com-golang-net-74de082e2cca95839e88aa0aeee5aadf6ce7710f.tar.gz 97664
 DIST github.com-golang-sys-9eb1bfa1ce65ae8a6ff3114b0aaf9a41a6cf3560.tar.gz 1262620 BLAKE2B ffa03ba8cb0fbdb9d2b68bf00920dd7695a0dcbfc190f26cff2045b0612103dee8fa1ede2b64ed384d59889b0af11088c6e7586d1314ec2265a028e63d0641a3 SHA512 eee9be21a6be3c84127e1bb0c90f6c872aec2b3dc88d1dffd9421b8ff18e1e517b3d1f39f06f47339a21aa78a9570884c64a37d31b1816ac67ba0dc0b3f15cce
 DIST gitlab.com-yawning-utls---v0.0.11-1.tar.gz 560616 BLAKE2B 68fa15c07bccbf58ca7666453d53cb892777160ea2843095024d4811891803d0a1a4f876247ca2fe5ff08cac24e96d50ada838bde9afbaf34a7208f8b30b8f01 SHA512 debea4bfe2b2686d181fa0f6a583833728d154b4262c6a7fe9354d3d953739355aade92c927fa3a10d5b78efe37d9707ab4c59beaa765c64b6fe99dbc54f1722
 DIST obfs4proxy-0.0.11.tar.gz 85557 BLAKE2B 9b56433fa4a1023ce2c2b75cec598a1f55fb8229659ee66604b636d2269b243d347e34eb1b539b71db5ac0cb45c868d249844a82e04b20faa6dc1785fe4b78dc SHA512 3eb50bc8067802f8260e0926999a659919e55cb34247f443f66a4852c9ceceacae361602a57ad1fd28a84e4ed54f3800c3258e67266eb23d45b1d09e31c5d869
-EBUILD obfs4proxy-0.0.11.ebuild 1596 BLAKE2B fbfb2843b4726ed911f9c3ba3c1ad592d8eaeb01aed03eea0501c084c041dd1b9c44a377f6aeb8612410a3dd607ef3c78b127b8482a16058ffb4fba7c796722e SHA512 3a78684036cc2685f6d4263543e46e3718f114999cf23afff1e4763ac5df26042a74fce59a8b1fe4c2e3749c9eb6c471980327dd012050457ba7f843b64420bd
+EBUILD obfs4proxy-0.0.11.ebuild 1524 BLAKE2B 6e66d38cba88d4dec6686cb86141c9689dff588dcf2311788ba10964452d8b3eb00c4dbe059223aa45a0d73dc2b70ab674df03f10ef644f586c9302fe763542a SHA512 b742f0d77dfd0a36a9bc775500b4cb10dbbc184899356829bbc08fc359a82d0a309bd76c541aae6a2daa2e3c6dcf1bdeb680f52f4d490d6aec8dbaeaefe0de41
 MISC metadata.xml 436 BLAKE2B a31742b53be9467a5b916219f3d76ce32f4c59d6d72c867f0d8cec5669b1fba84453efea7fa886ac4dc5d0528c3763188fe6736c5b76b4475a31ecd44d78a1a3 SHA512 0077fbce7545acc98c3964643cc51be782d7aa0fe82fc1b3b44b89a6611e9b95bd579ae143c57a5c16f58c16c406f7fcbdd79e8b4e50f433092903ba6e2d3989
diff --git a/net-proxy/obfs4proxy/obfs4proxy-0.0.11.ebuild b/net-proxy/obfs4proxy/obfs4proxy-0.0.11.ebuild
index e0d6e07a19be..c5626e850c86 100644
--- a/net-proxy/obfs4proxy/obfs4proxy-0.0.11.ebuild
+++ b/net-proxy/obfs4proxy/obfs4proxy-0.0.11.ebuild
@@ -43,8 +43,8 @@ src_compile() {
 
 src_install() {
 	default
-	dobin obfs4proxy || die "install failed"
+	dobin obfs4proxy
 	cd src/${EGO_SRC}
-	doman doc/obfs4proxy.1 || die "install failed"
-	dodoc README.md ChangeLog doc/obfs4-spec.txt || die "install failed"
+	doman doc/obfs4proxy.1
+	dodoc README.md ChangeLog doc/obfs4-spec.txt
 }
diff --git a/net-proxy/redsocks/Manifest b/net-proxy/redsocks/Manifest
index 8b50c66f5f1a..02f0c6442aac 100644
--- a/net-proxy/redsocks/Manifest
+++ b/net-proxy/redsocks/Manifest
@@ -2,6 +2,6 @@ AUX redsocks.conf 350 BLAKE2B 52bf1cb52f94d7eb2ab151905fb8b66644868c9cfb72b1d739
 AUX redsocks.init 1282 BLAKE2B 1efeb84d25630df8501b53d36f056a62733ab2f1c40a591d1c2b321224e3ed526fae1a0cbb4502c233c66b2c7c0541c0893311b749fb486176b978d79b10097b SHA512 81af76d7917273028cda3fa62e2c04ae27f763d93c6abac12c9b47877ae64918b4b07ed680fefb0e11ac3476c3f490f5e6d315ba8b0cf9a40b756cd32fc5234c
 AUX redsocks.service 437 BLAKE2B 919055f6cd25a605b3cff1ad63e69579975868952ef362ddf6f025404a0109e159af51854ef3d24663322f1515508b2dfe89b00bc53070a63d515b3bcd0858a8 SHA512 73d2b6df7d1688b2605ec56f1843de1b58a5e3d8e88267cd99aa774303f8184ff5c7756b4fdd7215e3ccba8637eb8e41dac121fbe0339730fa1e51943957ce27
 DIST redsocks-0.5.tar.gz 496403 BLAKE2B 7416340a7142669c72a8aeebc2c0775a393781de7fcbb63e4fbc71ce828658bc2b0615b394a990683c9fd13f41f050c92609dd956b4468bb06ec1ff261324c23 SHA512 678faca95b3570f793754abfe752b3d3580ea125aac8615ca2a1fce92cd50e7919832afe7cf5d1cc40b700045fca08f86ea1697d062ac8e7be706d166e69ff70
-EBUILD redsocks-0.5.ebuild 1152 BLAKE2B 5165d566d3630f97a944d27c5f6f4c1e56dbaefa4409ae0f7fc7d452011eb2477520d3d2c48ec3bc29a9a4355ee1f5951cb6db458cbbfa347ba91b7a1854b889 SHA512 20055f6d4b4dc79d841754c1e85c277e78ba6656916950fa068af37c6ba71ea7af1df3cb7d0164236d39de27edafbfa2cd57c8ac322234c11af7dbf1b3dd029b
-EBUILD redsocks-9999.ebuild 1152 BLAKE2B 5165d566d3630f97a944d27c5f6f4c1e56dbaefa4409ae0f7fc7d452011eb2477520d3d2c48ec3bc29a9a4355ee1f5951cb6db458cbbfa347ba91b7a1854b889 SHA512 20055f6d4b4dc79d841754c1e85c277e78ba6656916950fa068af37c6ba71ea7af1df3cb7d0164236d39de27edafbfa2cd57c8ac322234c11af7dbf1b3dd029b
+EBUILD redsocks-0.5.ebuild 1130 BLAKE2B 3fb70113213f328699d3a3649d4453c74e252ef7c20bc377587b0b21ae099df730aa8e922d265ca71368bf4ad6b89ebd0080128d58da9167895da32b886c0619 SHA512 c832d72a0858e49c70807c825518c5d4bd68a689234f2087ad37aca39f26130498d2753b059651f39f7897be4cb41a589e8ee4e0a66c1c1df318a975e2ec7bc7
+EBUILD redsocks-9999.ebuild 1130 BLAKE2B 3fb70113213f328699d3a3649d4453c74e252ef7c20bc377587b0b21ae099df730aa8e922d265ca71368bf4ad6b89ebd0080128d58da9167895da32b886c0619 SHA512 c832d72a0858e49c70807c825518c5d4bd68a689234f2087ad37aca39f26130498d2753b059651f39f7897be4cb41a589e8ee4e0a66c1c1df318a975e2ec7bc7
 MISC metadata.xml 1060 BLAKE2B b7db194e1155a93ff22b6ca713a442ae08f21ae27f9835e0f3ec09ccf86d4f33fa2d4da20251c58acdbeeeaa6bef3fe95de7e22f67eae2acf28406f53e494569 SHA512 5b48446a0edf223af4775df8ebf02b71112cbda5494853e97c0dfaa7aaeecc2529af8c340ab36507c96eaaade07e6ac73bcf51d23acc4a5ddaaf69bbe093a321
diff --git a/net-proxy/redsocks/redsocks-0.5.ebuild b/net-proxy/redsocks/redsocks-0.5.ebuild
index 1f61ade46a23..187dcecd68ad 100644
--- a/net-proxy/redsocks/redsocks-0.5.ebuild
+++ b/net-proxy/redsocks/redsocks-0.5.ebuild
@@ -32,7 +32,7 @@ pkg_setup() {
 }
 
 src_compile() {
-	CC="$(tc-getCC)" emake || die "emake failed"
+	CC="$(tc-getCC)" emake
 }
 
 src_install() {
diff --git a/net-proxy/redsocks/redsocks-9999.ebuild b/net-proxy/redsocks/redsocks-9999.ebuild
index 1f61ade46a23..187dcecd68ad 100644
--- a/net-proxy/redsocks/redsocks-9999.ebuild
+++ b/net-proxy/redsocks/redsocks-9999.ebuild
@@ -32,7 +32,7 @@ pkg_setup() {
 }
 
 src_compile() {
-	CC="$(tc-getCC)" emake || die "emake failed"
+	CC="$(tc-getCC)" emake
 }
 
 src_install() {
diff --git a/net-proxy/shadowsocks-libev/Manifest b/net-proxy/shadowsocks-libev/Manifest
index 109a35fdec23..358459bc6644 100644
--- a/net-proxy/shadowsocks-libev/Manifest
+++ b/net-proxy/shadowsocks-libev/Manifest
@@ -4,10 +4,8 @@ AUX shadowsocks-libev-server_at.service 247 BLAKE2B cce6eb70b580f3f0918755956249
 AUX shadowsocks-libev-tunnel_at.service 259 BLAKE2B 6881120dd27e057046aaa081811de85f64b8b57e02badce7f34984be008b86053eb3912a3e84be821b450c184700bc5d8c393970ee32c5288108fbb72953582d SHA512 d68d5d0f96ba8269d5ea93e8c429936de35929592e7716eb1752e5604bd46fc92e417a2e89d0fd5e4bcd195c0cd2ac7f501c6f43776459fc8d4447fc44821c32
 AUX shadowsocks.initd 1349 BLAKE2B ec1f4bd395803c6a23ff16c6040ecfe70eae2aa840f056ebf035898485cdfb84d9207bda49c1f4c5f3ee18c51b46b706fb73bd6b4d52b7cc1fecb1930ff72ad6 SHA512 1c3d09c8a949aa70896591f1f0bd59e9729c37d9888ef6afaf0e23ea1da50ee9a75a724d81e035a609ece390e6b723db9047f1524ff71de3d9b9267c00cb08c1
 AUX shadowsocks.json 132 BLAKE2B 84f0dbdf0a7eb5d1c8d8ca26147b5dde872a78b128357fa4d3d1348afdc4bd3bdd87f73c564d030e9cdc19a0e5fe2d414a5430f2daeddd03c0a24b761460596a SHA512 6bc5c406bdb25123fd43e21784028dd331f729bc56fe7ac4d31e3b1d81d12048a6906db3fd79765a64fc7f8b651095695fd8cdcc60f6d3285231e94a90611cef
-DIST shadowsocks-libev-3.3.1.tar.gz 281804 BLAKE2B b0091f0c0eba285d75d340e2449684e42689a44c4c93d71b32466a9f6f85130f0ecaaa1b880717e50d5b9d452d10f3fe0b87705b704be2896f450588d6cac48d SHA512 a2f5f257fb701f03cc24d1d86df0e41aa2589c95a0e694c3b7fe19af68fa9ad8c61de631320525338d5579a60c978bb0fb741a85a9606110ff1077cb9c655eba
 DIST shadowsocks-libev-3.3.2.tar.gz 279477 BLAKE2B 4f40bf3b122f3ccc7da040fdf0d643e2138530e1c5fb295e0bb10d027a2ff525d5ee42febb12ad8fc254d1457e399a9b43904d9c2c9079ca0955c49c3bf808d0 SHA512 2b997680ff46a6888326aea59b554acf81f391663129fe05b75e2bd1474c0c1738292bbab0b5dbbfc2a8228b17759101b1cd266d40b2e7bfdb5912bd3408b3e2
 DIST shadowsocks-libev-3.3.3.tar.gz 279655 BLAKE2B d2d229ae2b3223c987682b6ed3e87481dc2653cbaae0092a7502b7b740a671f805e241e8912a0dbb46741eae0d118acabfc3e08ecc678948d897ba4179e6359c SHA512 f02b43ee95b18b0a63fae1a1ad56b4d5e41cc79dc38cd9ad71c3830b7bb97a14110299f766b1e2cfbd6ce362f4c76c338693b1d8b558cf18b9c5e53a08fddd38
-EBUILD shadowsocks-libev-3.3.1.ebuild 2234 BLAKE2B 000c464ca58ffdcc13da4940bcc7fc9696b203c3eec9cc832497c4004ef34b63ecde9285a79472124a1b7222edd1f350e96af08336f8f99c789255095536d71c SHA512 f783afe841b842cdd62379eb529fe26b2b947b7623f829535ef995fdf966a08ced6f2fb53d84701ce82d44387275d4897561aaf5530045f9be8e00c05fc80386
 EBUILD shadowsocks-libev-3.3.2.ebuild 2234 BLAKE2B 000c464ca58ffdcc13da4940bcc7fc9696b203c3eec9cc832497c4004ef34b63ecde9285a79472124a1b7222edd1f350e96af08336f8f99c789255095536d71c SHA512 f783afe841b842cdd62379eb529fe26b2b947b7623f829535ef995fdf966a08ced6f2fb53d84701ce82d44387275d4897561aaf5530045f9be8e00c05fc80386
 EBUILD shadowsocks-libev-3.3.3.ebuild 2234 BLAKE2B 000c464ca58ffdcc13da4940bcc7fc9696b203c3eec9cc832497c4004ef34b63ecde9285a79472124a1b7222edd1f350e96af08336f8f99c789255095536d71c SHA512 f783afe841b842cdd62379eb529fe26b2b947b7623f829535ef995fdf966a08ced6f2fb53d84701ce82d44387275d4897561aaf5530045f9be8e00c05fc80386
 MISC metadata.xml 334 BLAKE2B 1217232e3b08c238795607fa0281c81feb34ed794005d1e5c1522b3380a9d1f3877ccf787ab88ee95a4cd4db85a11163395e4a3a449d4a862634e5a8cdfbe0e2 SHA512 a1e5349204ad41815cdf8772c760c0e1085749863c71d30fddfa8958d8c6d388575288da4dcd60acdaf00288b5a52a731aa21512a1c7ef9622fd0b2de162086f
diff --git a/net-proxy/shadowsocks-libev/shadowsocks-libev-3.3.1.ebuild b/net-proxy/shadowsocks-libev/shadowsocks-libev-3.3.1.ebuild
deleted file mode 100644
index b6510c91d684..000000000000
--- a/net-proxy/shadowsocks-libev/shadowsocks-libev-3.3.1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PV="v${PV}"
-inherit autotools eutils systemd
-
-DESCRIPTION="A lightweight secured SOCKS5 proxy for embedded devices and low end boxes"
-HOMEPAGE="https://github.com/shadowsocks/shadowsocks-libev"
-
-#repack with git submodule populated: libbloom, libcork, libipset
-#SRC_URI="https://dev.gentoo.org/~dlan/distfiles/${P}.tar.xz"
-
-SRC_URI="https://github.com/shadowsocks/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="debug doc"
-
-RDEPEND="net-libs/mbedtls:=
-	net-libs/libbloom
-	net-libs/libcork
-	net-libs/libcorkipset
-	>=dev-libs/libsodium-1.0.8:=
-	dev-libs/libev
-	net-dns/c-ares
-	dev-libs/libpcre
-	"
-DEPEND="${RDEPEND}
-	sys-kernel/linux-headers
-	doc? (
-		app-text/asciidoc
-		app-text/xmlto
-	)
-	"
-
-src_prepare() {
-	sed -i 's|AC_CONFIG_FILES(\[libbloom/Makefile libcork/Makefile libipset/Makefile\])||' \
-		configure.ac || die
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf="
-		$(use_enable debug assert)
-		--enable-system-shared-lib
-	"
-	use doc || myconf+="--disable-documentation"
-	econf ${myconf}
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -type f -delete || die
-
-	dodir "/etc/${PN}"
-	insinto "/etc/${PN}"
-	newins "${FILESDIR}/shadowsocks.json" shadowsocks.json
-
-	newinitd "${FILESDIR}/shadowsocks.initd" shadowsocks
-	dosym shadowsocks /etc/init.d/shadowsocks.server
-	dosym shadowsocks /etc/init.d/shadowsocks.client
-	dosym shadowsocks /etc/init.d/shadowsocks.redir
-	dosym shadowsocks /etc/init.d/shadowsocks.tunnel
-
-	dodoc -r acl
-
-	systemd_newunit "${FILESDIR}/${PN}-local_at.service" "${PN}-local@.service"
-	systemd_newunit "${FILESDIR}/${PN}-server_at.service" "${PN}-server@.service"
-	systemd_newunit "${FILESDIR}/${PN}-redir_at.service" "${PN}-redir@.service"
-	systemd_newunit "${FILESDIR}/${PN}-tunnel_at.service" "${PN}-tunnel@.service"
-}
-
-pkg_setup() {
-	elog "You need to choose the mode"
-	elog "  server: rc-update add shadowsocks.server default"
-	elog "  client: rc-update add shadowsocks.client default"
-	elog "  redir:  rc-update add shadowsocks.redir default"
-	elog "  tunnel: rc-update add shadowsocks.tunnel default"
-}
diff --git a/net-proxy/tinyproxy/Manifest b/net-proxy/tinyproxy/Manifest
index ef40627a73b9..6fd48a7f0853 100644
--- a/net-proxy/tinyproxy/Manifest
+++ b/net-proxy/tinyproxy/Manifest
@@ -3,5 +3,5 @@ AUX tinyproxy-1.10.0.service 181 BLAKE2B 1e5c14f607d0c54d215a6ffe5656bac288e48ca
 AUX tinyproxy.service 172 BLAKE2B d2e6199bfee2bac52e08d4c5506131f19e2630ebe1d9ed12f71d575cef37454c229e9e08b1fc89d9e26052a1192913289ed3602d69686d6894eb68b8639e7a5a SHA512 4c4cd36a7e34d9ee27c05475b72d1b61f90592ccb44c9deb96a1375bb681b7901702f078ed24b7c633074c83e450275a4a66829f3b270f75fc786a50d1ef393f
 AUX tinyproxy.tmpfiles.conf 48 BLAKE2B f2cd35878580eb198920f5db8493e3e266b4325160a9590a0b59bef1cf0577d0129bb636d99442cdb2154b444a8cdc1c6d01b4850b57df774be00338c61902e4 SHA512 24440cdaed0af6cbdb191acb1769e0a17871ef95e03e62a6621a413a2616e5d90d748d909bb5d18c029b25d7bf91485dbe46ee11e8703a1cb9008be470536715
 DIST tinyproxy-1.10.0.tar.xz 176060 BLAKE2B 58f9b443c731de6b74d689a80ebd422d3b6f51f643546ee144b37fb3262725246f6a5fa1015267a94f192f8715eaf71ffc078ead75e6225a210f58ec28ee8fcf SHA512 8d82598c5f9c89bc672f4632139ac52696d5c7788963de51688a8aeb576c69004f8338fe1e1897bf704a21dfd25ab1effb092003b6afaa9a88c2b5d0608310f5
-EBUILD tinyproxy-1.10.0-r1.ebuild 1660 BLAKE2B cc9e24eb152b981f3f3dfd37827c718adcf827f23d90adfbb1e6611d2066bac177deabecca03d9080527ab14e8b82b4e6ab6bd1e97c5f5deef104cea50a9e919 SHA512 0edd0392955f94edc895d8106c4d757e5668c925c7989ac81f01dd76e8df19875d4d09372210ec7d18cb8175f20fba2699a4d3cce2e7945e75baa50c178db72b
+EBUILD tinyproxy-1.10.0-r1.ebuild 1687 BLAKE2B 5c81060e0f008ff088d32110e0818d2aa902a7ab10562c395da85192cbfc71401368f39633e2758f5af24947cca8ba12977e19f31d6c33dfe7ed3e680104432b SHA512 8d069f306010ab669cb9737b118cd6636c58c3d4c0fe91d7ab26abbf9d31fd8a5015202cf1372e15801ebb55aab2459321d954989356adb3940cf483354af4e0
 MISC metadata.xml 627 BLAKE2B 3acd13c1d7a698ad83efa30c8471d5241533d66c09c103cda58c20d420d3bec2de5fcd42535d6b0b8197ae1d1aea445674e563177237ee20c348beeaf44aaf2d SHA512 96b439d626b40c45952059c1e3599a0e1743e50644c605e1519e685337a3eff806c73a8e1b3fd13920908d44eb256bc39657c9c76535a8806193581053e7a657
diff --git a/net-proxy/tinyproxy/tinyproxy-1.10.0-r1.ebuild b/net-proxy/tinyproxy/tinyproxy-1.10.0-r1.ebuild
index 3cf14c4a3097..dbd94cac9593 100644
--- a/net-proxy/tinyproxy/tinyproxy-1.10.0-r1.ebuild
+++ b/net-proxy/tinyproxy/tinyproxy-1.10.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,6 +15,7 @@ KEYWORDS="alpha amd64 ~arm ia64 ppc ~sparc x86"
 
 IUSE="test debug +filter-proxy reverse-proxy transparent-proxy
 +upstream-proxy +xtinyproxy-header"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="test? ( xtinyproxy-header )"
 
diff --git a/net-proxy/trojan/Manifest b/net-proxy/trojan/Manifest
index d7ab17a01bfb..2936d5dee0ee 100644
--- a/net-proxy/trojan/Manifest
+++ b/net-proxy/trojan/Manifest
@@ -1,6 +1,8 @@
 AUX trojan.initd 539 BLAKE2B 1dcca22a0647d109928570ab58780237a67bf5bd5952da6a0e68cc4b8d75348b392ea309beddda64e3f00619f3ce2744a29445794338c406b50b28cd44687fcd SHA512 d032f840d2e3dc0a9f3fe92d40aad3946a9c70217c673ecb89a9da8bf14fa9c4e764431534f63edf70d38fed293903aa8a298af474ddc8343e10d169855d81e6
 DIST trojan-1.10.0.tar.gz 38230 BLAKE2B 2cfa77ebfbae62edef983d1e57e3ce00a61118f6458cab353af60960e2586750fcd0c4237631481cfdfc8ed0ddad586e1d649046269c7e9177594869c187d8d1 SHA512 9d9a74218369f8094b292b8892e5f877ccec7d8912657491bb37da8e9ae4817f07a83fe401e33bbbdd2ac9c50c1440f3a021f93d85999b43df4849b0a04049cf
 DIST trojan-1.12.3.tar.gz 41786 BLAKE2B f6306210a46316906b919fefb245a7c379ddcf785513bfbc3b8fc6a9c78e1c8cf22069533f58086fb4ffad05b625ab2b2fcacf2256520833ea49c0f307cee296 SHA512 f59afa28446dfef8680d7530aaff3609566b2873416bb11f8981ef111f63ed8deeacb2093373012547ede02dfb9beb8d92655b8f9ebafd6012c45b3ce787c22f
+DIST trojan-1.13.0.tar.gz 44579 BLAKE2B 87aba58687fa5f42385893b8d919a46428b7d3cdbd2da38ee3e96900c11a6a3df7778c2a54295d5abb1964991d2d30433c4b37e70a9ca4ba184005d338bbed74 SHA512 5904ff75d348e9ccdd451836b1b05df6736e22530643d67a192e393fe32623576e0bbc106c883b6bc32daa2a086d5a7e42f836d684b66fc0deca019b14e3b3ab
 EBUILD trojan-1.10.0.ebuild 1024 BLAKE2B 37744644fa8f9e38d54cdc08cbaf6174676e7b6fdc8521c62b403048fc827c62eb2fe8b9f611195a55463626d69835641c2245ebabf645dcfea46e185f2de662 SHA512 306cb838df2d05604940c1c519865829e3eb65a78e87df80b248cf93eb8d4628a69f65460cdf5e8537ef9f2622cae960bbfd0b4c82491fe369e477959283a118
 EBUILD trojan-1.12.3.ebuild 1021 BLAKE2B 14122028ed5d2eaed5b8ceeb702119efffb1864a7b09f7db43501ca546c100dad1c666502ca159a371415d912f4352066c6a1a71acc249a2f68520fca63ae6dc SHA512 86108b7321ae1bb4bc5fed94196f463fbbaafa58cea4a4c5003d84aa5947b01d547d266b8e9496326ce3f6eb78f1197ae6329f774f21337723597b55e50721b6
+EBUILD trojan-1.13.0.ebuild 1051 BLAKE2B e8819727464ad71d189a1a00c5018bd47f359c2001a716416a75df343ce6159f54b9b782ee169a75e08af0b1e46cfe65ce70cea657fef99a5499345a9f2dffb9 SHA512 e44ccfa4df33fe4bb5feb469b6df79cacde8bd6fc1bcb7e60eb12eb4619230d7560bade30008ae3357dcd70e2b0063d990a551fdacebc4981c1d40761dc310b4
 MISC metadata.xml 1023 BLAKE2B cea392d59eea944198e523e0dfdab0325180568d9f3f39e40fc7c94c43a1c8b9811e787da5174f4f0b85d932778b34dcf4a07afccc4cf02972de57e7a3004ad4 SHA512 b1a1a6bdb8ea7d62bce25a439753c85e5e340be804ac8a71a3fbbd4f671270c174f9db77b72c2d00cdc1ede7cea6f7a86d2401e6cb8c8f9e395573c9216dfa4b
diff --git a/net-proxy/trojan/trojan-1.13.0.ebuild b/net-proxy/trojan/trojan-1.13.0.ebuild
new file mode 100644
index 000000000000..64ae38797920
--- /dev/null
+++ b/net-proxy/trojan/trojan-1.13.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+
+inherit cmake-utils python-any-r1 systemd
+
+DESCRIPTION="An unidentifiable mechanism that helps you bypass GFW"
+HOMEPAGE="https://github.com/trojan-gfw/trojan"
+SRC_URI="https://github.com/trojan-gfw/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="mysql test"
+
+# Some hiccups setting up local network server.
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-libs/boost-1.66.0:=
+	dev-libs/openssl:0=
+	mysql? ( dev-db/mysql-connector-c:= )
+"
+DEPEND="${RDEPEND}
+	test? ( net-misc/curl ${PYTHON_DEPS} )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_MYSQL=$(usex mysql)
+		-DSYSTEMD_SERVICE=ON
+		-DSYSTEMD_SERVICE_PATH=$(systemd_get_systemunitdir)
+		-DCMAKE_INSTALL_DOCDIR=share/doc/${PF}
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	newinitd "${FILESDIR}/trojan.initd" trojan
+}
+
+src_test() {
+	cmake-utils_src_test -j1
+}