gentoo resync : 02.03.2018

6 files changed, 20 insertions, 172 deletions

diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index 9c238bdd80a5..2f936aa76b99 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/shadowsocks-libev/Manifest b/net-proxy/shadowsocks-libev/Manifest
index e6a57d45d568..f6b77f14a6ae 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 1352 BLAKE2B 073135c9a0f56891e391fc357a4084069863976a780f3676041b7649b13a285778e1ea4a4893ca7ec3a238770392b9fa71fd68afbd2f50a8c7bda18fc8193df3 SHA512 12b901ff23b445744e485e59a18c0c1ac63c6785038dff75d4c47c91a644185abe56b0256acdcd5015d3dc2af87fb254c9e4ad3846763f7430db44138c05cfc1
 AUX shadowsocks.json 132 BLAKE2B 84f0dbdf0a7eb5d1c8d8ca26147b5dde872a78b128357fa4d3d1348afdc4bd3bdd87f73c564d030e9cdc19a0e5fe2d414a5430f2daeddd03c0a24b761460596a SHA512 6bc5c406bdb25123fd43e21784028dd331f729bc56fe7ac4d31e3b1d81d12048a6906db3fd79765a64fc7f8b651095695fd8cdcc60f6d3285231e94a90611cef
-DIST shadowsocks-libev-2.5.6.tar.gz 1552674 BLAKE2B 62505f27ebe94d007fcddd5b97b03483317d942b07ee127f1693d6c8f735a1d89fbe8d19b8ceb39cb6b2bb50bd257c68f2e39f068afed0e1a33056ad6230e1c5 SHA512 577d8a6af9eac0aa5fe419cdf7d8be7396d654cec32b274d0db756480c340b3b61500c3b60e48aa82537b57a6a8c13dc00781790691897b139e0e7cc60161fb7
-DIST shadowsocks-libev-2.6.2.tar.gz 1566835 BLAKE2B 85a2e5ca95e1e269055bf46de5691538e061332814ec990c204fc0e86ada51a6dd3914e97a30dcbe3617a48c9e8cc7a98201c6e3e467d001bb2405299d3d6dea SHA512 29093b25a24d64e01877d1d9ac7d4b2966c4f9934b58a8fca45235248c3b1fb625faf083f28089a03122c2f8d1a20a59d7608ff0487c684e36cadf2f736cddfd
-DIST shadowsocks-libev-3.0.6.tar.xz 1512740 BLAKE2B 40da0827122da0563c6b3d3b25cf7d384989a0b8fd53743cfcd3d877c89f80da2b994a3395d19148e8f04fd7135d62999236e4c22e1c1f96d297db88f403c29f SHA512 439080b70541e828db8a60092794d8c8cfcc2ed19468f943f3c0ccd63a2ed1581d1278450ca2964f35adad3ed889f466ef55ff293e86b9a17b84fc6551ffaa8c
-EBUILD shadowsocks-libev-2.5.6.ebuild 2110 BLAKE2B 0c719bb90bcb7d5b90f2f3a8c17eab9326b5a1300c25d00fee889df541a7c5476f682f741ab4dcddfc55b75f4e3d0f6cc608811ad4bb0f3d99b40d0f5e90ae65 SHA512 67cbee9fff5e617deb1ead4a65e4d6814ca2493dff9b49f70b8e88fba85dddc0ce2c5e55651876a06ccb8819c11063a2d2065818e4c4965f60aee4dbe2d35fb7
-EBUILD shadowsocks-libev-2.6.2.ebuild 2110 BLAKE2B b3b3f2d438dfeb50e71720a7097daab0e912b7d1f724c40d92416bfa3579442e2f04b0355c2bcdee3cc6c1fa3d143b4bfee9fcf40a8494d3ad7b73c14e9950d9 SHA512 15f335a2c8ed7de3213388031903f96a565b40440ca43c338382673230a87c19637c332801d430387ac75cb6b03f08e5adc86a2c768b5d9332f02f6319cafd66
-EBUILD shadowsocks-libev-3.0.6.ebuild 1945 BLAKE2B 4393b6c36604a82a480ce4606123b36ad2dd38e3e79fc2b36a117c89d1b1bb666c60416f6dd29de098a54b12c97355c4c44a4b74f85dc79aa0d989b6da783875 SHA512 94899a6a4acb1471b2bd920fe86d0cb275eb69aa5878accf7a95f0f9e1fa52db5fe67518157ee60e3dfa6807584e05a66729a5d511cf599fff6679c6caa16830
-MISC metadata.xml 622 BLAKE2B fa547e21ce3b156a691b899356a9de0643934e6405f3ee57bdfcd4efa93c626e75182b21cf1c3e620ca72d5f244b72a94a0d05d15f405189ffd0edfa1f466fdf SHA512 caf36c6be998243ae50957c561cd62485d5316f776ad2dfde3d4e9df922d602c0bc1c4c99279139f3e590a0ce447a14e7e361280f5c4c9e3530622a7b45ebffd
+DIST shadowsocks-libev-3.1.3.tar.gz 265286 BLAKE2B 4809d2d441b28e70a35940e23d84b2914e9a7c2f24b2f80e4295df7a26bda6e4626657505e97226cc759f71cac54caec7813d9f295e22aa599dbebd704268a7b SHA512 a262315cf04c325b5b659f07fd751f2f7b651feed5e2ac7290c1b3ce91fe5bd7efa7ff834f82f3fb00d5551cba8277f8668cdefbfe35279d7835089cbcced55f
+EBUILD shadowsocks-libev-3.1.3.ebuild 2197 BLAKE2B dfadcbf746dc6dd983d0a989d2c13ad6019bbbfb28afb9561db7f3a7fde82d52de2230139faef729fb8b328a0bd0c7d6e75890c388f4aef70833eb920e4d953f SHA512 452652b55675df79386d9834fe517e127b271213872f9b9a80d1efbe9aeece1dd988dd5c4be1f2160d7f15d61086cd327c8e7ec45da8175dd6ad921525f51a10
+MISC metadata.xml 334 BLAKE2B 1217232e3b08c238795607fa0281c81feb34ed794005d1e5c1522b3380a9d1f3877ccf787ab88ee95a4cd4db85a11163395e4a3a449d4a862634e5a8cdfbe0e2 SHA512 a1e5349204ad41815cdf8772c760c0e1085749863c71d30fddfa8958d8c6d388575288da4dcd60acdaf00288b5a52a731aa21512a1c7ef9622fd0b2de162086f
diff --git a/net-proxy/shadowsocks-libev/metadata.xml b/net-proxy/shadowsocks-libev/metadata.xml
index 8771f7c6a926..694ba4f7271c 100644
--- a/net-proxy/shadowsocks-libev/metadata.xml
+++ b/net-proxy/shadowsocks-libev/metadata.xml
@@ -5,11 +5,6 @@
 		<email>dlan@gentoo.org</email>
 		<name>Yixun Lan</name>
 	</maintainer>
-	<use>
-		<flag name="openssl">Use <pkg>dev-libs/openssl</pkg> as crypto backend</flag>
-		<flag name="mbedtls">Use <pkg>net-libs/mbedtls</pkg> as crypto backend</flag>
-		<flag name="system-libs">Use system libraries instead of the ones included in the upstream distribution</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">shadowsocks/shadowsocks-libev</remote-id>
 	</upstream>
diff --git a/net-proxy/shadowsocks-libev/shadowsocks-libev-2.5.6.ebuild b/net-proxy/shadowsocks-libev/shadowsocks-libev-2.5.6.ebuild
deleted file mode 100644
index bf924f51eeca..000000000000
--- a/net-proxy/shadowsocks-libev/shadowsocks-libev-2.5.6.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils systemd
-
-DESCRIPTION="A lightweight secured SOCKS5 proxy for embedded devices and low end boxes"
-HOMEPAGE="https://github.com/shadowsocks/shadowsocks-libev"
-
-MY_PV="v${PV}"
-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 +openssl mbedtls +system-libs"
-
-RDEPEND="openssl? ( dev-libs/openssl:= )
-	mbedtls? ( net-libs/mbedtls )
-	system-libs? (
-		>=dev-libs/libsodium-1.0.8
-		dev-libs/libev
-		net-libs/udns
-	)
-	dev-libs/libpcre
-	"
-DEPEND="${RDEPEND}
-	sys-kernel/linux-headers
-	doc? (
-		app-text/asciidoc
-		app-text/xmlto
-	)
-	"
-
-REQUIRED_USE=" ^^ ( openssl mbedtls )"
-
-src_configure() {
-	local myconf=" \
-		$(use_enable debug assert) \
-		$(use_enable system-libs system-shared-lib) \
-		--with-crypto-library=$(usex openssl openssl mbedtls)
-	"
-	use doc || myconf+="--disable-documentation"
-	econf ${myconf}
-}
-
-src_install() {
-	default
-	prune_libtool_files --all
-
-	dodir "/etc/${PN}"
-	insinto "/etc/${PN}"
-	newins "${FILESDIR}/shadowsocks.json" shadowsocks.json
-
-	newinitd "${FILESDIR}/shadowsocks.initd" shadowsocks
-	dosym /etc/init.d/shadowsocks /etc/init.d/shadowsocks.server
-	dosym /etc/init.d/shadowsocks /etc/init.d/shadowsocks.client
-	dosym /etc/init.d/shadowsocks /etc/init.d/shadowsocks.redir
-	dosym /etc/init.d/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-2.6.2.ebuild b/net-proxy/shadowsocks-libev/shadowsocks-libev-2.6.2.ebuild
deleted file mode 100644
index 69130dcd0871..000000000000
--- a/net-proxy/shadowsocks-libev/shadowsocks-libev-2.6.2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils systemd
-
-DESCRIPTION="A lightweight secured SOCKS5 proxy for embedded devices and low end boxes"
-HOMEPAGE="https://github.com/shadowsocks/shadowsocks-libev"
-
-MY_PV="v${PV}"
-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 +openssl mbedtls +system-libs"
-
-RDEPEND="openssl? ( dev-libs/openssl:= )
-	mbedtls? ( net-libs/mbedtls )
-	system-libs? (
-		>=dev-libs/libsodium-1.0.8
-		dev-libs/libev
-		net-libs/udns
-	)
-	dev-libs/libpcre
-	"
-DEPEND="${RDEPEND}
-	sys-kernel/linux-headers
-	doc? (
-		app-text/asciidoc
-		app-text/xmlto
-	)
-	"
-
-REQUIRED_USE=" ^^ ( openssl mbedtls )"
-
-src_configure() {
-	local myconf=" \
-		$(use_enable debug assert) \
-		$(use_enable system-libs system-shared-lib) \
-		--with-crypto-library=$(usex openssl openssl mbedtls)
-	"
-	use doc || myconf+="--disable-documentation"
-	econf ${myconf}
-}
-
-src_install() {
-	default
-	prune_libtool_files --all
-
-	dodir "/etc/${PN}"
-	insinto "/etc/${PN}"
-	newins "${FILESDIR}/shadowsocks.json" shadowsocks.json
-
-	newinitd "${FILESDIR}/shadowsocks.initd" shadowsocks
-	dosym /etc/init.d/shadowsocks /etc/init.d/shadowsocks.server
-	dosym /etc/init.d/shadowsocks /etc/init.d/shadowsocks.client
-	dosym /etc/init.d/shadowsocks /etc/init.d/shadowsocks.redir
-	dosym /etc/init.d/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.0.6.ebuild b/net-proxy/shadowsocks-libev/shadowsocks-libev-3.1.3.ebuild
index 136bc28dcc32..c0840b786323 100644
--- a/net-proxy/shadowsocks-libev/shadowsocks-libev-3.0.6.ebuild
+++ b/net-proxy/shadowsocks-libev/shadowsocks-libev-3.1.3.ebuild
@@ -1,15 +1,18 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
+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://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"
@@ -17,6 +20,9 @@ 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-libs/udns
@@ -31,13 +37,16 @@ DEPEND="${RDEPEND}
 	"
 
 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) \
+	local myconf="
+		$(use_enable debug assert)
+		--enable-system-shared-lib
 	"
 	use doc || myconf+="--disable-documentation"
 	econf ${myconf}
@@ -52,10 +61,10 @@ src_install() {
 	newins "${FILESDIR}/shadowsocks.json" shadowsocks.json
 
 	newinitd "${FILESDIR}/shadowsocks.initd" shadowsocks
-	dosym /etc/init.d/shadowsocks /etc/init.d/shadowsocks.server
-	dosym /etc/init.d/shadowsocks /etc/init.d/shadowsocks.client
-	dosym /etc/init.d/shadowsocks /etc/init.d/shadowsocks.redir
-	dosym /etc/init.d/shadowsocks /etc/init.d/shadowsocks.tunnel
+	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