gentoo Easter resync : 12.04.2020

5 files changed, 3 insertions, 137 deletions

diff --git a/net-proxy/3proxy/3proxy-0.8.12.ebuild b/net-proxy/3proxy/3proxy-0.8.12.ebuild
deleted file mode 100644
index 5ebf6061b3da..000000000000
--- a/net-proxy/3proxy/3proxy-0.8.12.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 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.8.13.ebuild b/net-proxy/3proxy/3proxy-0.8.13.ebuild
index 5ebf6061b3da..345db508eed8 100644
--- a/net-proxy/3proxy/3proxy-0.8.13.ebuild
+++ b/net-proxy/3proxy/3proxy-0.8.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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/3proxy-0.8.9.ebuild b/net-proxy/3proxy/3proxy-0.8.9.ebuild
deleted file mode 100644
index ba16aeca0092..000000000000
--- a/net-proxy/3proxy/3proxy-0.8.9.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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.8-gentoo.patch
-)
-
-DOCS=( README cfg )
-HTML_DOCS=( doc/html/. )
-
-src_prepare() {
-	default
-	cp Makefile.Linux Makefile || die
-}
-
-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/Manifest b/net-proxy/3proxy/Manifest
index ba9e218ab462..ca1ccb22f2a5 100644
--- a/net-proxy/3proxy/Manifest
+++ b/net-proxy/3proxy/Manifest
@@ -1,9 +1,4 @@
 AUX 3proxy-0.8.12-gentoo.patch 1749 BLAKE2B 8ee153ae343989faef6f36dbdc072b933fbee2d2ad129b0e6573dd57e465916d94f0868fcfd03a2099879b3c7bc925ac3be1adb7be52043fbb9996cbc8ff0ed2 SHA512 b8c3a9d5cf1ad20ef517ec6ec5626cf9f6094777c0870e53fd35e32f49a518fecdfa05a5806514957d10943da7bdcaa63e2ad6fce32506d7fd1a467bb7b2e652
-AUX 3proxy-0.8.8-gentoo.patch 1471 BLAKE2B daccc5f278ba4ac59aad24b463557a49e177f0dea679deea0b1282ba31eac21d76ee4587c3a6523da29ea8130ac24c75ee8b0ceecceb1ec57a53cc6028c9bb51 SHA512 9c41df962691f8b2b832495a5e644fcbe58805839b2b40dd65564dc3eb9897de1a744677e2c4a032e39d64b34c4190893049f2ed86be8908f739f720633b2f3a
-DIST 3proxy-0.8.12.tar.gz 528990 BLAKE2B fb338c93e25fe4d03d626118f8c3ef52af7104599e11d535dfa572c4fb47d609da66f199406a3c6bb9739766163bb7b54b529f71d4d6ff637567f2f67d3a9ed1 SHA512 33412e89991055598e06210dbcd7b2f9ee6810753c8f40ada02f222def0a49047a90ff7f2efa6895bc4f8ad99193866c980de2e79464310a77cc8e63c8b9813d
 DIST 3proxy-0.8.13.tar.gz 529072 BLAKE2B 45b756bf1ddaaf560f4f35c88e78d24dbafa28c3144de5317d9f5177c51da85a2148a7db743a656ddf853325e18edbcb200b37ff02afae2f203c3bfab66e1b58 SHA512 94b4a2568917c1d720276e38050a13e144d3e92ff41edd02eeebac0a6c21e6a839a58ea7dcb3abc03370e0f18452c953cfd7ad15ebac87e66b78d94fa52fbd79
-DIST 3proxy-0.8.9.tar.gz 497006 BLAKE2B c57e98eb586dfacefd530e091fecbee274d8104698ca082b71ea0607294199cb7db63fc32787236b7e797c928a7ba4f7bafa3ef35551bef76aacfbdf1f259fff SHA512 35153882fec7077b05b23f9cea91443126a8a9faf9818915612e0739196a8bd1f00e0bcefb339a86bad10bb0c1b9891bd06847934787f4758ec55e6cc2e9e815
-EBUILD 3proxy-0.8.12.ebuild 923 BLAKE2B 1a29d1e6f61fe79a9db6a1963794fb7276ae4364caa6d4549506ac65b947daf7344512c902e1428f10cf55be5e27d75416927be6f6c41872c423c91997f29426 SHA512 55101f5091f615a6411680b737ea82f275e910d9d9bc93ceacb42ab297cbe4099aa7746cf1578a34bcc1b187e822f9ff118bf80866e75166ad1554bca500c006
-EBUILD 3proxy-0.8.13.ebuild 923 BLAKE2B 1a29d1e6f61fe79a9db6a1963794fb7276ae4364caa6d4549506ac65b947daf7344512c902e1428f10cf55be5e27d75416927be6f6c41872c423c91997f29426 SHA512 55101f5091f615a6411680b737ea82f275e910d9d9bc93ceacb42ab297cbe4099aa7746cf1578a34bcc1b187e822f9ff118bf80866e75166ad1554bca500c006
-EBUILD 3proxy-0.8.9.ebuild 837 BLAKE2B 7f5666c6d09b04d57be1147421436435f0ce8487ae5957a474cee81064642bde3b4b80b52d9a14c6a9e0c16e61518cf6b1a412dddf354edc2cbec821e2351207 SHA512 ef8abe07dff61866d3b2a887511aaaba995fbdf3173213790f71a42f64d61b2fa224f41cb1f11d9d42ffbca04c579a013f2adc8ce19c06f03b9b5491552009c4
+EBUILD 3proxy-0.8.13.ebuild 920 BLAKE2B f61bf2068cdd65548fc280e4c248c95acd0463eecdd5aab7f3d7caa994014c95d2d4e966ee9278619bdd910a9d19e0ea061579b33859d205dd26c548b0d231fe SHA512 dacf4aa0da9a417946142888e718f81a9717268858f3c2b6e645f21cafb0696076e4502d156cf0963cd4cb52d3ccfaab4bd8137c6a9364a78e7d1e3a5b1627bf
 MISC metadata.xml 1102 BLAKE2B 1c5bfc3ff94b076a5bc8f7c87091b08e9f2fe69a49776687379d1149cfc3cc3f04fff7278858a548746110533b528fa0d83e7af9c384143ddcf6a9d3e796502b SHA512 f9c7b4b3b9f045b76049a75f2e65f70a316a3ad08f44a39d1c7ea23e5b23bc92232eae7487b4bf7534bb2fbd2655a9debf35ac3ba8ee4de6583d49f61bfc6076
diff --git a/net-proxy/3proxy/files/3proxy-0.8.8-gentoo.patch b/net-proxy/3proxy/files/3proxy-0.8.8-gentoo.patch
deleted file mode 100644
index 1f8d478cd086..000000000000
--- a/net-proxy/3proxy/files/3proxy-0.8.8-gentoo.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- a/Makefile.Linux	2016-12-16 20:24:53.809856430 +0200
-+++ b/Makefile.Linux	2016-12-16 20:26:24.912859170 +0200
-@@ -10,11 +10,11 @@
- BUILDDIR =
- CC = gcc
- 
--CFLAGS = -g -O2 -c -pthread -DGETHOSTBYNAME_R -D_THREAD_SAFE -D_REENTRANT -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL
-+CFLAGS += -c -pthread -DGETHOSTBYNAME_R -D_THREAD_SAFE -D_REENTRANT -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL
- COUT = -o 
- LN = gcc
- DCFLAGS = -fpic
--LDFLAGS = -O2 -pthread
-+LDFLAGS += -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
---- a/src/stringtable.c	2016-12-16 20:24:53.811856430 +0200
-+++ b/src/stringtable.c	2016-12-16 20:26:48.288859873 +0200
-@@ -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