gentoo resync : 18.11.2019

10 files changed, 95 insertions, 12 deletions

diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index d68b6c30ec44..21bc23f83a25 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/mitmproxy/Manifest b/net-proxy/mitmproxy/Manifest
index a47830fe3e52..29d020cbf000 100644
--- a/net-proxy/mitmproxy/Manifest
+++ b/net-proxy/mitmproxy/Manifest
@@ -1,3 +1,3 @@
 DIST mitmproxy-4.0.4.tar.gz 27131713 BLAKE2B 2748b0f3b66e1f5840aae792a1b4cd8ef8efa3673fa24bc0c3e15474b36d68c0f6b2203cf629b6444545b8c6223752232b2ce8526290fe5d74916946e8917a03 SHA512 e08ea8b1c75a95b822c463625509037bbc8a979161cacaa1f0185f98df8d6d7e5400925365dbbe70d18751251b1005824f739a8cd035c0389f7b4aea562adfb3
-EBUILD mitmproxy-4.0.4.ebuild 2522 BLAKE2B b6287fe9c18f33b8725944b01040800dae79ba8a81d5672e9056cb4aaf66445a96a86f1afb3fb417a4e215472a9e2a19ce8045768893353cec38ee267854e557 SHA512 63aaa26d6b3ab206b4dcc2281d69bcc17d06a7e9838c6a74c554a41142cd4ee3123e8419fa7919b075bd5a72a69ede2bf3c6ab4b32b5d6c8f7562087f87367ac
-MISC metadata.xml 318 BLAKE2B f422f86b4b441eca44aba5cbb5b26f619d779d04a9b0196c7308b38094cf7a1f71fa542dc66c431ff24922e510b30a9ca5c32dff68530f1bdbb3e64a4ebf6178 SHA512 8f7a5435cf5b7219e6f4827289dcbfb9ff4d4e5e1f70aa9694934276e9e4aa0d84a8a052c022eaa4358528b7869504037fd371d037d4e447d0d6c6536f46815f
+EBUILD mitmproxy-4.0.4.ebuild 2550 BLAKE2B e2cb3a6e0b8704f23101c6138423d9b3610f6ebe9b41c82ee9f27cfdcc7c50ad140800ae795b7377cf63ab610874a8572c225b1431746a009c53d4b00053a354 SHA512 de62cf136268d834b84f0b21a206666d2f4cdb26ea856df22304f4bb21bc42420eb9785f4dcede78a8b6bc97162788af863d1ac94e478bf52b6f3eb6fcee79c8
+MISC metadata.xml 239 BLAKE2B 9ce254c9d79c1823be126f0737ead27524b2690a447914d59f3cad0ec3c549b2020fd9b31e50f67054b819c2264791cec5befd5602be80b4c0b0cb86b50d615d SHA512 70f4cee52fc1b316d727f8d0a423b718e78fb5b6d78ec321fc2aea5ba5dc5b08cc0142846a6d4b1cbe478f5a6322254222b08843a72e0307ecfd053cdb801c03
diff --git a/net-proxy/mitmproxy/metadata.xml b/net-proxy/mitmproxy/metadata.xml
index 01809bf53a6f..c7003e858b46 100644
--- a/net-proxy/mitmproxy/metadata.xml
+++ b/net-proxy/mitmproxy/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>radhermit@gentoo.org</email>
-		<name>Tim Harder</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="pypi">mitmproxy</remote-id>
 	</upstream>
diff --git a/net-proxy/mitmproxy/mitmproxy-4.0.4.ebuild b/net-proxy/mitmproxy/mitmproxy-4.0.4.ebuild
index eae990245b34..34ecccf7049a 100644
--- a/net-proxy/mitmproxy/mitmproxy-4.0.4.ebuild
+++ b/net-proxy/mitmproxy/mitmproxy-4.0.4.ebuild
@@ -48,6 +48,8 @@ DEPEND="${RDEPEND}
 		>=dev-python/requests-2.9.1[${PYTHON_USEDEP}]
 	)"
 
+RESTRICT="!test? ( test )"
+
 python_prepare_all() {
 	# loosen dependencies
 	sed -i '/>/s/>.*/",/g' setup.py || die
diff --git a/net-proxy/shadowsocks-libev/Manifest b/net-proxy/shadowsocks-libev/Manifest
index 88c1f22be938..109a35fdec23 100644
--- a/net-proxy/shadowsocks-libev/Manifest
+++ b/net-proxy/shadowsocks-libev/Manifest
@@ -6,6 +6,8 @@ AUX shadowsocks.initd 1349 BLAKE2B ec1f4bd395803c6a23ff16c6040ecfe70eae2aa840f05
 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.3.ebuild b/net-proxy/shadowsocks-libev/shadowsocks-libev-3.3.3.ebuild
new file mode 100644
index 000000000000..b6510c91d684
--- /dev/null
+++ b/net-proxy/shadowsocks-libev/shadowsocks-libev-3.3.3.ebuild
@@ -0,0 +1,84 @@
+# 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/squid/Manifest b/net-proxy/squid/Manifest
index ebbeba79b7dc..5bf813b812b4 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -5,5 +5,5 @@ AUX squid.initd-r5 4339 BLAKE2B 3529ddaab2e708215e6674514ce8e20e9d28d26e45860e19
 AUX squid.logrotate 103 BLAKE2B f6d190d1914b76b08d90a2c3b3b07ff9cd332cdb2e595f4849537d1f1d32d8be1386fcdfffb40d073bcdd715a62c1c44727f1e10b75cfaff69c0d042c2a7e904 SHA512 d75a667c3ffa32fdd938ef40df8813a467d9f10b2363107bf915cb0c99834fbe8d0eb502a18a816875b67b0db1b27806ed3caf620c38516040cb644b225f5a55
 AUX squid.pam 209 BLAKE2B 113fa119ce4fd96ddf34b95c1a1ca958b34aea405564076f89abdbb8d4c6a0248ec9fa1a0f5f1d6136643c9abc4c5f67e8ef75305414b374763e2055272950d5 SHA512 5501e3d9319aea99f0deed98748366d4dfbeccdde96d842474fe144a4584394d8f5563372cd7b2437a389378c49b61b646403cca1be4362c888750d027b2f594
 DIST squid-4.9.tar.xz 2444664 BLAKE2B ac9006519773809034176cf350f31400ddc02e03aaa67df725fc9f59245337a319526463b3f96916f7d6544b99bd623b0969c8b1787b50ee142dc2fe38bb5b75 SHA512 ca3db39379ea0582ff28297dde21899d02916ea499fb9c0f86aa60301829b7c601bb21ee274f841555047bc911e878717b38670b8796e5d717862b7a285ef84f
-EBUILD squid-4.9.ebuild 8169 BLAKE2B 9e86cb6c64554a1d85c28aa1e94a1f0039bd877de2619a4bc3c84d7043888aca067d2bf91d51c3666744c85c38c5299e437c51ec04c5e449828d31dadc1301ab SHA512 f081e1fa8dc53e92bf950f08d9a2153cd9d9d0dd59f6bd85eb3494b0de01882568536cca3f18fc9a086662f36adbd81f9fdec9d3bd47d59143f17fd171212e83
+EBUILD squid-4.9.ebuild 8196 BLAKE2B beba81429d9afe62ca61f2107101c52308b50a66d4103b885cb1dcd948e71408c92c903cc91cb9a070f81ae6a7ce2be795d8e3d283be72714dc5b5d1ee953462 SHA512 62061b6c6a82f7a919ec6e7c35c9972fc35ce964b94799958670437140c4cb82881565c718d58668b0c0fd59a1e30f21f6daeea7856ba2b926554541ee788e71
 MISC metadata.xml 1541 BLAKE2B c04b0900be1711860ab53658c9ed7f3200da64fcd8f866a54d3a02c4576b5942afad4d8666eb950e19426beead7a40f5f03e04bca734cf9b5fedf4633f16087e SHA512 fb81b62b425f571f8f01f505f3b9d69186358180c1fcca80c61ad8e7b3d0397250292e9ea3bfa8bb1a93a9ade3293abdd7bb19ef6485df6244e016e21a3b56d5
diff --git a/net-proxy/squid/squid-4.9.ebuild b/net-proxy/squid/squid-4.9.ebuild
index 13ae8021485b..592adc2477e6 100644
--- a/net-proxy/squid/squid-4.9.ebuild
+++ b/net-proxy/squid/squid-4.9.ebuild
@@ -30,6 +30,7 @@ IUSE="caps gnutls ipv6 pam ldap libressl samba sasl kerberos nis radius ssl snmp
 	+htcp +wccp +wccpv2 \
 	pf-transparent ipf-transparent kqueue \
 	elibc_uclibc kernel_linux"
+RESTRICT="!test? ( test )"
 
 BDEPEND="dev-lang/perl"
 
diff --git a/net-proxy/sshuttle/Manifest b/net-proxy/sshuttle/Manifest
index 375d3b0abea6..8557e8826ec1 100644
--- a/net-proxy/sshuttle/Manifest
+++ b/net-proxy/sshuttle/Manifest
@@ -1,3 +1,3 @@
 DIST sshuttle-0.78.5.tar.gz 74663 BLAKE2B 47e295219c1ada7bee4f0340cc169620c5b91abd1f72b933289ef2dea0c5ba088673f2d1348d444f662e9f6c2638ee6dfd3e8df1fa8344bc7c48adf1a3a96d3f SHA512 562acbf0e825ad41458c5b6065592a45b8bac92cd64b20619027fe4d0bec60a22c5191c7a7ed6b216d8cf5c9e027f58a6cdca69dd3a11ec6f6d348ef2f13bb38
 EBUILD sshuttle-0.78.5.ebuild 1384 BLAKE2B b222ec4ce73d82f9141c8d090c07c18d1df8d4ec5caba612ec447bf8b9c0f13cdf0ccd3d3084498b7fdd451bf14d93f12fb8929054a65e4a02a776f84bcd73c1 SHA512 27c97210e8c1bbd70a891b008f30f37f0ff35d86c65c8c2b06475b01cfe65c557de68e96b9b8d480d9ae8915decc28ea581ca36d893c7fef4c6912852c9c90e8
-MISC metadata.xml 386 BLAKE2B 5a94094f59d57f94569067c3ef424b46cec97b8c6f552422ca4b5baa910f9b5f547215c49647f8e2b4ab7f008abc57e4fc407f38f8fab252d17dfb072993a496 SHA512 988f65a4a15eac0630b83d0e090749c12ef58ca1284ed94f45f6eb9c4a5ff0678a481519f435a992f572b98a8878fbfeb7bf573443c128cd29e5c365a8eb2e32
+MISC metadata.xml 302 BLAKE2B aaef94f4b028c3f346523d5bbd42876e24fa82ab119c03a3db5c1ca40237efdbec97377b27584d3c307491a1c542d1194ac066a8c532cfbdf1ff9a9c1d06a6d3 SHA512 7e81df3d00fdf3c231e968d844a693c3d90e6e64c73f90b93d437331a2dafbc5d4f48bcb46596f9efb36ecb2c1d16ef2e37f50bdf8fa8e41e3a0ae3e3eff3985
diff --git a/net-proxy/sshuttle/metadata.xml b/net-proxy/sshuttle/metadata.xml
index 6956e63728ab..7597a9dccda3 100644
--- a/net-proxy/sshuttle/metadata.xml
+++ b/net-proxy/sshuttle/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>radhermit@gentoo.org</email>
-    <name>Tim Harder</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="pypi">sshuttle</remote-id>
     <remote-id type="github">sshuttle/sshuttle</remote-id>