Gentoo Archives: gentoo-commits

From: "Robin H. Johnson" <robbat2@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/
Date: Sun, 22 Jan 2017 21:01:39
Message-Id: 1485118779.62a921118c85a9e721ebc801135ab233d656fe3b.robbat2@gentoo
1 commit: 62a921118c85a9e721ebc801135ab233d656fe3b
2 Author: Bertrand Jacquin <bertrand <AT> jacquin <DOT> bzh>
3 AuthorDate: Wed Oct 5 23:52:00 2016 +0000
4 Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
5 CommitDate: Sun Jan 22 20:59:39 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62a92111
7
8 net-proxy/haproxy: Add support for DeviceAtlas API
9
10 Fixes: https://bugs.gentoo.org/show_bug.cgi?id=564160
11 Fixes: https://github.com/gentoo/gentoo/pull/2487
12 Package-Manager: portage-2.3.0
13 (cherry picked from commit e25fbc24754115cdceb72ae450932f2ed55df8f4)
14 Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
15
16 net-proxy/haproxy/haproxy-1.6.10-r1.ebuild | 1 +
17 net-proxy/haproxy/haproxy-1.6.9999.ebuild | 1 +
18 net-proxy/haproxy/haproxy-1.7.0.ebuild | 1 +
19 net-proxy/haproxy/haproxy-1.7.9999.ebuild | 1 +
20 net-proxy/haproxy/metadata.xml | 2 +-
21 5 files changed, 5 insertions(+), 1 deletion(-)
22
23 diff --git a/net-proxy/haproxy/haproxy-1.6.10-r1.ebuild b/net-proxy/haproxy/haproxy-1.6.10-r1.ebuild
24 index df81d1e..be57715 100644
25 --- a/net-proxy/haproxy/haproxy-1.6.10-r1.ebuild
26 +++ b/net-proxy/haproxy/haproxy-1.6.10-r1.ebuild
27 @@ -23,6 +23,7 @@ LICENSE="GPL-2 LGPL-2.1"
28 SLOT="0"
29 IUSE="+crypt doc examples libressl slz net_ns +pcre pcre-jit ssl tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
30 REQUIRED_USE="pcre-jit? ( pcre )
31 + device-atlas? ( pcre )
32 ?? ( slz zlib )"
33
34 DEPEND="
35
36 diff --git a/net-proxy/haproxy/haproxy-1.6.9999.ebuild b/net-proxy/haproxy/haproxy-1.6.9999.ebuild
37 index df81d1e..be57715 100644
38 --- a/net-proxy/haproxy/haproxy-1.6.9999.ebuild
39 +++ b/net-proxy/haproxy/haproxy-1.6.9999.ebuild
40 @@ -23,6 +23,7 @@ LICENSE="GPL-2 LGPL-2.1"
41 SLOT="0"
42 IUSE="+crypt doc examples libressl slz net_ns +pcre pcre-jit ssl tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
43 REQUIRED_USE="pcre-jit? ( pcre )
44 + device-atlas? ( pcre )
45 ?? ( slz zlib )"
46
47 DEPEND="
48
49 diff --git a/net-proxy/haproxy/haproxy-1.7.0.ebuild b/net-proxy/haproxy/haproxy-1.7.0.ebuild
50 index df81d1e..be57715 100644
51 --- a/net-proxy/haproxy/haproxy-1.7.0.ebuild
52 +++ b/net-proxy/haproxy/haproxy-1.7.0.ebuild
53 @@ -23,6 +23,7 @@ LICENSE="GPL-2 LGPL-2.1"
54 SLOT="0"
55 IUSE="+crypt doc examples libressl slz net_ns +pcre pcre-jit ssl tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
56 REQUIRED_USE="pcre-jit? ( pcre )
57 + device-atlas? ( pcre )
58 ?? ( slz zlib )"
59
60 DEPEND="
61
62 diff --git a/net-proxy/haproxy/haproxy-1.7.9999.ebuild b/net-proxy/haproxy/haproxy-1.7.9999.ebuild
63 index df81d1e..be57715 100644
64 --- a/net-proxy/haproxy/haproxy-1.7.9999.ebuild
65 +++ b/net-proxy/haproxy/haproxy-1.7.9999.ebuild
66 @@ -23,6 +23,7 @@ LICENSE="GPL-2 LGPL-2.1"
67 SLOT="0"
68 IUSE="+crypt doc examples libressl slz net_ns +pcre pcre-jit ssl tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
69 REQUIRED_USE="pcre-jit? ( pcre )
70 + device-atlas? ( pcre )
71 ?? ( slz zlib )"
72
73 DEPEND="
74
75 diff --git a/net-proxy/haproxy/metadata.xml b/net-proxy/haproxy/metadata.xml
76 index fe6d5f4..ddb31ac 100644
77 --- a/net-proxy/haproxy/metadata.xml
78 +++ b/net-proxy/haproxy/metadata.xml
79 @@ -23,7 +23,7 @@ Its event-driven architecture allows it to easily handle thousands of simultaneo
80 <flag name="pcre-jit">Use JIT support for PCRE</flag>
81 <flag name="slz">Use <pkg>dev-libs/libslz</pkg> compression library</flag>
82 <flag name="tools">Install additional tools (halog, iprange)</flag>
83 - <flag name="device-atlas">Device Detection using Device Atlas</flag>
84 + <flag name="device-atlas">Use <pkg>dev-libs/device-atlas-api-c</pkg> library</flag>
85 <flag name="51degrees">Device Detection using 51 Degrees</flag>
86 <flag name="wurfl">Device Detection using WURFL</flag>
87 </use>