gentoo resync : 03.11.2019

3 files changed, 2 insertions, 88 deletions

diff --git a/net-proxy/shadowsocks-libev/Manifest b/net-proxy/shadowsocks-libev/Manifest
index 5c30e3a941a5..88c1f22be938 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.2.5.tar.gz 278138 BLAKE2B 874471f134371d274ce274c096286dfe8a755e5423624df80df70321f017d9344516fd38f82df43033870588664dc626595157ab6c5022c9953bd9ce59dee2b8 SHA512 b4ca9f7c303c85a5bba9bf5d7a093c6dfde7a147d0335b449d4ee213cd3b9004c5220a099dcc78464a35c55f9cfe280d817daf934e2fda100f5e784f70091c0b
-DIST shadowsocks-libev-3.3.0.tar.gz 278818 BLAKE2B e2f00082d6fe697560dc282f31ed98368390e750a7be33fd3230f4d4635b4aa8a8ace3bd82da8000defee468ae167c2b4fa1e836e79580deeeff3a53dc7b793c SHA512 7c93bddef07af9e79a7c6757a89f301000a6137e0951ee622c66c2e8d3aa70e157cfdf7798a718074f956f7c22dde0af1073781cf0b36d7e185dfd45a87f354b
 DIST shadowsocks-libev-3.3.1.tar.gz 281804 BLAKE2B b0091f0c0eba285d75d340e2449684e42689a44c4c93d71b32466a9f6f85130f0ecaaa1b880717e50d5b9d452d10f3fe0b87705b704be2896f450588d6cac48d SHA512 a2f5f257fb701f03cc24d1d86df0e41aa2589c95a0e694c3b7fe19af68fa9ad8c61de631320525338d5579a60c978bb0fb741a85a9606110ff1077cb9c655eba
-EBUILD shadowsocks-libev-3.2.5.ebuild 2222 BLAKE2B 7bc54c6a01331d76f786df11b1df9dec7eb14eec1a8f8f2c499885a54686f934b70c6ab04127c71eadfa47a17ea7a496012bdda9d7ff1d97bce68749dc16a534 SHA512 9d0b697bc6b415c8a56c6e41cc4e6c8825fbd8609040c78cecebd8c23b83046ae8820b9131744d20eafb31092f9399ec14098c842d36d8ec34d52dccac67aba9
-EBUILD shadowsocks-libev-3.3.0.ebuild 2234 BLAKE2B 000c464ca58ffdcc13da4940bcc7fc9696b203c3eec9cc832497c4004ef34b63ecde9285a79472124a1b7222edd1f350e96af08336f8f99c789255095536d71c SHA512 f783afe841b842cdd62379eb529fe26b2b947b7623f829535ef995fdf966a08ced6f2fb53d84701ce82d44387275d4897561aaf5530045f9be8e00c05fc80386
+DIST shadowsocks-libev-3.3.2.tar.gz 279477 BLAKE2B 4f40bf3b122f3ccc7da040fdf0d643e2138530e1c5fb295e0bb10d027a2ff525d5ee42febb12ad8fc254d1457e399a9b43904d9c2c9079ca0955c49c3bf808d0 SHA512 2b997680ff46a6888326aea59b554acf81f391663129fe05b75e2bd1474c0c1738292bbab0b5dbbfc2a8228b17759101b1cd266d40b2e7bfdb5912bd3408b3e2
 EBUILD shadowsocks-libev-3.3.1.ebuild 2234 BLAKE2B 000c464ca58ffdcc13da4940bcc7fc9696b203c3eec9cc832497c4004ef34b63ecde9285a79472124a1b7222edd1f350e96af08336f8f99c789255095536d71c SHA512 f783afe841b842cdd62379eb529fe26b2b947b7623f829535ef995fdf966a08ced6f2fb53d84701ce82d44387275d4897561aaf5530045f9be8e00c05fc80386
+EBUILD shadowsocks-libev-3.3.2.ebuild 2234 BLAKE2B 000c464ca58ffdcc13da4940bcc7fc9696b203c3eec9cc832497c4004ef34b63ecde9285a79472124a1b7222edd1f350e96af08336f8f99c789255095536d71c SHA512 f783afe841b842cdd62379eb529fe26b2b947b7623f829535ef995fdf966a08ced6f2fb53d84701ce82d44387275d4897561aaf5530045f9be8e00c05fc80386
 MISC metadata.xml 334 BLAKE2B 1217232e3b08c238795607fa0281c81feb34ed794005d1e5c1522b3380a9d1f3877ccf787ab88ee95a4cd4db85a11163395e4a3a449d4a862634e5a8cdfbe0e2 SHA512 a1e5349204ad41815cdf8772c760c0e1085749863c71d30fddfa8958d8c6d388575288da4dcd60acdaf00288b5a52a731aa21512a1c7ef9622fd0b2de162086f
diff --git a/net-proxy/shadowsocks-libev/shadowsocks-libev-3.2.5.ebuild b/net-proxy/shadowsocks-libev/shadowsocks-libev-3.2.5.ebuild
deleted file mode 100644
index 65c0bfdfa56d..000000000000
--- a/net-proxy/shadowsocks-libev/shadowsocks-libev-3.2.5.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 ~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/shadowsocks-libev/shadowsocks-libev-3.3.0.ebuild b/net-proxy/shadowsocks-libev/shadowsocks-libev-3.3.2.ebuild
index b6510c91d684..b6510c91d684 100644
--- a/net-proxy/shadowsocks-libev/shadowsocks-libev-3.3.0.ebuild
+++ b/net-proxy/shadowsocks-libev/shadowsocks-libev-3.3.2.ebuild