Diff haproxy-1.7.11 with a haproxy-1.8.9

/usr/portage/net-proxy/haproxy/haproxy-1.8.9.ebuild 2018-07-21 01:39:00.000000000 +0300
9 9
MY_P="${PN}-${PV/_beta/-dev}"
10 10

  
11 11
DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
12
HOMEPAGE="http://haproxy.1wt.eu"
12
HOMEPAGE="http://www.haproxy.org"
13 13
if [[ ${PV} != *9999 ]]; then
14 14
	SRC_URI="http://haproxy.1wt.eu/download/$(get_version_component_range 1-2)/src/${MY_P}.tar.gz"
15
	KEYWORDS="~amd64 ~arm ~ppc ~x86"
15
	KEYWORDS="amd64 arm ppc x86"
16 16
else
17 17
	EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(get_version_component_range 1-2).git/"
18 18
	EGIT_BRANCH=master
......
20 20

  
21 21
LICENSE="GPL-2 LGPL-2.1"
22 22
SLOT="0"
23
IUSE="+crypt doc examples libressl slz net_ns +pcre pcre-jit ssl tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
23
IUSE="+crypt doc examples libressl slz net_ns +pcre pcre-jit pcre2 pcre2-jit ssl
24
systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
24 25
REQUIRED_USE="pcre-jit? ( pcre )
26
	pcre2-jit? ( pcre2 )
27
	pcre? ( !pcre2 )
25 28
	device-atlas? ( pcre )
26 29
	?? ( slz zlib )"
27 30

  
......
30 33
		dev-libs/libpcre
31 34
		pcre-jit? ( dev-libs/libpcre[jit] )
32 35
	)
36
	pcre2? (
37
		dev-libs/libpcre
38
		pcre2-jit? ( dev-libs/libpcre2[jit] )
39
	)
33 40
	ssl? (
34 41
		!libressl? ( dev-libs/openssl:0=[zlib?] )
35 42
		libressl? ( dev-libs/libressl:0= )
......
43 50
S="${WORKDIR}/${MY_P}"
44 51

  
45 52
DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
46
version_is_at_least 1.7.0 $PV && PATCHES=( "${FILESDIR}"/haproxy-1.7-contrib.patch )
47 53
CONTRIBS=( halog iprange )
48 54
# ip6range is present in 1.6, but broken.
49 55
version_is_at_least 1.7.0 $PV && CONTRIBS+=( ip6range spoa_example tcploop )
56
# TODO: mod_defender - requires apache / APR, modsecurity - the same
57
version_is_at_least 1.8.0 $PV && CONTRIBS+=( hpack )
50 58

  
51 59
haproxy_use() {
52 60
	(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
......
71 79
		USE_TFO=1
72 80
	)
73 81

  
82
	# TODO: PCRE2_WIDTH?
83
	args+=( $(haproxy_use threads THREAD) )
74 84
	args+=( $(haproxy_use crypt LIBCRYPT) )
75 85
	args+=( $(haproxy_use net_ns NS) )
76 86
	args+=( $(haproxy_use pcre PCRE) )
......
82 92
	args+=( $(haproxy_use 51degrees 51DEGREES) )
83 93
	args+=( $(haproxy_use device-atlas DEVICEATLAS) )
84 94
	args+=( $(haproxy_use wurfl WURFL) )
95
	args+=( $(haproxy_use systemd SYSTEMD) )
85 96

  
86 97
	# For now, until the strict-aliasing breakage will be fixed
87 98
	append-cflags -fno-strict-aliasing
......
99 110

  
100 111
src_install() {
101 112
	dosbin haproxy
102
	dosym /usr/sbin/haproxy /usr/bin/haproxy
113
	dosym ../sbin/haproxy /usr/bin/haproxy
103 114

  
104 115
	newconfd "${FILESDIR}/${PN}.confd" $PN
105 116
	newinitd "${FILESDIR}/${PN}.initd-r6" $PN
106 117

  
107 118
	doman doc/haproxy.1
108 119

  
109
	dosbin haproxy-systemd-wrapper
110
	dosym /usr/sbin/haproxy-systemd-wrapper /usr/bin/haproxy-systemd-wrapper
111 120
	systemd_dounit contrib/systemd/haproxy.service
112 121

  
113 122
	einstalldocs
......
130 139
		has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example
131 140
		has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example
132 141
		has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop
142
		has "hpack" "${CONTRIBS[@]}" && newbin contrib/hpack/gen-rht haproxy_hpack
133 143
	fi
134 144

  
135 145
	if use examples ; then
Thank you!