| 1 |
commit: f1221ed5ec25c2d86b99860d07c2d1b047d6beb5 |
| 2 |
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Apr 24 09:16:29 2020 +0000 |
| 4 |
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Apr 24 09:16:55 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1221ed5 |
| 7 |
|
| 8 |
net-proxy/haproxy: GLEP 81 accts, #701218. Thanks to Tomáš Mózes |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
| 11 |
Signed-off-by: Christian Ruppert <idl0r <AT> gentoo.org> |
| 12 |
|
| 13 |
...aproxy-1.9.9999.ebuild => haproxy-1.8.25-r1.ebuild} | 18 +++++++----------- |
| 14 |
...aproxy-1.9.9999.ebuild => haproxy-1.9.15-r1.ebuild} | 11 +++++------ |
| 15 |
net-proxy/haproxy/haproxy-1.9.9999.ebuild | 11 +++++------ |
| 16 |
...aproxy-2.1.3-r1.ebuild => haproxy-2.0.14-r1.ebuild} | 4 ++-- |
| 17 |
net-proxy/haproxy/haproxy-2.0.9999.ebuild | 11 +++++------ |
| 18 |
...haproxy-2.1.3-r1.ebuild => haproxy-2.1.4-r1.ebuild} | 4 ++-- |
| 19 |
net-proxy/haproxy/haproxy-2.1.9999.ebuild | 11 +++++------ |
| 20 |
7 files changed, 31 insertions(+), 39 deletions(-) |
| 21 |
|
| 22 |
diff --git a/net-proxy/haproxy/haproxy-1.9.9999.ebuild b/net-proxy/haproxy/haproxy-1.8.25-r1.ebuild |
| 23 |
similarity index 89% |
| 24 |
copy from net-proxy/haproxy/haproxy-1.9.9999.ebuild |
| 25 |
copy to net-proxy/haproxy/haproxy-1.8.25-r1.ebuild |
| 26 |
index 0eacacdc48d..9186d522055 100644 |
| 27 |
--- a/net-proxy/haproxy/haproxy-1.9.9999.ebuild |
| 28 |
+++ b/net-proxy/haproxy/haproxy-1.8.25-r1.ebuild |
| 29 |
@@ -1,10 +1,10 @@ |
| 30 |
-# Copyright 1999-2019 Gentoo Authors |
| 31 |
+# Copyright 1999-2020 Gentoo Authors |
| 32 |
# Distributed under the terms of the GNU General Public License v2 |
| 33 |
|
| 34 |
EAPI="7" |
| 35 |
|
| 36 |
[[ ${PV} == *9999 ]] && SCM="git-r3" |
| 37 |
-inherit user toolchain-funcs flag-o-matic systemd linux-info $SCM |
| 38 |
+inherit toolchain-funcs flag-o-matic systemd linux-info $SCM |
| 39 |
|
| 40 |
MY_P="${PN}-${PV/_beta/-dev}" |
| 41 |
|
| 42 |
@@ -45,7 +45,9 @@ DEPEND=" |
| 43 |
zlib? ( sys-libs/zlib ) |
| 44 |
lua? ( dev-lang/lua:5.3 ) |
| 45 |
device-atlas? ( dev-libs/device-atlas-api-c )" |
| 46 |
-RDEPEND="${DEPEND}" |
| 47 |
+RDEPEND="${DEPEND} |
| 48 |
+ acct-group/haproxy |
| 49 |
+ acct-user/haproxy" |
| 50 |
|
| 51 |
S="${WORKDIR}/${MY_P}" |
| 52 |
|
| 53 |
@@ -63,9 +65,6 @@ haproxy_use() { |
| 54 |
} |
| 55 |
|
| 56 |
pkg_setup() { |
| 57 |
- enewgroup haproxy |
| 58 |
- enewuser haproxy -1 -1 -1 haproxy |
| 59 |
- |
| 60 |
if use net_ns; then |
| 61 |
CONFIG_CHECK="~NET_NS" |
| 62 |
linux-info_pkg_setup |
| 63 |
@@ -86,8 +85,6 @@ src_compile() { |
| 64 |
args+=( $(haproxy_use net_ns NS) ) |
| 65 |
args+=( $(haproxy_use pcre PCRE) ) |
| 66 |
args+=( $(haproxy_use pcre-jit PCRE_JIT) ) |
| 67 |
- args+=( $(haproxy_use pcre2 PCRE2) ) |
| 68 |
- args+=( $(haproxy_use pcre2-jit PCRE2_JIT) ) |
| 69 |
args+=( $(haproxy_use ssl OPENSSL) ) |
| 70 |
args+=( $(haproxy_use slz SLZ) ) |
| 71 |
args+=( $(haproxy_use zlib ZLIB) ) |
| 72 |
@@ -105,9 +102,8 @@ src_compile() { |
| 73 |
|
| 74 |
if use tools ; then |
| 75 |
for contrib in ${CONTRIBS[@]} ; do |
| 76 |
- # Those two includes are a workaround for hpack Makefile missing those |
| 77 |
emake -C contrib/${contrib} \ |
| 78 |
- CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]} |
| 79 |
+ CFLAGS="${CFLAGS}" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]} |
| 80 |
done |
| 81 |
fi |
| 82 |
} |
| 83 |
@@ -167,7 +163,7 @@ pkg_postinst() { |
| 84 |
if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then |
| 85 |
einfo "Please consult the installed documentation for learning the configuration file's syntax." |
| 86 |
einfo "The documentation and sample configuration files are installed here:" |
| 87 |
- einfo " ${EROOT}/usr/share/doc/${PF}" |
| 88 |
+ einfo " ${EROOT}usr/share/doc/${PF}" |
| 89 |
fi |
| 90 |
fi |
| 91 |
} |
| 92 |
|
| 93 |
diff --git a/net-proxy/haproxy/haproxy-1.9.9999.ebuild b/net-proxy/haproxy/haproxy-1.9.15-r1.ebuild |
| 94 |
similarity index 96% |
| 95 |
copy from net-proxy/haproxy/haproxy-1.9.9999.ebuild |
| 96 |
copy to net-proxy/haproxy/haproxy-1.9.15-r1.ebuild |
| 97 |
index 0eacacdc48d..7239bbf7149 100644 |
| 98 |
--- a/net-proxy/haproxy/haproxy-1.9.9999.ebuild |
| 99 |
+++ b/net-proxy/haproxy/haproxy-1.9.15-r1.ebuild |
| 100 |
@@ -1,10 +1,10 @@ |
| 101 |
-# Copyright 1999-2019 Gentoo Authors |
| 102 |
+# Copyright 1999-2020 Gentoo Authors |
| 103 |
# Distributed under the terms of the GNU General Public License v2 |
| 104 |
|
| 105 |
EAPI="7" |
| 106 |
|
| 107 |
[[ ${PV} == *9999 ]] && SCM="git-r3" |
| 108 |
-inherit user toolchain-funcs flag-o-matic systemd linux-info $SCM |
| 109 |
+inherit toolchain-funcs flag-o-matic systemd linux-info $SCM |
| 110 |
|
| 111 |
MY_P="${PN}-${PV/_beta/-dev}" |
| 112 |
|
| 113 |
@@ -45,7 +45,9 @@ DEPEND=" |
| 114 |
zlib? ( sys-libs/zlib ) |
| 115 |
lua? ( dev-lang/lua:5.3 ) |
| 116 |
device-atlas? ( dev-libs/device-atlas-api-c )" |
| 117 |
-RDEPEND="${DEPEND}" |
| 118 |
+RDEPEND="${DEPEND} |
| 119 |
+ acct-group/haproxy |
| 120 |
+ acct-user/haproxy" |
| 121 |
|
| 122 |
S="${WORKDIR}/${MY_P}" |
| 123 |
|
| 124 |
@@ -63,9 +65,6 @@ haproxy_use() { |
| 125 |
} |
| 126 |
|
| 127 |
pkg_setup() { |
| 128 |
- enewgroup haproxy |
| 129 |
- enewuser haproxy -1 -1 -1 haproxy |
| 130 |
- |
| 131 |
if use net_ns; then |
| 132 |
CONFIG_CHECK="~NET_NS" |
| 133 |
linux-info_pkg_setup |
| 134 |
|
| 135 |
diff --git a/net-proxy/haproxy/haproxy-1.9.9999.ebuild b/net-proxy/haproxy/haproxy-1.9.9999.ebuild |
| 136 |
index 0eacacdc48d..7239bbf7149 100644 |
| 137 |
--- a/net-proxy/haproxy/haproxy-1.9.9999.ebuild |
| 138 |
+++ b/net-proxy/haproxy/haproxy-1.9.9999.ebuild |
| 139 |
@@ -1,10 +1,10 @@ |
| 140 |
-# Copyright 1999-2019 Gentoo Authors |
| 141 |
+# Copyright 1999-2020 Gentoo Authors |
| 142 |
# Distributed under the terms of the GNU General Public License v2 |
| 143 |
|
| 144 |
EAPI="7" |
| 145 |
|
| 146 |
[[ ${PV} == *9999 ]] && SCM="git-r3" |
| 147 |
-inherit user toolchain-funcs flag-o-matic systemd linux-info $SCM |
| 148 |
+inherit toolchain-funcs flag-o-matic systemd linux-info $SCM |
| 149 |
|
| 150 |
MY_P="${PN}-${PV/_beta/-dev}" |
| 151 |
|
| 152 |
@@ -45,7 +45,9 @@ DEPEND=" |
| 153 |
zlib? ( sys-libs/zlib ) |
| 154 |
lua? ( dev-lang/lua:5.3 ) |
| 155 |
device-atlas? ( dev-libs/device-atlas-api-c )" |
| 156 |
-RDEPEND="${DEPEND}" |
| 157 |
+RDEPEND="${DEPEND} |
| 158 |
+ acct-group/haproxy |
| 159 |
+ acct-user/haproxy" |
| 160 |
|
| 161 |
S="${WORKDIR}/${MY_P}" |
| 162 |
|
| 163 |
@@ -63,9 +65,6 @@ haproxy_use() { |
| 164 |
} |
| 165 |
|
| 166 |
pkg_setup() { |
| 167 |
- enewgroup haproxy |
| 168 |
- enewuser haproxy -1 -1 -1 haproxy |
| 169 |
- |
| 170 |
if use net_ns; then |
| 171 |
CONFIG_CHECK="~NET_NS" |
| 172 |
linux-info_pkg_setup |
| 173 |
|
| 174 |
diff --git a/net-proxy/haproxy/haproxy-2.1.3-r1.ebuild b/net-proxy/haproxy/haproxy-2.0.14-r1.ebuild |
| 175 |
similarity index 99% |
| 176 |
copy from net-proxy/haproxy/haproxy-2.1.3-r1.ebuild |
| 177 |
copy to net-proxy/haproxy/haproxy-2.0.14-r1.ebuild |
| 178 |
index b639eeee5f5..7e2cb38725c 100644 |
| 179 |
--- a/net-proxy/haproxy/haproxy-2.1.3-r1.ebuild |
| 180 |
+++ b/net-proxy/haproxy/haproxy-2.0.14-r1.ebuild |
| 181 |
@@ -46,8 +46,8 @@ DEPEND=" |
| 182 |
lua? ( dev-lang/lua:5.3 ) |
| 183 |
device-atlas? ( dev-libs/device-atlas-api-c )" |
| 184 |
RDEPEND="${DEPEND} |
| 185 |
- acct-group/haproxy |
| 186 |
- acct-user/haproxy" |
| 187 |
+ acct-group/haproxy |
| 188 |
+ acct-user/haproxy" |
| 189 |
|
| 190 |
S="${WORKDIR}/${MY_P}" |
| 191 |
|
| 192 |
|
| 193 |
diff --git a/net-proxy/haproxy/haproxy-2.0.9999.ebuild b/net-proxy/haproxy/haproxy-2.0.9999.ebuild |
| 194 |
index 06e10c93669..7e2cb38725c 100644 |
| 195 |
--- a/net-proxy/haproxy/haproxy-2.0.9999.ebuild |
| 196 |
+++ b/net-proxy/haproxy/haproxy-2.0.9999.ebuild |
| 197 |
@@ -1,10 +1,10 @@ |
| 198 |
-# Copyright 1999-2019 Gentoo Authors |
| 199 |
+# Copyright 1999-2020 Gentoo Authors |
| 200 |
# Distributed under the terms of the GNU General Public License v2 |
| 201 |
|
| 202 |
EAPI="7" |
| 203 |
|
| 204 |
[[ ${PV} == *9999 ]] && SCM="git-r3" |
| 205 |
-inherit user toolchain-funcs flag-o-matic systemd linux-info $SCM |
| 206 |
+inherit toolchain-funcs flag-o-matic systemd linux-info $SCM |
| 207 |
|
| 208 |
MY_P="${PN}-${PV/_beta/-dev}" |
| 209 |
|
| 210 |
@@ -45,7 +45,9 @@ DEPEND=" |
| 211 |
zlib? ( sys-libs/zlib ) |
| 212 |
lua? ( dev-lang/lua:5.3 ) |
| 213 |
device-atlas? ( dev-libs/device-atlas-api-c )" |
| 214 |
-RDEPEND="${DEPEND}" |
| 215 |
+RDEPEND="${DEPEND} |
| 216 |
+ acct-group/haproxy |
| 217 |
+ acct-user/haproxy" |
| 218 |
|
| 219 |
S="${WORKDIR}/${MY_P}" |
| 220 |
|
| 221 |
@@ -63,9 +65,6 @@ haproxy_use() { |
| 222 |
} |
| 223 |
|
| 224 |
pkg_setup() { |
| 225 |
- enewgroup haproxy |
| 226 |
- enewuser haproxy -1 -1 -1 haproxy |
| 227 |
- |
| 228 |
if use net_ns; then |
| 229 |
CONFIG_CHECK="~NET_NS" |
| 230 |
linux-info_pkg_setup |
| 231 |
|
| 232 |
diff --git a/net-proxy/haproxy/haproxy-2.1.3-r1.ebuild b/net-proxy/haproxy/haproxy-2.1.4-r1.ebuild |
| 233 |
similarity index 99% |
| 234 |
rename from net-proxy/haproxy/haproxy-2.1.3-r1.ebuild |
| 235 |
rename to net-proxy/haproxy/haproxy-2.1.4-r1.ebuild |
| 236 |
index b639eeee5f5..7e2cb38725c 100644 |
| 237 |
--- a/net-proxy/haproxy/haproxy-2.1.3-r1.ebuild |
| 238 |
+++ b/net-proxy/haproxy/haproxy-2.1.4-r1.ebuild |
| 239 |
@@ -46,8 +46,8 @@ DEPEND=" |
| 240 |
lua? ( dev-lang/lua:5.3 ) |
| 241 |
device-atlas? ( dev-libs/device-atlas-api-c )" |
| 242 |
RDEPEND="${DEPEND} |
| 243 |
- acct-group/haproxy |
| 244 |
- acct-user/haproxy" |
| 245 |
+ acct-group/haproxy |
| 246 |
+ acct-user/haproxy" |
| 247 |
|
| 248 |
S="${WORKDIR}/${MY_P}" |
| 249 |
|
| 250 |
|
| 251 |
diff --git a/net-proxy/haproxy/haproxy-2.1.9999.ebuild b/net-proxy/haproxy/haproxy-2.1.9999.ebuild |
| 252 |
index 06e10c93669..7e2cb38725c 100644 |
| 253 |
--- a/net-proxy/haproxy/haproxy-2.1.9999.ebuild |
| 254 |
+++ b/net-proxy/haproxy/haproxy-2.1.9999.ebuild |
| 255 |
@@ -1,10 +1,10 @@ |
| 256 |
-# Copyright 1999-2019 Gentoo Authors |
| 257 |
+# Copyright 1999-2020 Gentoo Authors |
| 258 |
# Distributed under the terms of the GNU General Public License v2 |
| 259 |
|
| 260 |
EAPI="7" |
| 261 |
|
| 262 |
[[ ${PV} == *9999 ]] && SCM="git-r3" |
| 263 |
-inherit user toolchain-funcs flag-o-matic systemd linux-info $SCM |
| 264 |
+inherit toolchain-funcs flag-o-matic systemd linux-info $SCM |
| 265 |
|
| 266 |
MY_P="${PN}-${PV/_beta/-dev}" |
| 267 |
|
| 268 |
@@ -45,7 +45,9 @@ DEPEND=" |
| 269 |
zlib? ( sys-libs/zlib ) |
| 270 |
lua? ( dev-lang/lua:5.3 ) |
| 271 |
device-atlas? ( dev-libs/device-atlas-api-c )" |
| 272 |
-RDEPEND="${DEPEND}" |
| 273 |
+RDEPEND="${DEPEND} |
| 274 |
+ acct-group/haproxy |
| 275 |
+ acct-user/haproxy" |
| 276 |
|
| 277 |
S="${WORKDIR}/${MY_P}" |
| 278 |
|
| 279 |
@@ -63,9 +65,6 @@ haproxy_use() { |
| 280 |
} |
| 281 |
|
| 282 |
pkg_setup() { |
| 283 |
- enewgroup haproxy |
| 284 |
- enewuser haproxy -1 -1 -1 haproxy |
| 285 |
- |
| 286 |
if use net_ns; then |
| 287 |
CONFIG_CHECK="~NET_NS" |
| 288 |
linux-info_pkg_setup |
Archives