gentoo resync : 16.09.2020

4 files changed, 50 insertions, 21 deletions

diff --git a/net-vpn/httptunnel/Manifest b/net-vpn/httptunnel/Manifest
index 981c9bcb5386..1b1036a27c7b 100644
--- a/net-vpn/httptunnel/Manifest
+++ b/net-vpn/httptunnel/Manifest
@@ -1,4 +1,7 @@
 AUX httptunnel-3.3-fix_write_stdin.patch 541 BLAKE2B a78b27f43fd7babde70c084030c7d5a57974c9c13bb0db231cf8d66537d505d2eb7fd2180a00842438dd74bd5b655668b97c61f3e53f0a6ea9e5969dde71c44a SHA512 d8a0cf3319c31f67a7e7bdf097923d52c619aa39cf80e261475213c1fcfaf43297f2a797952bcee413ecc78e78c15f817bc6f783ed525b07940fbe053e49fb6b
+AUX httptunnel-3.3_p20180119-respect-AR.patch 291 BLAKE2B 8f3ef913882c828f08dc047d6890135f0646d200c2e97b5a5cd3788655e39d4e42c69bfe5e1a596ccebd7a32d64d253fab3bc357410168ec0b8ac1a6a3e5933d SHA512 18f2529230d50a79ec6bb3b473357c86fce7f5f72597f662f06f4fe5c6deebd7697a4ee9207e3043437346cc49d80488ba1e1a6599e996e07eb3f8dc068ce1e4
 DIST httptunnel-3.3.tar.gz 262749 BLAKE2B d16c06f709befd45e13ac8f13c13242c90d045a23cbb6f39b8d8355d5a9e56643bb7766d4d8ae6dece16686d555850fa4a0e682fc9bb3e33ec7a5144311e517b SHA512 84503e27e84cd39441a7592d6446e30fce07a54b940e4398407dc105fabc6c8f96d3b5d05137d6dab22b2088c5b114728551337429748c900bd6fe7d6b6109e5
-EBUILD httptunnel-3.3-r2.ebuild 648 BLAKE2B a3c0cf33f4c25d9f026491706ac5b8f2f6c81787fd4e729d1c48f78d9b6bf116e1e6938d44cf585b0a3c22642fb7ba15653f22fa730b96157f5716d7c29b416f SHA512 db768a9b4a98844d83a78d8119c4e4596053aa1d7858ff64e1908580be3d863b6378423463f1c3d43773dae702a3e53d38dde27f8bfc12b74cf298f79196dd7a
+DIST httptunnel-3.3_p20180119.tar.gz 376338 BLAKE2B 6625a0ef0bef7afad4ca9b5791abe51d72553877c31dfcb4e4d0bfd6d0e3bf3a0a9f7c529db6a9f9c60726e7e79284959ed8a8bf64e1165e40265341f39cbaf6 SHA512 593efe9ebdc3c41338306e5038cacd63ec171d228ebf13ba52949c353b1d45666bc836ce34102735a383b6cc91f2df1c01e87c2ab1cf5e650fe5fe7fcc658de0
+EBUILD httptunnel-3.3-r2.ebuild 441 BLAKE2B ebb377eaae23e879258a9b559a08eebba3bc9e01ca22486fb7d14d24ca8bc97fadb2dad33ad305bd14ea3c91e3cc3240287a6ea9df5d6e82aed2c7ecdb80ba5b SHA512 9fd5006d2c9c7765f2c9fb198bbf4d48bc6abb7ab20a8b1f7b8706f469b67afb58e19889a4443c48e7d692d41e47669d2d9b56553e626da005f853b2a7909ac3
+EBUILD httptunnel-3.3_p20180119.ebuild 644 BLAKE2B f774b7a0c671d2e2f42535dd43ca44781d88e365f9131a765ff273b89ce970008ee5245033259ada42e63b62f5cadf6550ebb0a1c9d526d8b17c0cef3990916b SHA512 5d144b5ce29fb82cd05aa3641549acf9994f6e576002ecbb8c73b8efc0a7f8cadd050aa193ef0f0410d4fc7d67d44d70a35590e4c974a2dff551cab00717c24b
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-vpn/httptunnel/files/httptunnel-3.3_p20180119-respect-AR.patch b/net-vpn/httptunnel/files/httptunnel-3.3_p20180119-respect-AR.patch
new file mode 100644
index 000000000000..bdc6b7fb5a4a
--- /dev/null
+++ b/net-vpn/httptunnel/files/httptunnel-3.3_p20180119-respect-AR.patch
@@ -0,0 +1,12 @@
+diff --git a/configure.ac b/configure.ac
+index acd5843..f5ad65d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -26,6 +26,7 @@ AC_PROG_CC
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
+ AC_PROG_RANLIB
++AM_PROG_AR
+ 
+ dnl Checks for libraries.
+ AC_CHECK_FUNC([gethostent], :, [AC_CHECK_LIB(nsl, gethostent)])
diff --git a/net-vpn/httptunnel/httptunnel-3.3-r2.ebuild b/net-vpn/httptunnel/httptunnel-3.3-r2.ebuild
index f5232f19e9f4..f5887a74bbf4 100644
--- a/net-vpn/httptunnel/httptunnel-3.3-r2.ebuild
+++ b/net-vpn/httptunnel/httptunnel-3.3-r2.ebuild
@@ -1,30 +1,17 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="httptunnel can create IP tunnels through firewalls/proxies using HTTP"
-HOMEPAGE="http://www.nocrew.org/software/httptunnel.html"
+HOMEPAGE="https://github.com/larsbrinkhoff/httptunnel"
 SRC_URI="http://www.nocrew.org/software/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 KEYWORDS="amd64 ppc x86"
-IUSE=""
 SLOT="0"
 
-DEPEND=""
-RDEPEND=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-fix_write_stdin.patch
-	tc-export CC
-}
-
-src_configure() {
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man || die
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-fix_write_stdin.patch
+)
diff --git a/net-vpn/httptunnel/httptunnel-3.3_p20180119.ebuild b/net-vpn/httptunnel/httptunnel-3.3_p20180119.ebuild
new file mode 100644
index 000000000000..c22f99897765
--- /dev/null
+++ b/net-vpn/httptunnel/httptunnel-3.3_p20180119.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools toolchain-funcs
+
+COMMIT="f440dcb3c341d22428898952c343ad9fa6e9e7f5"
+DESCRIPTION="httptunnel can create IP tunnels through firewalls/proxies using HTTP"
+HOMEPAGE="https://github.com/larsbrinkhoff/httptunnel"
+SRC_URI="https://github.com/larsbrinkhoff/httptunnel/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+SLOT="0"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.3_p20180119-respect-AR.patch"
+)
+
+src_prepare() {
+	default
+
+	tc-export AR RANLIB
+	eautoreconf
+}