gentoo resync : 22.01.2021

3 files changed, 5 insertions, 91 deletions

diff --git a/net-proxy/shadowsocks-libev/Manifest b/net-proxy/shadowsocks-libev/Manifest
index 760c3c73d1f3..06f777248acb 100644
--- a/net-proxy/shadowsocks-libev/Manifest
+++ b/net-proxy/shadowsocks-libev/Manifest
@@ -1,8 +1,6 @@
 AUX shadowsocks-libev-3.3.4-gcc10.patch 498 BLAKE2B 71bf107f6f285dbfe635475ddc8f2505624a90b22cd9b162a14a7138f3977563749fc2b3c5a1e189bd3a66bdbabdd62ea3d1c14c75d5c3f0f0ea38fe5ed7d9a7 SHA512 a5fd48927aec46d998227035a55cbcc706c305c0b9d00a4916e44c10d30f2783cb5e1d644ee1861f484b5dae60486783efa38ee9475af9ee42c57b0868ee6d66
 AUX shadowsocks.initd 1413 BLAKE2B 0a60cc154df3c26326d684fd3a9dbcc7beae50e2a8cb290e4caff013a338ef4fcf493be4be010573750f56c4bd9f339f3f0a98a506480fa2928dc6cb7e67ef8e SHA512 8edf2b09ee8fb48e2236447c640342132a188313956f10df73535c740934d5a610e2fd1b618b6822802d4fc7f3244933242434a0966ec2b4f8e3c4132caa3d43
 AUX shadowsocks.json 132 BLAKE2B 84f0dbdf0a7eb5d1c8d8ca26147b5dde872a78b128357fa4d3d1348afdc4bd3bdd87f73c564d030e9cdc19a0e5fe2d414a5430f2daeddd03c0a24b761460596a SHA512 6bc5c406bdb25123fd43e21784028dd331f729bc56fe7ac4d31e3b1d81d12048a6906db3fd79765a64fc7f8b651095695fd8cdcc60f6d3285231e94a90611cef
-DIST shadowsocks-libev-3.3.4.tar.gz 279666 BLAKE2B ea698a3cf29ed0b1268d17e25a492712cb90f515068de2f74d200ab04bb0d5ca859ea1d7f071714cc1c8dced0e566df4bfea0d780e24c9398f93ab1e362ec466 SHA512 4fb9e4a62f86f1504aab71022b5078a1f97b1f14da82c7b456dc9eaed23be990430769f37b7c2855c266be40ec215237bb0a40d254dffac8556ec4719cc9aa6d
 DIST shadowsocks-libev-3.3.5.tar.gz 303368 BLAKE2B bb7d6e64596710402db94085044c20315028395723828fa82dfba419bc41a0c740ece1f79c6cf05dda395d9442d553429f66d7f7b2de3cdd188d5b6adb0b8edf SHA512 c0cc869b4b7661ebd348bd5559c6a17c44b66a5f42374d97023adcfb525d934da3ed96245ff792ebc74870d30dd8f71fadcd89c79b2cd8a98d551ff7592508d0
-EBUILD shadowsocks-libev-3.3.4-r1.ebuild 2113 BLAKE2B ea3ceed1ffafba1200a5327998d95b9ad780564aba4d6370a9911aa09a22e8a4a12fff9f703dadb42d85d5b1d16c8b867198d975f9e0ab6b2cd63928c36a11b0 SHA512 69599842475134f0921fd40eb873d1c87ce731fd5c8d0ef98e63ee6e3ed2e6fe119af029d46f229ed381875619e00a106b30a14688f64f8cde65fec06c2a9eb4
-EBUILD shadowsocks-libev-3.3.5.ebuild 1989 BLAKE2B bd3f5c9965126c7216b3cf2b225415ccf70e626f1503e6e97e94a63eaf6589c9b0bf781ffa68b559b9cee92e7859dc818e7f470ea1d27616d7841baadbd5c78d SHA512 81c2e55f5c2b04f60f3e94d3150651b0ac3a26e80dad7f56c626b056496ea53a07243a9d4e2d994ab2f5a5e6371921090bf91b01f9450f156e1bf57423f8d25b
+EBUILD shadowsocks-libev-3.3.5.ebuild 2056 BLAKE2B 120043f257221ed6a7776ef7f799f9fed9c2f543fe1aa19532736ac3b8502d89a2d5e22d0f9d10dd05bcaddf31f18e6854048c2a9f0f085cee3e6dc5452fb372 SHA512 6301b2d18a000a393301480e8b70641c84847229cb7d45ec5db227554751a1111044d7de2d998e9aabef9f2969d7e5bd2ec2913f851eb2858bcf2aea17f7f316
 MISC metadata.xml 334 BLAKE2B 1217232e3b08c238795607fa0281c81feb34ed794005d1e5c1522b3380a9d1f3877ccf787ab88ee95a4cd4db85a11163395e4a3a449d4a862634e5a8cdfbe0e2 SHA512 a1e5349204ad41815cdf8772c760c0e1085749863c71d30fddfa8958d8c6d388575288da4dcd60acdaf00288b5a52a731aa21512a1c7ef9622fd0b2de162086f
diff --git a/net-proxy/shadowsocks-libev/shadowsocks-libev-3.3.4-r1.ebuild b/net-proxy/shadowsocks-libev/shadowsocks-libev-3.3.4-r1.ebuild
deleted file mode 100644
index e10f0e72b1ac..000000000000
--- a/net-proxy/shadowsocks-libev/shadowsocks-libev-3.3.4-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2020 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
-	)
-	"
-
-PATCHES=(
-	"${FILESDIR}/${P}-gcc10.patch"
-)
-src_prepare() {
-	sed -i -e 's|AC_CONFIG_FILES(\[libbloom/Makefile libcork/Makefile libipset/Makefile\])||' \
-		configure.ac || die
-	sed -i -e "/\[Service\]/a\\User=nobody" \
-		debian/shadowsocks-libev*.service || 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
-
-	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
-
-	for i in debian/${PN}*.service; do
-		systemd_newunit $i $(basename $i)
-	done
-}
-
-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.5.ebuild b/net-proxy/shadowsocks-libev/shadowsocks-libev-3.3.5.ebuild
index 5349e2ab8407..4829df5517b7 100644
--- a/net-proxy/shadowsocks-libev/shadowsocks-libev-3.3.5.ebuild
+++ b/net-proxy/shadowsocks-libev/shadowsocks-libev-3.3.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -39,6 +39,9 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	sed -i -e 's|AC_CONFIG_FILES(\[libbloom/Makefile libcork/Makefile libipset/Makefile\])||' \
 		configure.ac || die
+	sed -i -e 's|-Werror||g' \
+		configure.ac src/Makefile.am || die
+
 	default
 	eautoreconf
 }