From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-903468-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 6E683138330
for <garchives@archives.gentoo.org>; Wed, 28 Sep 2016 19:54:07 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 971B4E08F8;
Wed, 28 Sep 2016 19:54:05 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 6F738E08F8
for <gentoo-commits@lists.gentoo.org>; Wed, 28 Sep 2016 19:54:05 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 8323B340917
for <gentoo-commits@lists.gentoo.org>; Wed, 28 Sep 2016 19:54:04 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 3CFFC24A0
for <gentoo-commits@lists.gentoo.org>; Wed, 28 Sep 2016 19:54:01 +0000 (UTC)
From: "Christian Ruppert" <idl0r@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Christian Ruppert" <idl0r@gentoo.org>
Message-ID: <1475092430.4a0bcfa4da2f591eb0cadc883faafaa41ff9aa4a.idl0r@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/
X-VCS-Repository: repo/gentoo
X-VCS-Files: net-proxy/haproxy/haproxy-1.6.9.ebuild net-proxy/haproxy/haproxy-9999.ebuild net-proxy/haproxy/metadata.xml
X-VCS-Directories: net-proxy/haproxy/
X-VCS-Committer: idl0r
X-VCS-Committer-Name: Christian Ruppert
X-VCS-Revision: 4a0bcfa4da2f591eb0cadc883faafaa41ff9aa4a
X-VCS-Branch: master
Date: Wed, 28 Sep 2016 19:54:01 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 10f93cd2-3506-48c5-9d7a-377780669071
X-Archives-Hash: 2f37f699262ad5b76ec2af968f42ef58
commit: 4a0bcfa4da2f591eb0cadc883faafaa41ff9aa4a
Author: Bertrand Jacquin <bertrand <AT> jacquin <DOT> bzh>
AuthorDate: Sat Sep 17 23:51:56 2016 +0000
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Wed Sep 28 19:53:50 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a0bcfa4
net-proxy/haproxy: Introduce USE=slz
USE=zlib stay the default one in order to avoid users to have to
manually satisfy USE flag constraints since USE=zlib and USE=slz are
mutually exclusive.
Package-Manager: portage-2.2.28
Closes: https://github.com/gentoo/gentoo/pull/2293
Signed-off-by: Christian Ruppert <idl0r <AT> gentoo.org>
net-proxy/haproxy/haproxy-1.6.9.ebuild | 7 +++++--
net-proxy/haproxy/haproxy-9999.ebuild | 7 +++++--
net-proxy/haproxy/metadata.xml | 1 +
3 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/net-proxy/haproxy/haproxy-1.6.9.ebuild b/net-proxy/haproxy/haproxy-1.6.9.ebuild
index a070371..c9a98ed 100644
--- a/net-proxy/haproxy/haproxy-1.6.9.ebuild
+++ b/net-proxy/haproxy/haproxy-1.6.9.ebuild
@@ -15,8 +15,9 @@ SRC_URI="http://haproxy.1wt.eu/download/$(get_version_component_range 1-2)/src/$
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="+crypt doc examples libressl net_ns +pcre pcre-jit ssl tools vim-syntax +zlib" # lua
-REQUIRED_USE="pcre-jit? ( pcre )"
+IUSE="+crypt doc examples libressl slz net_ns +pcre pcre-jit ssl tools vim-syntax +zlib" # lua
+REQUIRED_USE="pcre-jit? ( pcre )
+ ?? ( slz zlib )"
DEPEND="
pcre? (
@@ -27,6 +28,7 @@ DEPEND="
!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 )
RDEPEND="${DEPEND}"
@@ -79,6 +81,7 @@ src_compile() {
# args+=( $(haproxy_use kernel_linux LINUX_TPROXY) )
args+=( $(haproxy_use ssl OPENSSL) )
+ args+=( $(haproxy_use slz SLZ) )
args+=( $(haproxy_use zlib ZLIB) )
# For now, until the strict-aliasing breakage will be fixed
diff --git a/net-proxy/haproxy/haproxy-9999.ebuild b/net-proxy/haproxy/haproxy-9999.ebuild
index 9499a51..4100bfa 100644
--- a/net-proxy/haproxy/haproxy-9999.ebuild
+++ b/net-proxy/haproxy/haproxy-9999.ebuild
@@ -15,8 +15,9 @@ EGIT_REPO_URI="http://master.formilux.org/git/people/willy/haproxy.git"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
KEYWORDS=""
-IUSE="+crypt doc examples libressl net_ns +pcre pcre-jit ssl tools vim-syntax +zlib" # lua
-REQUIRED_USE="pcre-jit? ( pcre )"
+IUSE="+crypt doc examples libressl slz net_ns +pcre pcre-jit ssl tools vim-syntax +zlib" # lua
+REQUIRED_USE="pcre-jit? ( pcre )
+ ?? ( slz zlib )"
DEPEND="
pcre? (
@@ -27,6 +28,7 @@ DEPEND="
!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 )
RDEPEND="${DEPEND}"
@@ -79,6 +81,7 @@ src_compile() {
# args+=( $(haproxy_use kernel_linux LINUX_TPROXY) )
args+=( $(haproxy_use ssl OPENSSL) )
+ args+=( $(haproxy_use slz SLZ) )
args+=( $(haproxy_use zlib ZLIB) )
# For now, until the strict-aliasing breakage will be fixed
diff --git a/net-proxy/haproxy/metadata.xml b/net-proxy/haproxy/metadata.xml
index 5652958..2aaccf1 100644
--- a/net-proxy/haproxy/metadata.xml
+++ b/net-proxy/haproxy/metadata.xml
@@ -21,6 +21,7 @@ Its event-driven architecture allows it to easily handle thousands of simultaneo
<use>
<flag name="net_ns">Enable network namespace support (CONFIG_NET_NS)</flag>
<flag name="pcre-jit">Use JIT support for PCRE</flag>
+ <flag name="slz">Use <pkg>dev-libs/libslz</pkg> compression library</flag>
<flag name="tools">Install additional tools (halog, iprange)</flag>
</use>
</pkgmetadata>