gentoo resync : 25.09.2019

4 files changed, 2 insertions, 56 deletions

diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index 7d2b0fa704ce..ee690c720ac4 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/obfs4proxy/Manifest b/net-proxy/obfs4proxy/Manifest
index aa8e61b3093b..dffc26c1cf57 100644
--- a/net-proxy/obfs4proxy/Manifest
+++ b/net-proxy/obfs4proxy/Manifest
@@ -3,11 +3,7 @@ DIST github.com-dsnet-compress-v0.0.1.tar.gz 9962544 BLAKE2B 58e5bd8eb7a50071da2
 DIST github.com-golang-crypto-a5d413f7728c81fb97d96a2b722368945f651e78.tar.gz 1656797 BLAKE2B 6b7e3f776b396786125582332fcf90e6b2452a06856a8b13cb2d84a882c5c563af79b8c37232f15410ae90b309e93044dcb6e0a5948d4e25b9730cc541534d16 SHA512 57a9606845a27459703d3757e001303d2f67c88efa4d021d4aa09314ddcc85fe95c9db2ff4aa08639b6be49cc751d82c35134a587987a896f64bb103af89adee
 DIST github.com-golang-net-74de082e2cca95839e88aa0aeee5aadf6ce7710f.tar.gz 976643 BLAKE2B 6a64e95b90379cc72f93391ebc46d064c22e980dffd788c438b87ed9bb7da4a6dbdbdb6865722bb274a03359ca745165adf73b24b50c3038dc7347abf873043c SHA512 afd0169a4de53a36ed87c4510e4bf02147bc10b2fb3de22b3608a05feb72b571e8a560ea1ce4b3953385b6627ba012e5da54dc8c264194e01ea9d83745c5e9da
 DIST github.com-golang-sys-9eb1bfa1ce65ae8a6ff3114b0aaf9a41a6cf3560.tar.gz 1262620 BLAKE2B ffa03ba8cb0fbdb9d2b68bf00920dd7695a0dcbfc190f26cff2045b0612103dee8fa1ede2b64ed384d59889b0af11088c6e7586d1314ec2265a028e63d0641a3 SHA512 eee9be21a6be3c84127e1bb0c90f6c872aec2b3dc88d1dffd9421b8ff18e1e517b3d1f39f06f47339a21aa78a9570884c64a37d31b1816ac67ba0dc0b3f15cce
-DIST github.com-golang-sys-afcc84fd7533758f95a6e93ae710aa945a0b7e73.tar.gz 1244035 BLAKE2B 5e32e26aca844d6d21b17b60546f908b0f881283d59357d1891417b8f221af42182f0a767e01a806e0d81f4283511e12028f654e505db7522f04c84f5546baac SHA512 87e4333e7ba519fe6e222c15ac8185151af3dc9be902112ae3e06e2a64d0ae05dfd37055c9493e9698a4f5fafed3ed45c44d18c4ebf6821d35bff351b2741f2b
-DIST gitlab.com-yawning-utls---v0.0.10-1.tar.gz 533464 BLAKE2B 0f07d30768fb92ec274a98477be087b6c1724458641c63571ff2b46a217ed0611a902e45cc0ae9626a47c2572b7a785465bc808c8208005110a262739b7b0daf SHA512 e286f1b2007852ad8a4ef006be528fc6c885beba841509cc8a88ca08b8c2c8a608098ef1a39bb563d7a3dd0b402d12e1fb8b00095e706e5e2193348e02cafc6d
 DIST gitlab.com-yawning-utls---v0.0.11-1.tar.gz 560616 BLAKE2B 68fa15c07bccbf58ca7666453d53cb892777160ea2843095024d4811891803d0a1a4f876247ca2fe5ff08cac24e96d50ada838bde9afbaf34a7208f8b30b8f01 SHA512 debea4bfe2b2686d181fa0f6a583833728d154b4262c6a7fe9354d3d953739355aade92c927fa3a10d5b78efe37d9707ab4c59beaa765c64b6fe99dbc54f1722
-DIST obfs4proxy-0.0.10.tar.gz 85538 BLAKE2B 37ffb9805f64a10c4cfb8cc0e95ee5ee341d63dc116c93487802f02f11919acf44dea96207c49a2d17a87a8c78fc35ec13cba24511fd205cf9196754566c1ae7 SHA512 ee8a0a4cce1d4cf21427f91af73b6ff50c83c03cf42587600135c8540edde20343c226c68d38725d53a69e4cc69bb3a7310d9f81ff76a67d9602148f10f3634a
 DIST obfs4proxy-0.0.11.tar.gz 85557 BLAKE2B 9b56433fa4a1023ce2c2b75cec598a1f55fb8229659ee66604b636d2269b243d347e34eb1b539b71db5ac0cb45c868d249844a82e04b20faa6dc1785fe4b78dc SHA512 3eb50bc8067802f8260e0926999a659919e55cb34247f443f66a4852c9ceceacae361602a57ad1fd28a84e4ed54f3800c3258e67266eb23d45b1d09e31c5d869
-EBUILD obfs4proxy-0.0.10.ebuild 1551 BLAKE2B cb342f5e7c5922756cc0997a11a4fd1536588dfc83a6a2dd9c4a33a79810f57c341816d99f69fe159a78ffbc8a5607ec1df19963085465e66a5311ef74c979cb SHA512 3375c6ee64ab0b7c9c6b1e70e0650bc0578682e5c66a0b868694491eb891b73ec7a7901a7f2a8045f8825286c950ca26dcdb96f8c4c428c9bda6251739c9e28f
-EBUILD obfs4proxy-0.0.11.ebuild 1551 BLAKE2B 5fa0ad9335e558ba56133c6e56728dd22d96b70517d5d1d75faf50cdb1ed68c4c333906bc92854d1aa46fa42be7aa4ba6d7dc528c458dfc7f1287f6df5d4a6a0 SHA512 419314ebc843ee2d51cfc2cab39ac7f49cbcf6b675be33e820fe273e7ce114662bf52ce805a6c3cfd95229d5f847acad0830f95f55761cc7f72fab3242cfdf96
+EBUILD obfs4proxy-0.0.11.ebuild 1596 BLAKE2B fbfb2843b4726ed911f9c3ba3c1ad592d8eaeb01aed03eea0501c084c041dd1b9c44a377f6aeb8612410a3dd607ef3c78b127b8482a16058ffb4fba7c796722e SHA512 3a78684036cc2685f6d4263543e46e3718f114999cf23afff1e4763ac5df26042a74fce59a8b1fe4c2e3749c9eb6c471980327dd012050457ba7f843b64420bd
 MISC metadata.xml 436 BLAKE2B a31742b53be9467a5b916219f3d76ce32f4c59d6d72c867f0d8cec5669b1fba84453efea7fa886ac4dc5d0528c3763188fe6736c5b76b4475a31ecd44d78a1a3 SHA512 0077fbce7545acc98c3964643cc51be782d7aa0fe82fc1b3b44b89a6611e9b95bd579ae143c57a5c16f58c16c406f7fcbdd79e8b4e50f433092903ba6e2d3989
diff --git a/net-proxy/obfs4proxy/obfs4proxy-0.0.10.ebuild b/net-proxy/obfs4proxy/obfs4proxy-0.0.10.ebuild
deleted file mode 100644
index dd018f862dc9..000000000000
--- a/net-proxy/obfs4proxy/obfs4proxy-0.0.10.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGO_SRC=gitlab.com/yawning/obfs4.git
-EGO_PN=${EGO_SRC}/...
-
-EGO_VENDOR=(
-	"github.com/dsnet/compress v0.0.1"
-	"gitlab.com/yawning/utls.git v0.0.10-1 gitlab.com/yawning/utls/-"
-	"git.schwanenlied.me/yawning/bsaes.git 26d1add596b6d800bdeeb3bc3b2c7b316c056b6d git.schwanenlied.me/yawning/bsaes"
-	# Newer versions of packages which are in the tree
-	"golang.org/x/crypto a5d413f7728c81fb97d96a2b722368945f651e78 github.com/golang/crypto"
-	"golang.org/x/net 74de082e2cca95839e88aa0aeee5aadf6ce7710f github.com/golang/net"
-	"golang.org/x/sys afcc84fd7533758f95a6e93ae710aa945a0b7e73 github.com/golang/sys"
-)
-
-inherit golang-build golang-vcs-snapshot
-
-DESCRIPTION="An obfuscating proxy supporting Tor's pluggable transport protocol obfs4"
-HOMEPAGE="https://gitlab.com/yawning/obfs4"
-SRC_URI="https://gitlab.com/yawning/obfs4/-/archive/${P}/obfs4-${P}.tar.gz -> ${P}.tar.gz
-	${EGO_VENDOR_URI}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND=">=dev-go/ed25519-0_pre20170117
-	>=dev-go/go-text-0.3.0
-	>=dev-go/goptlib-1.0.0
-	>=dev-go/siphash-1.2.1"
-RDEPEND=""
-
-src_compile() {
-	golang-build_src_compile
-	local binfile=$(find "${T}" -name a.out)
-	[[ -x ${binfile} ]] || die "a.out not found"
-	cp -a ${binfile} obfs4proxy
-}
-
-src_install() {
-	default
-	dobin obfs4proxy || die "install failed"
-	cd src/${EGO_SRC}
-	doman doc/obfs4proxy.1 || die "install failed"
-	dodoc README.md ChangeLog doc/obfs4-spec.txt || die "install failed"
-}
diff --git a/net-proxy/obfs4proxy/obfs4proxy-0.0.11.ebuild b/net-proxy/obfs4proxy/obfs4proxy-0.0.11.ebuild
index 32e2050e9221..e0d6e07a19be 100644
--- a/net-proxy/obfs4proxy/obfs4proxy-0.0.11.ebuild
+++ b/net-proxy/obfs4proxy/obfs4proxy-0.0.11.ebuild
@@ -23,7 +23,7 @@ HOMEPAGE="https://gitlab.com/yawning/obfs4"
 SRC_URI="https://gitlab.com/yawning/obfs4/-/archive/${P}/obfs4-${P}.tar.gz -> ${P}.tar.gz
 	${EGO_VENDOR_URI}"
 
-LICENSE="BSD"
+LICENSE="BSD BSD-2 CC0-1.0 BZIP2 GPL-3+ MIT public-domain"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""