gentoo resync : 14.05.2020

4 files changed, 49 insertions, 40 deletions

diff --git a/net-misc/proxytunnel/Manifest b/net-misc/proxytunnel/Manifest
index 05d574546d44..e5b14cf8d159 100644
--- a/net-misc/proxytunnel/Manifest
+++ b/net-misc/proxytunnel/Manifest
@@ -1,7 +1,8 @@
 AUX proxytunnel-1.9.1-gcc-10.patch 4076 BLAKE2B 13dcff92f5c440430b03b02abd2d3068fa1b95cd67d5830ab99ac077ca24b333dbfd7423d37c7e6cba8d92f820cc7c1ea5d407ac12f3ddd367fe48519113a310 SHA512 c031b884ee929cdae87fb03846a6f0a99b38fbea96c3fbbe94bd176d873e73a15f1a914795f85c9fb6cd107ec117e38dbce93a6aaa256ca516b41a0bd74f6929
 AUX proxytunnel-allowTLS.patch 592 BLAKE2B 2c48bb1a1c2e2374043d9bc73e653a5f87f5bbda6a64a5572cbe3bdafe533205f619b7248c8f7b6cecf7de8c72940a6ccf64e054c5419e9ba656f773e9d7d346 SHA512 67b0103054c56c69cd9c0d1aa144498151f105004b400bcdbbb3df519d37424630554e101e5617faf075fd978edddfc4d06cca7524c51e28cd33c1165b6a22f9
+DIST proxytunnel-1.10.20200507.tar.gz 52286 BLAKE2B fca86840c4240137e6cf92a289344c39a8ab4066fb3efe83007ea75c9e42ebd746ce3e326d2351af38ac580c18d139a8d4f956af828862ae4f4e89eb3bd19fa0 SHA512 8727a686dcca9e38e5327207f29824daeddf9ce9a4fccdef6c6bd41019eb3901d4b84e724cbf9ba615115151ea434a597e9290ce302ba6df41e99d2f0b484e01
 DIST proxytunnel-1.9.1.tar.gz 48025 BLAKE2B 5a844d8fdbb9a1eae9c40c7621086b873ae89813b7c596da4416efcb777a8110ad7d224a0efa2e193cfbbb82dbfe69d44d4dd36db080b8e902630a464a85b953 SHA512 819dd11bc13fc279d2d475b89909c0eea414ff71d772d4bfed742dd8d425669dc502f2c22d983bb8c58e426a2bc7209526cb21492ca5f8e92ea1b9ea961fcfdc
-EBUILD proxytunnel-1.9.1-r1.ebuild 1041 BLAKE2B 7072f019baf871beffa674905ed05722d3b855576fff340f34eaa9521bbd524cec6122638d0d3882da4d1467ec7f1563add4a48767ee754ee79145129e58ec06 SHA512 de030c72e712b5c506d6f5fb47512f61451ac141ac3eb6cf17d3913650c79d2a6c898275b847051426bc9be9db4abc7249c387de6a3f44738dfffa8c059791cd
+EBUILD proxytunnel-1.10.20200507.ebuild 1093 BLAKE2B d62c614f964611b73c75cbd5db3752d1d837347de68f7aaa868aa943f386c4d4c77b0de6b620ddeaf47694d74ff96c1dfb812384fd18cd8ec74f691fb3c1af8a SHA512 054fe9d19722ee2081a89fbd6f372404f4f26ce5d27ce8110dc82452eb7fedf8c96a6b7c7b4e5a498ffb3c5c0569cb1a326ba2d64529f00ba2f26075d3ed047e
 EBUILD proxytunnel-1.9.1-r2.ebuild 1173 BLAKE2B 4402bd59cd3d1e967577fe65274347e6630553491850c87417d667eb7ec2a403782ddc3d31aa7dcbb302c490e3a73e19eadff9f418456741cd36be3ea9631125 SHA512 9e395e52a362684eae2c0ec6003e1e193cfb4d539173fc117352162601c85bc8d56214e320a5b7440394b20deded395fb5d50c43497bede6f8c144958dc37a2c
-EBUILD proxytunnel-9999.ebuild 1092 BLAKE2B 18e6074c8f467ab5f6f409775761b2be8c9d80515682e4a014b76e6d1b33bda791735d6b5974db97a7bfbd5fb6ec1f4f910d8687e0fcf39b026dafabab81c1e3 SHA512 e486dd5ceb3b4aa6d80be955640525b6edefb03df09e7d4d356d2510d11b2831e1ec0cd30935b998a95e8de6fe7b0d38af08d15aea6bd5c2f3078a196885ea55
+EBUILD proxytunnel-9999.ebuild 1093 BLAKE2B d62c614f964611b73c75cbd5db3752d1d837347de68f7aaa868aa943f386c4d4c77b0de6b620ddeaf47694d74ff96c1dfb812384fd18cd8ec74f691fb3c1af8a SHA512 054fe9d19722ee2081a89fbd6f372404f4f26ce5d27ce8110dc82452eb7fedf8c96a6b7c7b4e5a498ffb3c5c0569cb1a326ba2d64529f00ba2f26075d3ed047e
 MISC metadata.xml 717 BLAKE2B da3b819d7e0caeee376359837cf0a6294eee0363ad857369816fbf595e6add90666feeea356a9864d71a3987f7393ac7483bd4fe800bae67364291da420a2c39 SHA512 ecf80d876bccd3c2c98cb6a46e543e6adbe5a52a1666b6678cd86def313593d5200189f67cec5d85150e7a308139089786c416ee0a2d6bfe58d800b0fc7a18da
diff --git a/net-misc/proxytunnel/proxytunnel-1.10.20200507.ebuild b/net-misc/proxytunnel/proxytunnel-1.10.20200507.ebuild
new file mode 100644
index 000000000000..cbc33dfb1f68
--- /dev/null
+++ b/net-misc/proxytunnel/proxytunnel-1.10.20200507.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Connect stdin and stdout to a server via an HTTPS proxy"
+HOMEPAGE="https://github.com/proxytunnel/proxytunnel/ https://proxytunnel.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="static"
+
+RDEPEND="dev-libs/openssl:="
+DEPEND="${RDEPEND}
+	app-text/asciidoc
+	app-text/xmlto
+	"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( CHANGES CREDITS INSTALL KNOWN_ISSUES LICENSE.txt README RELNOTES TODO )
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+fi
+
+src_prepare() {
+	default
+	sed -i -e 's/libssl/libssl libcrypto/' Makefile || die "Sed failed!"
+}
+
+src_compile() {
+	use static && append-ldflags -static
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake install prefix="${EPREFIX}"/usr DESTDIR="${D}"
+	einstalldocs
+}
diff --git a/net-misc/proxytunnel/proxytunnel-1.9.1-r1.ebuild b/net-misc/proxytunnel/proxytunnel-1.9.1-r1.ebuild
deleted file mode 100644
index 64fea4ae5b4a..000000000000
--- a/net-misc/proxytunnel/proxytunnel-1.9.1-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Connect stdin and stdout to a server somewhere on the network, through a standard HTTPS proxy"
-HOMEPAGE="https://github.com/proxytunnel/proxytunnel/ http://proxytunnel.sourceforge.net/"
-SRC_URI="https://github.com/proxytunnel/proxytunnel/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="static"
-
-RDEPEND="dev-libs/openssl:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	app-text/asciidoc
-	app-text/xmlto
-	"
-
-src_prepare() {
-	sed -i -e 's/libssl/libssl libcrypto/' Makefile || die "Sed failed!"
-	epatch "${FILESDIR}"/${PN}-allowTLS.patch
-}
-
-src_compile() {
-	use static && append-ldflags -static
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake install prefix="${EPREFIX}"/usr DESTDIR="${D}"
-	dodoc CHANGES CREDITS INSTALL KNOWN_ISSUES LICENSE.txt README RELNOTES TODO
-}
diff --git a/net-misc/proxytunnel/proxytunnel-9999.ebuild b/net-misc/proxytunnel/proxytunnel-9999.ebuild
index dff3deb21c61..cbc33dfb1f68 100644
--- a/net-misc/proxytunnel/proxytunnel-9999.ebuild
+++ b/net-misc/proxytunnel/proxytunnel-9999.ebuild
@@ -25,7 +25,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 fi