gentoo resync : 22.01.2021

4 files changed, 2 insertions, 34 deletions

diff --git a/net-vpn/httptunnel/Manifest b/net-vpn/httptunnel/Manifest
index b184c0c267da..09769bc09752 100644
--- a/net-vpn/httptunnel/Manifest
+++ b/net-vpn/httptunnel/Manifest
@@ -1,7 +1,4 @@
-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
 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 642 BLAKE2B 5c22e68d50eb482669930635df4f4237924deab8792f0609fa2a3f55c5a343ad8cef1fc442b8396909785875e9b0aa4aad815f99c0aec829597f6d400e148fb5 SHA512 773aaf6a7d7303ea215e3eada2c491964555978b028e33d451d68807ea2fce8a447e33dae5b670b8d39989f3a537a9be06a923e3ffb9cc7e9c95eb2049de698c
+EBUILD httptunnel-3.3_p20180119.ebuild 641 BLAKE2B 11d91c0ece12373eb9338982263053450c24fb4e275b6037a44643f3c4822b4d1bfa16ce702b53a42147de717dd70b3975e7d7d7f202366fa7ec7da95c8b664f SHA512 feb6ece8afc1778317b9576f54ed0a5b492ba8a26f2d49748c06e518876df9d0b8ee4e63ace501e260ab5b9464348baf7358c7811ab4e153eba253cece0eba2a
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-vpn/httptunnel/files/httptunnel-3.3-fix_write_stdin.patch b/net-vpn/httptunnel/files/httptunnel-3.3-fix_write_stdin.patch
deleted file mode 100644
index 904df6f91159..000000000000
--- a/net-vpn/httptunnel/files/httptunnel-3.3-fix_write_stdin.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -dur httptunnel-3.3/common.c httptunnel-3.3-fix_write_stdin/common.c
---- httptunnel-3.3/common.c	2001-02-25 12:45:41.000000000 +0100
-+++ httptunnel-3.3-fix_write_stdin/common.c	2007-06-20 21:38:54.000000000 +0200
-@@ -314,7 +314,7 @@
- 
-       /* If fd == 0, then we are using --stdin-stdout so write to stdout,
-        * not fd. */
--      m = write_all (fd ? fd : 0, buf, (size_t)n);
-+      m = write_all (fd ? fd : 1, buf, (size_t)n);
-       log_annoying ("write_all (%d, %p, %d) = %d", fd ? fd : 1, buf, n, m);
-       return m;
-     }
diff --git a/net-vpn/httptunnel/httptunnel-3.3-r2.ebuild b/net-vpn/httptunnel/httptunnel-3.3-r2.ebuild
deleted file mode 100644
index f5887a74bbf4..000000000000
--- a/net-vpn/httptunnel/httptunnel-3.3-r2.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="httptunnel can create IP tunnels through firewalls/proxies using HTTP"
-HOMEPAGE="https://github.com/larsbrinkhoff/httptunnel"
-SRC_URI="http://www.nocrew.org/software/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc x86"
-SLOT="0"
-
-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
index 51fd5656ca3f..9e6f1b23f274 100644
--- a/net-vpn/httptunnel/httptunnel-3.3_p20180119.ebuild
+++ b/net-vpn/httptunnel/httptunnel-3.3_p20180119.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/larsbrinkhoff/httptunnel/archive/${COMMIT}.tar.gz ->
 S="${WORKDIR}/${PN}-${COMMIT}"
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 SLOT="0"
 
 PATCHES=(