| 1 |
commit: 4a0bcfa4da2f591eb0cadc883faafaa41ff9aa4a |
| 2 |
Author: Bertrand Jacquin <bertrand <AT> jacquin <DOT> bzh> |
| 3 |
AuthorDate: Sat Sep 17 23:51:56 2016 +0000 |
| 4 |
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Sep 28 19:53:50 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a0bcfa4 |
| 7 |
|
| 8 |
net-proxy/haproxy: Introduce USE=slz |
| 9 |
|
| 10 |
USE=zlib stay the default one in order to avoid users to have to |
| 11 |
manually satisfy USE flag constraints since USE=zlib and USE=slz are |
| 12 |
mutually exclusive. |
| 13 |
|
| 14 |
Package-Manager: portage-2.2.28 |
| 15 |
Closes: https://github.com/gentoo/gentoo/pull/2293 |
| 16 |
|
| 17 |
Signed-off-by: Christian Ruppert <idl0r <AT> gentoo.org> |
| 18 |
|
| 19 |
net-proxy/haproxy/haproxy-1.6.9.ebuild | 7 +++++-- |
| 20 |
net-proxy/haproxy/haproxy-9999.ebuild | 7 +++++-- |
| 21 |
net-proxy/haproxy/metadata.xml | 1 + |
| 22 |
3 files changed, 11 insertions(+), 4 deletions(-) |
| 23 |
|
| 24 |
diff --git a/net-proxy/haproxy/haproxy-1.6.9.ebuild b/net-proxy/haproxy/haproxy-1.6.9.ebuild |
| 25 |
index a070371..c9a98ed 100644 |
| 26 |
--- a/net-proxy/haproxy/haproxy-1.6.9.ebuild |
| 27 |
+++ b/net-proxy/haproxy/haproxy-1.6.9.ebuild |
| 28 |
@@ -15,8 +15,9 @@ SRC_URI="http://haproxy.1wt.eu/download/$(get_version_component_range 1-2)/src/$ |
| 29 |
LICENSE="GPL-2 LGPL-2.1" |
| 30 |
SLOT="0" |
| 31 |
KEYWORDS="~amd64 ~arm ~ppc ~x86" |
| 32 |
-IUSE="+crypt doc examples libressl net_ns +pcre pcre-jit ssl tools vim-syntax +zlib" # lua |
| 33 |
-REQUIRED_USE="pcre-jit? ( pcre )" |
| 34 |
+IUSE="+crypt doc examples libressl slz net_ns +pcre pcre-jit ssl tools vim-syntax +zlib" # lua |
| 35 |
+REQUIRED_USE="pcre-jit? ( pcre ) |
| 36 |
+ ?? ( slz zlib )" |
| 37 |
|
| 38 |
DEPEND=" |
| 39 |
pcre? ( |
| 40 |
@@ -27,6 +28,7 @@ DEPEND=" |
| 41 |
!libressl? ( dev-libs/openssl:0=[zlib?] ) |
| 42 |
libressl? ( dev-libs/libressl:0= ) |
| 43 |
) |
| 44 |
+ slz? ( dev-libs/libslz:= ) |
| 45 |
zlib? ( sys-libs/zlib )" |
| 46 |
# lua? ( dev-lang/lua:5.3 ) |
| 47 |
RDEPEND="${DEPEND}" |
| 48 |
@@ -79,6 +81,7 @@ src_compile() { |
| 49 |
# args+=( $(haproxy_use kernel_linux LINUX_TPROXY) ) |
| 50 |
|
| 51 |
args+=( $(haproxy_use ssl OPENSSL) ) |
| 52 |
+ args+=( $(haproxy_use slz SLZ) ) |
| 53 |
args+=( $(haproxy_use zlib ZLIB) ) |
| 54 |
|
| 55 |
# For now, until the strict-aliasing breakage will be fixed |
| 56 |
|
| 57 |
diff --git a/net-proxy/haproxy/haproxy-9999.ebuild b/net-proxy/haproxy/haproxy-9999.ebuild |
| 58 |
index 9499a51..4100bfa 100644 |
| 59 |
--- a/net-proxy/haproxy/haproxy-9999.ebuild |
| 60 |
+++ b/net-proxy/haproxy/haproxy-9999.ebuild |
| 61 |
@@ -15,8 +15,9 @@ EGIT_REPO_URI="http://master.formilux.org/git/people/willy/haproxy.git" |
| 62 |
LICENSE="GPL-2 LGPL-2.1" |
| 63 |
SLOT="0" |
| 64 |
KEYWORDS="" |
| 65 |
-IUSE="+crypt doc examples libressl net_ns +pcre pcre-jit ssl tools vim-syntax +zlib" # lua |
| 66 |
-REQUIRED_USE="pcre-jit? ( pcre )" |
| 67 |
+IUSE="+crypt doc examples libressl slz net_ns +pcre pcre-jit ssl tools vim-syntax +zlib" # lua |
| 68 |
+REQUIRED_USE="pcre-jit? ( pcre ) |
| 69 |
+ ?? ( slz zlib )" |
| 70 |
|
| 71 |
DEPEND=" |
| 72 |
pcre? ( |
| 73 |
@@ -27,6 +28,7 @@ DEPEND=" |
| 74 |
!libressl? ( dev-libs/openssl:0=[zlib?] ) |
| 75 |
libressl? ( dev-libs/libressl:0= ) |
| 76 |
) |
| 77 |
+ slz? ( dev-libs/libslz:= ) |
| 78 |
zlib? ( sys-libs/zlib )" |
| 79 |
# lua? ( dev-lang/lua:5.3 ) |
| 80 |
RDEPEND="${DEPEND}" |
| 81 |
@@ -79,6 +81,7 @@ src_compile() { |
| 82 |
# args+=( $(haproxy_use kernel_linux LINUX_TPROXY) ) |
| 83 |
|
| 84 |
args+=( $(haproxy_use ssl OPENSSL) ) |
| 85 |
+ args+=( $(haproxy_use slz SLZ) ) |
| 86 |
args+=( $(haproxy_use zlib ZLIB) ) |
| 87 |
|
| 88 |
# For now, until the strict-aliasing breakage will be fixed |
| 89 |
|
| 90 |
diff --git a/net-proxy/haproxy/metadata.xml b/net-proxy/haproxy/metadata.xml |
| 91 |
index 5652958..2aaccf1 100644 |
| 92 |
--- a/net-proxy/haproxy/metadata.xml |
| 93 |
+++ b/net-proxy/haproxy/metadata.xml |
| 94 |
@@ -21,6 +21,7 @@ Its event-driven architecture allows it to easily handle thousands of simultaneo |
| 95 |
<use> |
| 96 |
<flag name="net_ns">Enable network namespace support (CONFIG_NET_NS)</flag> |
| 97 |
<flag name="pcre-jit">Use JIT support for PCRE</flag> |
| 98 |
+ <flag name="slz">Use <pkg>dev-libs/libslz</pkg> compression library</flag> |
| 99 |
<flag name="tools">Install additional tools (halog, iprange)</flag> |
| 100 |
</use> |
| 101 |
</pkgmetadata> |
Archives