net-proxy/haproxy: Fix init script (openrc_default_stop -> default_stop) #620418
authorPatrick Lauer <patrick@gentoo.org>
Wed, 21 Jun 2017 18:19:57 +0000 (20:19 +0200)
committerPatrick Lauer <patrick@gentoo.org>
Wed, 21 Jun 2017 18:21:17 +0000 (20:21 +0200)
Package-Manager: Portage-2.3.6, Repoman-2.3.2
RepoMan-Options: --force

net-proxy/haproxy/files/haproxy.initd-r4 [moved from net-proxy/haproxy/files/haproxy.initd-r3 with 95% similarity]
net-proxy/haproxy/haproxy-1.6.11-r1.ebuild [moved from net-proxy/haproxy/haproxy-1.6.11.ebuild with 99% similarity]
net-proxy/haproxy/haproxy-1.6.12-r1.ebuild [moved from net-proxy/haproxy/haproxy-1.6.12.ebuild with 99% similarity]
net-proxy/haproxy/haproxy-1.6.13-r1.ebuild [moved from net-proxy/haproxy/haproxy-1.6.13.ebuild with 99% similarity]
net-proxy/haproxy/haproxy-1.6.9999-r1.ebuild [moved from net-proxy/haproxy/haproxy-1.7.6.ebuild with 99% similarity]
net-proxy/haproxy/haproxy-1.6.9999.ebuild [deleted file]
net-proxy/haproxy/haproxy-1.7.5-r1.ebuild [moved from net-proxy/haproxy/haproxy-1.7.5.ebuild with 99% similarity]
net-proxy/haproxy/haproxy-1.7.6-r1.ebuild [new file with mode: 0644]
net-proxy/haproxy/haproxy-1.7.9999-r1.ebuild [new file with mode: 0644]
net-proxy/haproxy/haproxy-1.7.9999.ebuild [deleted file]

similarity index 95%
rename from net-proxy/haproxy/files/haproxy.initd-r3
rename to net-proxy/haproxy/files/haproxy.initd-r4
index abba9f865345dc104af1796fdfb3aeab9e394b4e..c37719b167528551e117f4ba1240d25d212934fc 100644 (file)
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 extra_commands="checkconfig"
@@ -66,7 +66,7 @@ stop() {
        _t="$(mktemp)"
        for _pid in $(cat ${pidfile}) ; do
                echo "${_pid}" > "${_t}"
-               pidfile="${_t}" openrc_default_stop
+               pidfile="${_t}" default_stop
        done
        rm -f "${_t}"
 }
similarity index 99%
rename from net-proxy/haproxy/haproxy-1.6.11.ebuild
rename to net-proxy/haproxy/haproxy-1.6.11-r1.ebuild
index 39b23851f905b9fb268bf035d170d6ad9dd753e6..06254314e424db6d034f2717ed843960061f396f 100644 (file)
@@ -108,7 +108,7 @@ src_install() {
        dobin haproxy
 
        newconfd "${FILESDIR}/${PN}.confd" $PN
-       newinitd "${FILESDIR}/${PN}.initd-r3" $PN
+       newinitd "${FILESDIR}/${PN}.initd-r4" $PN
 
        doman doc/haproxy.1
 
similarity index 99%
rename from net-proxy/haproxy/haproxy-1.6.12.ebuild
rename to net-proxy/haproxy/haproxy-1.6.12-r1.ebuild
index e1c758115e56b38bbeb55241ddbab350c40d1b3d..11493f6305756ebdfcf3c55778bbcebaf04b7ef9 100644 (file)
@@ -108,7 +108,7 @@ src_install() {
        dobin haproxy
 
        newconfd "${FILESDIR}/${PN}.confd" $PN
-       newinitd "${FILESDIR}/${PN}.initd-r3" $PN
+       newinitd "${FILESDIR}/${PN}.initd-r4" $PN
 
        doman doc/haproxy.1
 
similarity index 99%
rename from net-proxy/haproxy/haproxy-1.6.13.ebuild
rename to net-proxy/haproxy/haproxy-1.6.13-r1.ebuild
index e1c758115e56b38bbeb55241ddbab350c40d1b3d..11493f6305756ebdfcf3c55778bbcebaf04b7ef9 100644 (file)
@@ -108,7 +108,7 @@ src_install() {
        dobin haproxy
 
        newconfd "${FILESDIR}/${PN}.confd" $PN
-       newinitd "${FILESDIR}/${PN}.initd-r3" $PN
+       newinitd "${FILESDIR}/${PN}.initd-r4" $PN
 
        doman doc/haproxy.1
 
similarity index 99%
rename from net-proxy/haproxy/haproxy-1.7.6.ebuild
rename to net-proxy/haproxy/haproxy-1.6.9999-r1.ebuild
index c0a7cc341e62a243c768abca65938b8ba2e3f989..dc6dcf334d8c899295f83db163abd49d5e171550 100644 (file)
@@ -109,7 +109,7 @@ src_install() {
        dobin haproxy
 
        newconfd "${FILESDIR}/${PN}.confd" $PN
-       newinitd "${FILESDIR}/${PN}.initd-r3" $PN
+       newinitd "${FILESDIR}/${PN}.initd-r4" $PN
 
        doman doc/haproxy.1
 
diff --git a/net-proxy/haproxy/haproxy-1.6.9999.ebuild b/net-proxy/haproxy/haproxy-1.6.9999.ebuild
deleted file mode 100644 (file)
index 713e9e8..0000000
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit user versionator toolchain-funcs flag-o-matic systemd linux-info $SCM
-
-MY_P="${PN}-${PV/_beta/-dev}"
-
-DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
-HOMEPAGE="http://haproxy.1wt.eu"
-if [[ ${PV} != *9999 ]]; then
-       SRC_URI="http://haproxy.1wt.eu/download/$(get_version_component_range 1-2)/src/${MY_P}.tar.gz"
-       KEYWORDS="~amd64 ~arm ~ppc ~x86"
-else
-       EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(get_version_component_range 1-2).git/"
-       EGIT_BRANCH=master
-fi
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-IUSE="+crypt doc examples libressl slz net_ns +pcre pcre-jit ssl tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
-REQUIRED_USE="pcre-jit? ( pcre )
-       device-atlas? ( pcre )
-       ?? ( slz zlib )"
-
-DEPEND="
-       pcre? (
-               dev-libs/libpcre
-               pcre-jit? ( dev-libs/libpcre[jit] )
-       )
-       ssl? (
-               !libressl? ( dev-libs/openssl:0=[zlib?] )
-               libressl? ( dev-libs/libressl:0= )
-       )
-       slz? ( dev-libs/libslz:= )
-       zlib? ( sys-libs/zlib )
-       lua? ( dev-lang/lua:5.3 )
-       device-atlas? ( dev-libs/device-atlas-api-c )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
-version_is_at_least 1.7.0 $PV && PATCHES=( "${FILESDIR}"/haproxy-1.7-contrib.patch )
-CONTRIBS=( halog iprange )
-# ip6range is present in 1.6, but broken.
-version_is_at_least 1.7.0 $PV && CONTRIBS+=( ip6range spoa_example tcploop )
-
-haproxy_use() {
-       (( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
-
-       usex "${1}" "USE_${2}=1" "USE_${2}="
-}
-
-pkg_setup() {
-       enewgroup haproxy
-       enewuser haproxy -1 -1 -1 haproxy
-
-       if use net_ns; then
-               CONFIG_CHECK="~NET_NS"
-               linux-info_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
-               USE_GETADDRINFO=1
-               USE_TFO=1
-       )
-
-       args+=( $(haproxy_use crypt LIBCRYPT) )
-       args+=( $(haproxy_use net_ns NS) )
-       args+=( $(haproxy_use pcre PCRE) )
-       args+=( $(haproxy_use pcre-jit PCRE_JIT) )
-       args+=( $(haproxy_use ssl OPENSSL) )
-       args+=( $(haproxy_use slz SLZ) )
-       args+=( $(haproxy_use zlib ZLIB) )
-       args+=( $(haproxy_use lua LUA) )
-       args+=( $(haproxy_use 51degrees 51DEGREES) )
-       args+=( $(haproxy_use device-atlas DEVICEATLAS) )
-       args+=( $(haproxy_use wurfl WURFL) )
-
-       # For now, until the strict-aliasing breakage will be fixed
-       append-cflags -fno-strict-aliasing
-
-       emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
-
-       if use tools ; then
-               for contrib in ${CONTRIBS[@]} ; do
-                       emake -C contrib/${contrib} \
-                               CFLAGS="${CFLAGS}" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
-               done
-       fi
-}
-
-src_install() {
-       dobin haproxy
-
-       newconfd "${FILESDIR}/${PN}.confd" $PN
-       newinitd "${FILESDIR}/${PN}.initd-r3" $PN
-
-       doman doc/haproxy.1
-
-       dobin haproxy-systemd-wrapper
-       systemd_dounit contrib/systemd/haproxy.service
-
-       einstalldocs
-
-       # The errorfiles are used by upstream defaults.
-       insinto /etc/haproxy/errors/
-       doins examples/errorfiles/*
-
-       if use doc; then
-               dodoc ROADMAP doc/*.txt
-               #if use lua; then
-               # TODO: doc/lua-api/
-               #fi
-       fi
-
-       if use tools ; then
-               has halog "${CONTRIBS[@]}" && dobin contrib/halog/halog
-               has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange
-               has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range
-               has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example
-               has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example
-               has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop
-       fi
-
-       if use examples ; then
-               docinto examples
-               dodoc examples/*.cfg
-               dodoc examples/seamless_reload.txt
-       fi
-
-       if use vim-syntax ; then
-               insinto /usr/share/vim/vimfiles/syntax
-               doins examples/haproxy.vim
-       fi
-}
-
-pkg_postinst() {
-       if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then
-               ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service."
-               ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
-               ewarn "Make use of them with the \"user\" and \"group\" directives."
-
-               if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then
-                       einfo "Please consult the installed documentation for learning the configuration file's syntax."
-                       einfo "The documentation and sample configuration files are installed here:"
-                       einfo "   ${EROOT}usr/share/doc/${PF}"
-               fi
-       fi
-}
similarity index 99%
rename from net-proxy/haproxy/haproxy-1.7.5.ebuild
rename to net-proxy/haproxy/haproxy-1.7.5-r1.ebuild
index c0a7cc341e62a243c768abca65938b8ba2e3f989..dc6dcf334d8c899295f83db163abd49d5e171550 100644 (file)
@@ -109,7 +109,7 @@ src_install() {
        dobin haproxy
 
        newconfd "${FILESDIR}/${PN}.confd" $PN
-       newinitd "${FILESDIR}/${PN}.initd-r3" $PN
+       newinitd "${FILESDIR}/${PN}.initd-r4" $PN
 
        doman doc/haproxy.1
 
diff --git a/net-proxy/haproxy/haproxy-1.7.6-r1.ebuild b/net-proxy/haproxy/haproxy-1.7.6-r1.ebuild
new file mode 100644 (file)
index 0000000..dc6dcf3
--- /dev/null
@@ -0,0 +1,165 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+[[ ${PV} == *9999 ]] && SCM="git-r3"
+inherit user versionator toolchain-funcs flag-o-matic systemd linux-info $SCM
+
+MY_P="${PN}-${PV/_beta/-dev}"
+
+DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
+HOMEPAGE="http://haproxy.1wt.eu"
+if [[ ${PV} != *9999 ]]; then
+       SRC_URI="http://haproxy.1wt.eu/download/$(get_version_component_range 1-2)/src/${MY_P}.tar.gz"
+       KEYWORDS="~amd64 ~arm ~ppc ~x86"
+else
+       EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(get_version_component_range 1-2).git/"
+       EGIT_BRANCH=master
+fi
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+IUSE="+crypt doc examples libressl slz net_ns +pcre pcre-jit ssl tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
+REQUIRED_USE="pcre-jit? ( pcre )
+       device-atlas? ( pcre )
+       ?? ( slz zlib )"
+
+DEPEND="
+       pcre? (
+               dev-libs/libpcre
+               pcre-jit? ( dev-libs/libpcre[jit] )
+       )
+       ssl? (
+               !libressl? ( dev-libs/openssl:0=[zlib?] )
+               libressl? ( dev-libs/libressl:0= )
+       )
+       slz? ( dev-libs/libslz:= )
+       zlib? ( sys-libs/zlib )
+       lua? ( dev-lang/lua:5.3 )
+       device-atlas? ( dev-libs/device-atlas-api-c )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
+version_is_at_least 1.7.0 $PV && PATCHES=( "${FILESDIR}"/haproxy-1.7-contrib.patch )
+CONTRIBS=( halog iprange )
+# ip6range is present in 1.6, but broken.
+version_is_at_least 1.7.0 $PV && CONTRIBS+=( ip6range spoa_example tcploop )
+
+haproxy_use() {
+       (( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
+
+       usex "${1}" "USE_${2}=1" "USE_${2}="
+}
+
+pkg_setup() {
+       enewgroup haproxy
+       enewuser haproxy -1 -1 -1 haproxy
+
+       if use net_ns; then
+               CONFIG_CHECK="~NET_NS"
+               linux-info_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
+               USE_GETADDRINFO=1
+               USE_TFO=1
+       )
+
+       args+=( $(haproxy_use crypt LIBCRYPT) )
+       args+=( $(haproxy_use net_ns NS) )
+       args+=( $(haproxy_use pcre PCRE) )
+       args+=( $(haproxy_use pcre-jit PCRE_JIT) )
+       args+=( $(haproxy_use ssl OPENSSL) )
+       args+=( $(haproxy_use slz SLZ) )
+       args+=( $(haproxy_use zlib ZLIB) )
+       args+=( $(haproxy_use lua LUA) )
+       args+=( $(haproxy_use 51degrees 51DEGREES) )
+       args+=( $(haproxy_use device-atlas DEVICEATLAS) )
+       args+=( $(haproxy_use wurfl WURFL) )
+
+       # For now, until the strict-aliasing breakage will be fixed
+       append-cflags -fno-strict-aliasing
+
+       emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
+
+       if use tools ; then
+               for contrib in ${CONTRIBS[@]} ; do
+                       emake -C contrib/${contrib} \
+                               CFLAGS="${CFLAGS}" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
+               done
+       fi
+}
+
+src_install() {
+       dobin haproxy
+
+       newconfd "${FILESDIR}/${PN}.confd" $PN
+       newinitd "${FILESDIR}/${PN}.initd-r4" $PN
+
+       doman doc/haproxy.1
+
+       dobin haproxy-systemd-wrapper
+       systemd_dounit contrib/systemd/haproxy.service
+
+       einstalldocs
+
+       # The errorfiles are used by upstream defaults.
+       insinto /etc/haproxy/errors/
+       doins examples/errorfiles/*
+
+       if use doc; then
+               dodoc ROADMAP doc/*.txt
+               #if use lua; then
+               # TODO: doc/lua-api/
+               #fi
+       fi
+
+       if use tools ; then
+               has halog "${CONTRIBS[@]}" && dobin contrib/halog/halog
+               has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange
+               has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range
+               has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example
+               has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example
+               has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop
+       fi
+
+       if use examples ; then
+               docinto examples
+               dodoc examples/*.cfg
+               dodoc examples/seamless_reload.txt
+       fi
+
+       if use vim-syntax ; then
+               insinto /usr/share/vim/vimfiles/syntax
+               doins examples/haproxy.vim
+       fi
+}
+
+pkg_postinst() {
+       if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then
+               ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service."
+               ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
+               ewarn "Make use of them with the \"user\" and \"group\" directives."
+
+               if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then
+                       einfo "Please consult the installed documentation for learning the configuration file's syntax."
+                       einfo "The documentation and sample configuration files are installed here:"
+                       einfo "   ${EROOT}usr/share/doc/${PF}"
+               fi
+       fi
+}
diff --git a/net-proxy/haproxy/haproxy-1.7.9999-r1.ebuild b/net-proxy/haproxy/haproxy-1.7.9999-r1.ebuild
new file mode 100644 (file)
index 0000000..dc6dcf3
--- /dev/null
@@ -0,0 +1,165 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+[[ ${PV} == *9999 ]] && SCM="git-r3"
+inherit user versionator toolchain-funcs flag-o-matic systemd linux-info $SCM
+
+MY_P="${PN}-${PV/_beta/-dev}"
+
+DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
+HOMEPAGE="http://haproxy.1wt.eu"
+if [[ ${PV} != *9999 ]]; then
+       SRC_URI="http://haproxy.1wt.eu/download/$(get_version_component_range 1-2)/src/${MY_P}.tar.gz"
+       KEYWORDS="~amd64 ~arm ~ppc ~x86"
+else
+       EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(get_version_component_range 1-2).git/"
+       EGIT_BRANCH=master
+fi
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+IUSE="+crypt doc examples libressl slz net_ns +pcre pcre-jit ssl tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
+REQUIRED_USE="pcre-jit? ( pcre )
+       device-atlas? ( pcre )
+       ?? ( slz zlib )"
+
+DEPEND="
+       pcre? (
+               dev-libs/libpcre
+               pcre-jit? ( dev-libs/libpcre[jit] )
+       )
+       ssl? (
+               !libressl? ( dev-libs/openssl:0=[zlib?] )
+               libressl? ( dev-libs/libressl:0= )
+       )
+       slz? ( dev-libs/libslz:= )
+       zlib? ( sys-libs/zlib )
+       lua? ( dev-lang/lua:5.3 )
+       device-atlas? ( dev-libs/device-atlas-api-c )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
+version_is_at_least 1.7.0 $PV && PATCHES=( "${FILESDIR}"/haproxy-1.7-contrib.patch )
+CONTRIBS=( halog iprange )
+# ip6range is present in 1.6, but broken.
+version_is_at_least 1.7.0 $PV && CONTRIBS+=( ip6range spoa_example tcploop )
+
+haproxy_use() {
+       (( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
+
+       usex "${1}" "USE_${2}=1" "USE_${2}="
+}
+
+pkg_setup() {
+       enewgroup haproxy
+       enewuser haproxy -1 -1 -1 haproxy
+
+       if use net_ns; then
+               CONFIG_CHECK="~NET_NS"
+               linux-info_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
+               USE_GETADDRINFO=1
+               USE_TFO=1
+       )
+
+       args+=( $(haproxy_use crypt LIBCRYPT) )
+       args+=( $(haproxy_use net_ns NS) )
+       args+=( $(haproxy_use pcre PCRE) )
+       args+=( $(haproxy_use pcre-jit PCRE_JIT) )
+       args+=( $(haproxy_use ssl OPENSSL) )
+       args+=( $(haproxy_use slz SLZ) )
+       args+=( $(haproxy_use zlib ZLIB) )
+       args+=( $(haproxy_use lua LUA) )
+       args+=( $(haproxy_use 51degrees 51DEGREES) )
+       args+=( $(haproxy_use device-atlas DEVICEATLAS) )
+       args+=( $(haproxy_use wurfl WURFL) )
+
+       # For now, until the strict-aliasing breakage will be fixed
+       append-cflags -fno-strict-aliasing
+
+       emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
+
+       if use tools ; then
+               for contrib in ${CONTRIBS[@]} ; do
+                       emake -C contrib/${contrib} \
+                               CFLAGS="${CFLAGS}" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
+               done
+       fi
+}
+
+src_install() {
+       dobin haproxy
+
+       newconfd "${FILESDIR}/${PN}.confd" $PN
+       newinitd "${FILESDIR}/${PN}.initd-r4" $PN
+
+       doman doc/haproxy.1
+
+       dobin haproxy-systemd-wrapper
+       systemd_dounit contrib/systemd/haproxy.service
+
+       einstalldocs
+
+       # The errorfiles are used by upstream defaults.
+       insinto /etc/haproxy/errors/
+       doins examples/errorfiles/*
+
+       if use doc; then
+               dodoc ROADMAP doc/*.txt
+               #if use lua; then
+               # TODO: doc/lua-api/
+               #fi
+       fi
+
+       if use tools ; then
+               has halog "${CONTRIBS[@]}" && dobin contrib/halog/halog
+               has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange
+               has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range
+               has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example
+               has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example
+               has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop
+       fi
+
+       if use examples ; then
+               docinto examples
+               dodoc examples/*.cfg
+               dodoc examples/seamless_reload.txt
+       fi
+
+       if use vim-syntax ; then
+               insinto /usr/share/vim/vimfiles/syntax
+               doins examples/haproxy.vim
+       fi
+}
+
+pkg_postinst() {
+       if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then
+               ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service."
+               ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
+               ewarn "Make use of them with the \"user\" and \"group\" directives."
+
+               if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then
+                       einfo "Please consult the installed documentation for learning the configuration file's syntax."
+                       einfo "The documentation and sample configuration files are installed here:"
+                       einfo "   ${EROOT}usr/share/doc/${PF}"
+               fi
+       fi
+}
diff --git a/net-proxy/haproxy/haproxy-1.7.9999.ebuild b/net-proxy/haproxy/haproxy-1.7.9999.ebuild
deleted file mode 100644 (file)
index 713e9e8..0000000
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit user versionator toolchain-funcs flag-o-matic systemd linux-info $SCM
-
-MY_P="${PN}-${PV/_beta/-dev}"
-
-DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
-HOMEPAGE="http://haproxy.1wt.eu"
-if [[ ${PV} != *9999 ]]; then
-       SRC_URI="http://haproxy.1wt.eu/download/$(get_version_component_range 1-2)/src/${MY_P}.tar.gz"
-       KEYWORDS="~amd64 ~arm ~ppc ~x86"
-else
-       EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(get_version_component_range 1-2).git/"
-       EGIT_BRANCH=master
-fi
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-IUSE="+crypt doc examples libressl slz net_ns +pcre pcre-jit ssl tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
-REQUIRED_USE="pcre-jit? ( pcre )
-       device-atlas? ( pcre )
-       ?? ( slz zlib )"
-
-DEPEND="
-       pcre? (
-               dev-libs/libpcre
-               pcre-jit? ( dev-libs/libpcre[jit] )
-       )
-       ssl? (
-               !libressl? ( dev-libs/openssl:0=[zlib?] )
-               libressl? ( dev-libs/libressl:0= )
-       )
-       slz? ( dev-libs/libslz:= )
-       zlib? ( sys-libs/zlib )
-       lua? ( dev-lang/lua:5.3 )
-       device-atlas? ( dev-libs/device-atlas-api-c )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
-version_is_at_least 1.7.0 $PV && PATCHES=( "${FILESDIR}"/haproxy-1.7-contrib.patch )
-CONTRIBS=( halog iprange )
-# ip6range is present in 1.6, but broken.
-version_is_at_least 1.7.0 $PV && CONTRIBS+=( ip6range spoa_example tcploop )
-
-haproxy_use() {
-       (( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
-
-       usex "${1}" "USE_${2}=1" "USE_${2}="
-}
-
-pkg_setup() {
-       enewgroup haproxy
-       enewuser haproxy -1 -1 -1 haproxy
-
-       if use net_ns; then
-               CONFIG_CHECK="~NET_NS"
-               linux-info_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
-               USE_GETADDRINFO=1
-               USE_TFO=1
-       )
-
-       args+=( $(haproxy_use crypt LIBCRYPT) )
-       args+=( $(haproxy_use net_ns NS) )
-       args+=( $(haproxy_use pcre PCRE) )
-       args+=( $(haproxy_use pcre-jit PCRE_JIT) )
-       args+=( $(haproxy_use ssl OPENSSL) )
-       args+=( $(haproxy_use slz SLZ) )
-       args+=( $(haproxy_use zlib ZLIB) )
-       args+=( $(haproxy_use lua LUA) )
-       args+=( $(haproxy_use 51degrees 51DEGREES) )
-       args+=( $(haproxy_use device-atlas DEVICEATLAS) )
-       args+=( $(haproxy_use wurfl WURFL) )
-
-       # For now, until the strict-aliasing breakage will be fixed
-       append-cflags -fno-strict-aliasing
-
-       emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
-
-       if use tools ; then
-               for contrib in ${CONTRIBS[@]} ; do
-                       emake -C contrib/${contrib} \
-                               CFLAGS="${CFLAGS}" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
-               done
-       fi
-}
-
-src_install() {
-       dobin haproxy
-
-       newconfd "${FILESDIR}/${PN}.confd" $PN
-       newinitd "${FILESDIR}/${PN}.initd-r3" $PN
-
-       doman doc/haproxy.1
-
-       dobin haproxy-systemd-wrapper
-       systemd_dounit contrib/systemd/haproxy.service
-
-       einstalldocs
-
-       # The errorfiles are used by upstream defaults.
-       insinto /etc/haproxy/errors/
-       doins examples/errorfiles/*
-
-       if use doc; then
-               dodoc ROADMAP doc/*.txt
-               #if use lua; then
-               # TODO: doc/lua-api/
-               #fi
-       fi
-
-       if use tools ; then
-               has halog "${CONTRIBS[@]}" && dobin contrib/halog/halog
-               has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange
-               has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range
-               has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example
-               has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example
-               has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop
-       fi
-
-       if use examples ; then
-               docinto examples
-               dodoc examples/*.cfg
-               dodoc examples/seamless_reload.txt
-       fi
-
-       if use vim-syntax ; then
-               insinto /usr/share/vim/vimfiles/syntax
-               doins examples/haproxy.vim
-       fi
-}
-
-pkg_postinst() {
-       if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then
-               ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service."
-               ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
-               ewarn "Make use of them with the \"user\" and \"group\" directives."
-
-               if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then
-                       einfo "Please consult the installed documentation for learning the configuration file's syntax."
-                       einfo "The documentation and sample configuration files are installed here:"
-                       einfo "   ${EROOT}usr/share/doc/${PF}"
-               fi
-       fi
-}