Diff haproxy-1.6.11-r2 with a haproxy-1.6.14

/usr/portage/net-proxy/haproxy/haproxy-1.6.14.ebuild 2018-01-08 12:09:00.000000000 +0300
1
# Copyright 1999-2017 Gentoo Foundation
1
# Copyright 1999-2018 Gentoo Foundation
2 2
# Distributed under the terms of the GNU General Public License v2
3 3

  
4 4
EAPI="6"
......
12 12
HOMEPAGE="http://haproxy.1wt.eu"
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
......
63 63
	fi
64 64
}
65 65

  
66
src_prepare() {
67
	default
68

  
69
	sed -e 's:@SBINDIR@:'/usr/bin':' contrib/systemd/haproxy.service.in \
70
		> contrib/systemd/haproxy.service || die
71

  
72
	sed -ie 's:/usr/sbin/haproxy:/usr/bin/haproxy:' src/haproxy-systemd-wrapper.c || die
73
}
74

  
75 66
src_compile() {
76 67
	local -a args=(
77 68
		TARGET=linux2628
......
95 86
	append-cflags -fno-strict-aliasing
96 87

  
97 88
	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
89
	emake -C contrib/systemd SBINDIR=/usr/sbin
98 90

  
99 91
	if use tools ; then
100 92
		for contrib in ${CONTRIBS[@]} ; do
......
105 97
}
106 98

  
107 99
src_install() {
108
	dobin haproxy
100
	dosbin haproxy
101
	dosym /usr/sbin/haproxy /usr/bin/haproxy
109 102

  
110 103
	newconfd "${FILESDIR}/${PN}.confd" $PN
111 104
	newinitd "${FILESDIR}/${PN}.initd-r6" $PN
112 105

  
113 106
	doman doc/haproxy.1
114 107

  
115
	dobin haproxy-systemd-wrapper
108
	dosbin haproxy-systemd-wrapper
109
	dosym /usr/sbin/haproxy-systemd-wrapper /usr/bin/haproxy-systemd-wrapper
116 110
	systemd_dounit contrib/systemd/haproxy.service
117 111

  
118 112
	einstalldocs
Thank you!