net-proxy/haproxy: bump & file moves.

- Add 1.7.7 release.
- move haproxy & haproxy-systemd-wrapper binaries to sbin to match
  upstream & other distros, place symlinks in old location.

Package-Manager: portage-2.3.6
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>

1 files changed, 6 insertions, 12 deletions

diff --git a/net-proxy/haproxy/haproxy-1.6.9999-r1.ebuild b/net-proxy/haproxy/haproxy-1.6.9999-r1.ebuild
index dc6dcf334d8c..43c58bdf5bc1 100644
--- a/net-proxy/haproxy/haproxy-1.6.9999-r1.ebuild
+++ b/net-proxy/haproxy/haproxy-1.6.9999-r1.ebuild
@@ -64,15 +64,6 @@ pkg_setup() {
 	fi
 }
 
-src_prepare() {
-	default
-
-	sed -e 's:@SBINDIR@:'/usr/bin':' contrib/systemd/haproxy.service.in \
-		> contrib/systemd/haproxy.service || die
-
-	sed -ie 's:/usr/sbin/haproxy:/usr/bin/haproxy:' src/haproxy-systemd-wrapper.c || die
-}
-
 src_compile() {
 	local -a args=(
 		TARGET=linux2628
@@ -96,6 +87,7 @@ src_compile() {
 	append-cflags -fno-strict-aliasing
 
 	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
+	emake -C contrib/systemd SBINDIR=/usr/sbin
 
 	if use tools ; then
 		for contrib in ${CONTRIBS[@]} ; do
@@ -106,14 +98,16 @@ src_compile() {
 }
 
 src_install() {
-	dobin haproxy
+	dosbin haproxy
+	dosym /usr/sbin/haproxy /usr/bin/haproxy
 
 	newconfd "${FILESDIR}/${PN}.confd" $PN
-	newinitd "${FILESDIR}/${PN}.initd-r4" $PN
+	newinitd "${FILESDIR}/${PN}.initd-r5" $PN
 
 	doman doc/haproxy.1
 
-	dobin haproxy-systemd-wrapper
+	dosbin haproxy-systemd-wrapper
+	dosym /usr/sbin/haproxy-systemd-wrapper /usr/bin/haproxy-systemd-wrapper
 	systemd_dounit contrib/systemd/haproxy.service
 
 	einstalldocs