gentoo resync : 17.02.2020

4 files changed, 1 insertions, 174 deletions

diff --git a/net-proxy/shadowsocks-libev/Manifest b/net-proxy/shadowsocks-libev/Manifest
index 06fda0b535f3..7cd148d5e5c9 100644
--- a/net-proxy/shadowsocks-libev/Manifest
+++ b/net-proxy/shadowsocks-libev/Manifest
@@ -4,10 +4,6 @@ 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.2.tar.gz 279477 BLAKE2B 4f40bf3b122f3ccc7da040fdf0d643e2138530e1c5fb295e0bb10d027a2ff525d5ee42febb12ad8fc254d1457e399a9b43904d9c2c9079ca0955c49c3bf808d0 SHA512 2b997680ff46a6888326aea59b554acf81f391663129fe05b75e2bd1474c0c1738292bbab0b5dbbfc2a8228b17759101b1cd266d40b2e7bfdb5912bd3408b3e2
-DIST shadowsocks-libev-3.3.3.tar.gz 279655 BLAKE2B d2d229ae2b3223c987682b6ed3e87481dc2653cbaae0092a7502b7b740a671f805e241e8912a0dbb46741eae0d118acabfc3e08ecc678948d897ba4179e6359c SHA512 f02b43ee95b18b0a63fae1a1ad56b4d5e41cc79dc38cd9ad71c3830b7bb97a14110299f766b1e2cfbd6ce362f4c76c338693b1d8b558cf18b9c5e53a08fddd38
 DIST shadowsocks-libev-3.3.4.tar.gz 279666 BLAKE2B ea698a3cf29ed0b1268d17e25a492712cb90f515068de2f74d200ab04bb0d5ca859ea1d7f071714cc1c8dced0e566df4bfea0d780e24c9398f93ab1e362ec466 SHA512 4fb9e4a62f86f1504aab71022b5078a1f97b1f14da82c7b456dc9eaed23be990430769f37b7c2855c266be40ec215237bb0a40d254dffac8556ec4719cc9aa6d
-EBUILD shadowsocks-libev-3.3.2.ebuild 2234 BLAKE2B 000c464ca58ffdcc13da4940bcc7fc9696b203c3eec9cc832497c4004ef34b63ecde9285a79472124a1b7222edd1f350e96af08336f8f99c789255095536d71c SHA512 f783afe841b842cdd62379eb529fe26b2b947b7623f829535ef995fdf966a08ced6f2fb53d84701ce82d44387275d4897561aaf5530045f9be8e00c05fc80386
-EBUILD shadowsocks-libev-3.3.3.ebuild 2234 BLAKE2B 000c464ca58ffdcc13da4940bcc7fc9696b203c3eec9cc832497c4004ef34b63ecde9285a79472124a1b7222edd1f350e96af08336f8f99c789255095536d71c SHA512 f783afe841b842cdd62379eb529fe26b2b947b7623f829535ef995fdf966a08ced6f2fb53d84701ce82d44387275d4897561aaf5530045f9be8e00c05fc80386
-EBUILD shadowsocks-libev-3.3.4.ebuild 2234 BLAKE2B 8426b1ca82cd215f3df3828b9bd2f06cbdc63db6691aa931e50c40078841ec2c49641eda1d67467614aeab6ef81002a50efe4ac747f41397005259836c8a37bd SHA512 81145f92c80bdeed68871241d695f7376752469e9fd935cb59c216935801b1246988aac868f98631ddf01617c7a4e664c77e8e6f98a8de22ed2f90ca2c565c64
+EBUILD shadowsocks-libev-3.3.4.ebuild 2214 BLAKE2B a0691e2ef26525c02fe7abb03e0872d677fe0d7a2a5c321cad471b3bd5bbb9253b18d5711cbf1ffbe19df7f6d1ba2ed5c3c416363ba45f6dbfcb95940722dc7d SHA512 fd60939745e47a834ec5289e9bf873d6f3b8c6b89cc3d5585f9daa2ff66e33fe77905781d46ce0b37c97a14685f513a3d1c2fa897526cf55941cf6a243fca416
 MISC metadata.xml 334 BLAKE2B 1217232e3b08c238795607fa0281c81feb34ed794005d1e5c1522b3380a9d1f3877ccf787ab88ee95a4cd4db85a11163395e4a3a449d4a862634e5a8cdfbe0e2 SHA512 a1e5349204ad41815cdf8772c760c0e1085749863c71d30fddfa8958d8c6d388575288da4dcd60acdaf00288b5a52a731aa21512a1c7ef9622fd0b2de162086f
diff --git a/net-proxy/shadowsocks-libev/shadowsocks-libev-3.3.2.ebuild b/net-proxy/shadowsocks-libev/shadowsocks-libev-3.3.2.ebuild
deleted file mode 100644
index b6510c91d684..000000000000
--- a/net-proxy/shadowsocks-libev/shadowsocks-libev-3.3.2.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/shadowsocks-libev/shadowsocks-libev-3.3.3.ebuild b/net-proxy/shadowsocks-libev/shadowsocks-libev-3.3.3.ebuild
deleted file mode 100644
index b6510c91d684..000000000000
--- a/net-proxy/shadowsocks-libev/shadowsocks-libev-3.3.3.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/shadowsocks-libev/shadowsocks-libev-3.3.4.ebuild b/net-proxy/shadowsocks-libev/shadowsocks-libev-3.3.4.ebuild
index 7972f8f95872..be40495a1c07 100644
--- a/net-proxy/shadowsocks-libev/shadowsocks-libev-3.3.4.ebuild
+++ b/net-proxy/shadowsocks-libev/shadowsocks-libev-3.3.4.ebuild
@@ -57,7 +57,6 @@ src_install() {
 
 	find "${D}" -name '*.la' -type f -delete || die
 
-	dodir "/etc/${PN}"
 	insinto "/etc/${PN}"
 	newins "${FILESDIR}/shadowsocks.json" shadowsocks.json