commit: f1221ed5ec25c2d86b99860d07c2d1b047d6beb5
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 24 09:16:29 2020 +0000
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Fri Apr 24 09:16:55 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1221ed5
net-proxy/haproxy: GLEP 81 accts, #701218. Thanks to Tomáš Mózes
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Christian Ruppert <idl0r <AT> gentoo.org>
...aproxy-1.9.9999.ebuild => haproxy-1.8.25-r1.ebuild} | 18 +++++++-----------
...aproxy-1.9.9999.ebuild => haproxy-1.9.15-r1.ebuild} | 11 +++++------
net-proxy/haproxy/haproxy-1.9.9999.ebuild | 11 +++++------
...aproxy-2.1.3-r1.ebuild => haproxy-2.0.14-r1.ebuild} | 4 ++--
net-proxy/haproxy/haproxy-2.0.9999.ebuild | 11 +++++------
...haproxy-2.1.3-r1.ebuild => haproxy-2.1.4-r1.ebuild} | 4 ++--
net-proxy/haproxy/haproxy-2.1.9999.ebuild | 11 +++++------
7 files changed, 31 insertions(+), 39 deletions(-)
diff --git a/net-proxy/haproxy/haproxy-1.9.9999.ebuild
b/net-proxy/haproxy/haproxy-1.8.25-r1.ebuild
similarity index 89%
copy from net-proxy/haproxy/haproxy-1.9.9999.ebuild
copy to net-proxy/haproxy/haproxy-1.8.25-r1.ebuild
index 0eacacdc48d..9186d522055 100644
--- a/net-proxy/haproxy/haproxy-1.9.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-1.8.25-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit user toolchain-funcs flag-o-matic systemd linux-info $SCM
+inherit toolchain-funcs flag-o-matic systemd linux-info $SCM
MY_P="${PN}-${PV/_beta/-dev}"
@@ -45,7 +45,9 @@ DEPEND="
zlib? ( sys-libs/zlib )
lua? ( dev-lang/lua:5.3 )
device-atlas? ( dev-libs/device-atlas-api-c )"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+ acct-group/haproxy
+ acct-user/haproxy"
S="${WORKDIR}/${MY_P}"
@@ -63,9 +65,6 @@ haproxy_use() {
}
pkg_setup() {
- enewgroup haproxy
- enewuser haproxy -1 -1 -1 haproxy
-
if use net_ns; then
CONFIG_CHECK="~NET_NS"
linux-info_pkg_setup
@@ -86,8 +85,6 @@ src_compile() {
args+=( $(haproxy_use net_ns NS) )
args+=( $(haproxy_use pcre PCRE) )
args+=( $(haproxy_use pcre-jit PCRE_JIT) )
- args+=( $(haproxy_use pcre2 PCRE2) )
- args+=( $(haproxy_use pcre2-jit PCRE2_JIT) )
args+=( $(haproxy_use ssl OPENSSL) )
args+=( $(haproxy_use slz SLZ) )
args+=( $(haproxy_use zlib ZLIB) )
@@ -105,9 +102,8 @@ src_compile() {
if use tools ; then
for contrib in ${CONTRIBS[@]} ; do
- # Those two includes are a workaround for hpack
Makefile missing those
emake -C contrib/${contrib} \
- CFLAGS="${CFLAGS} -I../../include/
-I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC)
${args[@]}
+ CFLAGS="${CFLAGS}" OPTIMIZE="${CFLAGS}"
LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
done
fi
}
@@ -167,7 +163,7 @@ pkg_postinst() {
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}"
+ einfo " ${EROOT}usr/share/doc/${PF}"
fi
fi
}
diff --git a/net-proxy/haproxy/haproxy-1.9.9999.ebuild
b/net-proxy/haproxy/haproxy-1.9.15-r1.ebuild
similarity index 96%
copy from net-proxy/haproxy/haproxy-1.9.9999.ebuild
copy to net-proxy/haproxy/haproxy-1.9.15-r1.ebuild
index 0eacacdc48d..7239bbf7149 100644
--- a/net-proxy/haproxy/haproxy-1.9.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-1.9.15-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit user toolchain-funcs flag-o-matic systemd linux-info $SCM
+inherit toolchain-funcs flag-o-matic systemd linux-info $SCM
MY_P="${PN}-${PV/_beta/-dev}"
@@ -45,7 +45,9 @@ DEPEND="
zlib? ( sys-libs/zlib )
lua? ( dev-lang/lua:5.3 )
device-atlas? ( dev-libs/device-atlas-api-c )"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+ acct-group/haproxy
+ acct-user/haproxy"
S="${WORKDIR}/${MY_P}"
@@ -63,9 +65,6 @@ haproxy_use() {
}
pkg_setup() {
- enewgroup haproxy
- enewuser haproxy -1 -1 -1 haproxy
-
if use net_ns; then
CONFIG_CHECK="~NET_NS"
linux-info_pkg_setup
diff --git a/net-proxy/haproxy/haproxy-1.9.9999.ebuild
b/net-proxy/haproxy/haproxy-1.9.9999.ebuild
index 0eacacdc48d..7239bbf7149 100644
--- a/net-proxy/haproxy/haproxy-1.9.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-1.9.9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit user toolchain-funcs flag-o-matic systemd linux-info $SCM
+inherit toolchain-funcs flag-o-matic systemd linux-info $SCM
MY_P="${PN}-${PV/_beta/-dev}"
@@ -45,7 +45,9 @@ DEPEND="
zlib? ( sys-libs/zlib )
lua? ( dev-lang/lua:5.3 )
device-atlas? ( dev-libs/device-atlas-api-c )"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+ acct-group/haproxy
+ acct-user/haproxy"
S="${WORKDIR}/${MY_P}"
@@ -63,9 +65,6 @@ haproxy_use() {
}
pkg_setup() {
- enewgroup haproxy
- enewuser haproxy -1 -1 -1 haproxy
-
if use net_ns; then
CONFIG_CHECK="~NET_NS"
linux-info_pkg_setup
diff --git a/net-proxy/haproxy/haproxy-2.1.3-r1.ebuild
b/net-proxy/haproxy/haproxy-2.0.14-r1.ebuild
similarity index 99%
copy from net-proxy/haproxy/haproxy-2.1.3-r1.ebuild
copy to net-proxy/haproxy/haproxy-2.0.14-r1.ebuild
index b639eeee5f5..7e2cb38725c 100644
--- a/net-proxy/haproxy/haproxy-2.1.3-r1.ebuild
+++ b/net-proxy/haproxy/haproxy-2.0.14-r1.ebuild
@@ -46,8 +46,8 @@ DEPEND="
lua? ( dev-lang/lua:5.3 )
device-atlas? ( dev-libs/device-atlas-api-c )"
RDEPEND="${DEPEND}
- acct-group/haproxy
- acct-user/haproxy"
+ acct-group/haproxy
+ acct-user/haproxy"
S="${WORKDIR}/${MY_P}"
diff --git a/net-proxy/haproxy/haproxy-2.0.9999.ebuild
b/net-proxy/haproxy/haproxy-2.0.9999.ebuild
index 06e10c93669..7e2cb38725c 100644
--- a/net-proxy/haproxy/haproxy-2.0.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.0.9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit user toolchain-funcs flag-o-matic systemd linux-info $SCM
+inherit toolchain-funcs flag-o-matic systemd linux-info $SCM
MY_P="${PN}-${PV/_beta/-dev}"
@@ -45,7 +45,9 @@ DEPEND="
zlib? ( sys-libs/zlib )
lua? ( dev-lang/lua:5.3 )
device-atlas? ( dev-libs/device-atlas-api-c )"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+ acct-group/haproxy
+ acct-user/haproxy"
S="${WORKDIR}/${MY_P}"
@@ -63,9 +65,6 @@ haproxy_use() {
}
pkg_setup() {
- enewgroup haproxy
- enewuser haproxy -1 -1 -1 haproxy
-
if use net_ns; then
CONFIG_CHECK="~NET_NS"
linux-info_pkg_setup
diff --git a/net-proxy/haproxy/haproxy-2.1.3-r1.ebuild
b/net-proxy/haproxy/haproxy-2.1.4-r1.ebuild
similarity index 99%
rename from net-proxy/haproxy/haproxy-2.1.3-r1.ebuild
rename to net-proxy/haproxy/haproxy-2.1.4-r1.ebuild
index b639eeee5f5..7e2cb38725c 100644
--- a/net-proxy/haproxy/haproxy-2.1.3-r1.ebuild
+++ b/net-proxy/haproxy/haproxy-2.1.4-r1.ebuild
@@ -46,8 +46,8 @@ DEPEND="
lua? ( dev-lang/lua:5.3 )
device-atlas? ( dev-libs/device-atlas-api-c )"
RDEPEND="${DEPEND}
- acct-group/haproxy
- acct-user/haproxy"
+ acct-group/haproxy
+ acct-user/haproxy"
S="${WORKDIR}/${MY_P}"
diff --git a/net-proxy/haproxy/haproxy-2.1.9999.ebuild
b/net-proxy/haproxy/haproxy-2.1.9999.ebuild
index 06e10c93669..7e2cb38725c 100644
--- a/net-proxy/haproxy/haproxy-2.1.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.1.9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit user toolchain-funcs flag-o-matic systemd linux-info $SCM
+inherit toolchain-funcs flag-o-matic systemd linux-info $SCM
MY_P="${PN}-${PV/_beta/-dev}"
@@ -45,7 +45,9 @@ DEPEND="
zlib? ( sys-libs/zlib )
lua? ( dev-lang/lua:5.3 )
device-atlas? ( dev-libs/device-atlas-api-c )"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+ acct-group/haproxy
+ acct-user/haproxy"
S="${WORKDIR}/${MY_P}"
@@ -63,9 +65,6 @@ haproxy_use() {
}
pkg_setup() {
- enewgroup haproxy
- enewuser haproxy -1 -1 -1 haproxy
-
if use net_ns; then
CONFIG_CHECK="~NET_NS"
linux-info_pkg_setup
