gentoo resync : 14.12.2020

4 files changed, 2 insertions, 100 deletions

diff --git a/net-proxy/3proxy/3proxy-0.8.13.ebuild b/net-proxy/3proxy/3proxy-0.8.13.ebuild
deleted file mode 100644
index 345db508eed8..000000000000
--- a/net-proxy/3proxy/3proxy-0.8.13.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="A really tiny cross-platform proxy servers set"
-HOMEPAGE="https://www.3proxy.ru/"
-SRC_URI="https://github.com/z3APA3A/3proxy/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ppc ~sparc x86"
-IUSE=""
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.8.12-gentoo.patch
-)
-
-DOCS=( README cfg )
-HTML_DOCS=( doc/html/. )
-
-src_prepare() {
-	default
-	cp Makefile.Linux Makefile || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" LN="$(tc-getCC)"
-}
-
-src_install() {
-	local x
-
-	pushd src >/dev/null || die
-	dobin 3proxy
-	for x in proxy socks ftppr pop3p tcppm udppm mycrypt dighosts icqpr smtpp; do
-		newbin ${x} ${PN}-${x}
-		[[ -f "${S}"/man/${x}.8 ]] && newman "${S}"/man/${x}.8 ${PN}-${x}.8
-	done
-	popd >/dev/null
-
-	doman man/3proxy*.[38]
-
-	einstalldocs
-}
diff --git a/net-proxy/3proxy/3proxy-0.9.0.ebuild b/net-proxy/3proxy/3proxy-0.9.0.ebuild
index 8ba6dc7366b3..bd5edecfd3a0 100644
--- a/net-proxy/3proxy/3proxy-0.9.0.ebuild
+++ b/net-proxy/3proxy/3proxy-0.9.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.3proxy.ru/"
 SRC_URI="https://github.com/z3APA3A/3proxy/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ppc ~sparc x86"
 IUSE=""
 
 PATCHES=(
diff --git a/net-proxy/3proxy/Manifest b/net-proxy/3proxy/Manifest
index 5f67b0f659e2..ed4136735777 100644
--- a/net-proxy/3proxy/Manifest
+++ b/net-proxy/3proxy/Manifest
@@ -1,7 +1,4 @@
-AUX 3proxy-0.8.12-gentoo.patch 1749 BLAKE2B 8ee153ae343989faef6f36dbdc072b933fbee2d2ad129b0e6573dd57e465916d94f0868fcfd03a2099879b3c7bc925ac3be1adb7be52043fbb9996cbc8ff0ed2 SHA512 b8c3a9d5cf1ad20ef517ec6ec5626cf9f6094777c0870e53fd35e32f49a518fecdfa05a5806514957d10943da7bdcaa63e2ad6fce32506d7fd1a467bb7b2e652
 AUX 3proxy-0.9.0-gentoo.patch 1426 BLAKE2B 221bc5e87ae399ef621e687f03fbbd57a1f8ecce74e7ec0ed57f9536a4d8195563b00f4249769fe8ba3a736fc0cc5ca0441d5b879da575c3aa888d912ded2c4d SHA512 183d45fab08cf86d542f49844c8cc3e0930cc262bd928722ef021ab4bda21542f30587d3c1850d89caffc29059f7e3b5b2f22f1b5bdab15d916556e7af1951ee
-DIST 3proxy-0.8.13.tar.gz 529072 BLAKE2B 45b756bf1ddaaf560f4f35c88e78d24dbafa28c3144de5317d9f5177c51da85a2148a7db743a656ddf853325e18edbcb200b37ff02afae2f203c3bfab66e1b58 SHA512 94b4a2568917c1d720276e38050a13e144d3e92ff41edd02eeebac0a6c21e6a839a58ea7dcb3abc03370e0f18452c953cfd7ad15ebac87e66b78d94fa52fbd79
 DIST 3proxy-0.9.0.tar.gz 607014 BLAKE2B dae9004ea1474080fbbd4a3ff3a2690f8a6afb2ab2c045dbdaa25adf10ff2c58501d46a5a99b24db526b153ce00d281851ec08499d908709c5801c27aa7b0ca8 SHA512 7429389bf70c38d57e7a6f34e649a04aaad4f81555b7ef131cae026123ff7877d3f1aef8d10f84b9fc2c58e9ad5ab3d55e4af7326dbce14c05f3cd9973fafd83
-EBUILD 3proxy-0.8.13.ebuild 920 BLAKE2B f61bf2068cdd65548fc280e4c248c95acd0463eecdd5aab7f3d7caa994014c95d2d4e966ee9278619bdd910a9d19e0ea061579b33859d205dd26c548b0d231fe SHA512 dacf4aa0da9a417946142888e718f81a9717268858f3c2b6e645f21cafb0696076e4502d156cf0963cd4cb52d3ccfaab4bd8137c6a9364a78e7d1e3a5b1627bf
-EBUILD 3proxy-0.9.0.ebuild 922 BLAKE2B a28666cc670d75d033e2acea661863b3edddfde2728e9d53aa9109a6b0539fbd83f9d9f7622e59e3a4b6b00fe94d64235d638aa6fc1e4d649b93fda65f071f82 SHA512 1d32bb19a60ef4ee83be346385ed08fba50b2d4f6d730f47bc994098650fc32b72f48cbb68cf443b4b61e7bc262550a35ca7b632f3f8e265b1c26deeb75854ab
+EBUILD 3proxy-0.9.0.ebuild 919 BLAKE2B cdafe11efccb3df2faf230c4c9442f7a8603cdabd86cd3f7f52f81029c75fd6913de09d04486e31bbbca0a98c34a6801a89bf72fc4c913ad3077a99e6557d553 SHA512 a5717bedc448ba3a8719a8538ed6921ca6d9f8906aa2ca6066b3de3fa9bb7891d677b1f790ee15a01f42986f1e2ed1bb4d0183193f0038ef8f53eac605d43c24
 MISC metadata.xml 1102 BLAKE2B 1c5bfc3ff94b076a5bc8f7c87091b08e9f2fe69a49776687379d1149cfc3cc3f04fff7278858a548746110533b528fa0d83e7af9c384143ddcf6a9d3e796502b SHA512 f9c7b4b3b9f045b76049a75f2e65f70a316a3ad08f44a39d1c7ea23e5b23bc92232eae7487b4bf7534bb2fbd2655a9debf35ac3ba8ee4de6583d49f61bfc6076
diff --git a/net-proxy/3proxy/files/3proxy-0.8.12-gentoo.patch b/net-proxy/3proxy/files/3proxy-0.8.12-gentoo.patch
deleted file mode 100644
index 33950f45ceeb..000000000000
--- a/net-proxy/3proxy/files/3proxy-0.8.12-gentoo.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -uNr a/Makefile.Linux b/Makefile.Linux
---- a/Makefile.Linux	2018-04-18 22:48:45.000000000 +0300
-+++ b/Makefile.Linux	2019-05-26 14:42:38.927811513 +0300
-@@ -8,13 +8,13 @@
- # library support. Add -DSAFESQL for poorely written ODBC library / drivers.
- 
- BUILDDIR =
--CC = gcc
-+CC ?= gcc
- 
--CFLAGS = -g -O2 -fno-strict-aliasing -c -pthread -DGETHOSTBYNAME_R -D_THREAD_SAFE -D_REENTRANT -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL
-+CFLAGS += -fno-strict-aliasing -c -pthread -DGETHOSTBYNAME_R -D_THREAD_SAFE -D_REENTRANT -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL
- COUT = -o 
--LN = gcc
-+LN ?= gcc
- DCFLAGS = -fpic
--LDFLAGS = -O2 -fno-strict-aliasing -pthread
-+LDFLAGS += -fno-strict-aliasing -pthread
- DLFLAGS = -shared
- DLSUFFICS = .ld.so
- # -lpthreads may be reuqired on some platforms instead of -pthreads
-@@ -39,12 +39,12 @@
- include Makefile.inc
- 
- allplugins:
--	@list='$(PLUGINS)'; for p in $$list; do cp Makefile Makefile.var plugins/$$p; cd plugins/$$p ; make ;	cd ../.. ; done
-+	@list='$(PLUGINS)'; for p in $$list; do cp Makefile Makefile.var plugins/$$p; cd plugins/$$p ; $(MAKE) ;	cd ../.. ; done
- 
- DESTDIR		=
--prefix		= /usr/local
-+prefix		=
- exec_prefix	= $(prefix)
--man_prefix	= $(prefix)/share
-+man_prefix	= $(prefix)/usr/share
- 
- INSTALL		= /usr/bin/install
- INSTALL_BIN	= $(INSTALL) -m 755
-diff -uNr a/src/stringtable.c b/src/stringtable.c
---- a/src/stringtable.c	2018-04-18 22:48:45.000000000 +0300
-+++ b/src/stringtable.c	2019-05-26 14:42:07.437810566 +0300
-@@ -38,7 +38,7 @@
- /* 24 */	NULL,
- #ifndef TPROXY_CONF
- #ifndef _WIN32
--/* 25 */	(unsigned char *)"/usr/local/etc/3proxy/3proxy.cfg",
-+/* 25 */	(unsigned char *)"/etc/3proxy/3proxy.cfg",
- #else
- /* 25 */	(unsigned char *)"3proxy.cfg",
- #endif