From f01def842dbc187708fe681ff40ae2bad3dbfb7a Mon Sep 17 00:00:00 2001
From: Alex Efros <powerman@powerman.name>
Date: Wed, 23 Mar 2016 07:55:51 +0200
Subject: net-proxy/3proxy: Version bump to 0.8.6

Closes: https://github.com/gentoo/gentoo/pull/1118
---
 net-proxy/3proxy/3proxy-0.8.6.ebuild             | 41 ++++++++++++++++++++++
 net-proxy/3proxy/Manifest                        |  1 +
 net-proxy/3proxy/files/3proxy-0.8.6-gentoo.patch | 43 ++++++++++++++++++++++++
 3 files changed, 85 insertions(+)
 create mode 100644 net-proxy/3proxy/3proxy-0.8.6.ebuild
 create mode 100644 net-proxy/3proxy/files/3proxy-0.8.6-gentoo.patch

diff --git a/net-proxy/3proxy/3proxy-0.8.6.ebuild b/net-proxy/3proxy/3proxy-0.8.6.ebuild
new file mode 100644
index 000000000000..758a2882904d
--- /dev/null
+++ b/net-proxy/3proxy/3proxy-0.8.6.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI=6
+inherit eutils
+
+DESCRIPTION="A really tiny cross-platform proxy servers set"
+HOMEPAGE="http://www.3proxy.ru/"
+SRC_URI="http://3proxy.ru/${PV}/${P}.tgz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~ppc"
+IUSE=""
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	cp Makefile.Linux Makefile || die
+	default
+}
+
+src_install() {
+	local x
+
+	cd src || 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
+	cd ..
+
+	doman man/3proxy*.[38]
+
+	dodoc Readme
+	docinto html
+	dodoc -r doc/html/*
+	docinto cfg
+	dodoc -r cfg/*
+}
diff --git a/net-proxy/3proxy/Manifest b/net-proxy/3proxy/Manifest
index e9c3a4fc8937..b61b0e47e46d 100644
--- a/net-proxy/3proxy/Manifest
+++ b/net-proxy/3proxy/Manifest
@@ -2,3 +2,4 @@ DIST 3proxy-0.5.3k.tgz 190797 SHA256 7bbe159a0157480c653ef3976495a9b1993435a44ea
 DIST 3proxy-0.6.1.tgz 480160 SHA256 10f8804258791e80353a334dc9b80473a02c6dda939de76451e655f643aadd7f SHA512 2a32549424de3bce0b59b1ad28e203d4f96b58d8fb7b8b39dfdccc4dada20655ac109eafab1ffa99279eb98f4425a51ec8154bf0d51b4c23382f3244f0e989f0 WHIRLPOOL dfae9eaa3d8e6129a77d8b93d389036ef583cdf1862f0f0f794f00c6947617dcba96040d9a31c23befa687a6435c86152959d0a692b1cf9c6ffd02e9531f4697
 DIST 3proxy-0.7.1.2.tgz 478532 SHA256 e1157aab3ff8215a3b1f35c61a9d6011e60ad38b52d9f74a1fc4cae14ba16a31 SHA512 c7f4e25d2630e8c6c25bbc09a5f9f201448d57a85d404cd1f6304946d9a31083845bd8d481f610fe1cd1f56be349eb774cdae135430efcfdd1952a0403d01735 WHIRLPOOL bdfd70a0054b71457f49bcc09af8f26d1cf371d10fb60adc256ad5a60f54167fc1d8e26f9355785223647392b5697adaa4ebeec26c7009a09e1f8d317cdf7089
 DIST 3proxy-0.7.1.4.tgz 478617 SHA256 905a080ea3ba45a522a2d871bfdda94168561f7dd81c01a4be3540eda8f6c98f SHA512 af361666ec6d53decee6a66f4ec5621e0bbaccfaae8f6cadd5c00c91a417916b2b1b97a660fd47566677c3343f603a45b92f085a48a26eaa429398938d29383a WHIRLPOOL 08ab0ff3a26bce973ffe0077bddc84f356c0c8f8e3a8c06faadb932b10f8c8fc7000d3aaf372bcfe6a2ffcfa4516b23dc3f10bc5509afd404af466d0f765f1d5
+DIST 3proxy-0.8.6.tgz 508359 SHA256 7819237ce043465d887cb0b25d8594de932ed9a694a32a4e46b895ee55675fa2 SHA512 394fcf8f6d088543b2380ad6bf058d276caed29300df7de963895add788a867cab5860f6fc3f1279e10304db5b0ac147af232f9acd3986188bfa56ad2307aae4 WHIRLPOOL d1640a5d0765b3332263ed09e9349e470a5b8c5f57ba65b993cff6bb89d3818ee4da40193e7bdbcfec891810ffe05db02ae5ad25216e00613738e302c1880c88
diff --git a/net-proxy/3proxy/files/3proxy-0.8.6-gentoo.patch b/net-proxy/3proxy/files/3proxy-0.8.6-gentoo.patch
new file mode 100644
index 000000000000..01f21e82d540
--- /dev/null
+++ b/net-proxy/3proxy/files/3proxy-0.8.6-gentoo.patch
@@ -0,0 +1,43 @@
+--- Makefile.Linux.orig	2016-03-23 07:25:19.209178284 +0200
++++ Makefile.Linux	2016-03-23 07:27:06.704181518 +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 += -g -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
+--- src/stringtable.c.orig	2016-03-23 07:27:41.216182556 +0200
++++ src/stringtable.c	2016-03-23 07:27:55.280182979 +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
-- 
cgit v1.2.3