From: Bertrand Jacquin <bertrand@jacquin.bzh>
Date: Wed, 5 Oct 2016 23:52:00 +0000 (+0100)
Subject: net-proxy/haproxy: Add support for DeviceAtlas API
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=62a921118c85a9e721ebc801135ab233d656fe3b;p=gentoo.git

net-proxy/haproxy: Add support for DeviceAtlas API

Fixes: https://bugs.gentoo.org/show_bug.cgi?id=564160
Fixes: https://github.com/gentoo/gentoo/pull/2487
Package-Manager: portage-2.3.0
(cherry picked from commit e25fbc24754115cdceb72ae450932f2ed55df8f4)
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
---

diff --git a/net-proxy/haproxy/haproxy-1.6.10-r1.ebuild b/net-proxy/haproxy/haproxy-1.6.10-r1.ebuild
index df81d1e500a9..be577151a050 100644
--- a/net-proxy/haproxy/haproxy-1.6.10-r1.ebuild
+++ b/net-proxy/haproxy/haproxy-1.6.10-r1.ebuild
@@ -23,6 +23,7 @@ LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 IUSE="+crypt doc examples libressl slz net_ns +pcre pcre-jit ssl tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
 REQUIRED_USE="pcre-jit? ( pcre )
+	device-atlas? ( pcre )
 	?? ( slz zlib )"
 
 DEPEND="
diff --git a/net-proxy/haproxy/haproxy-1.6.9999.ebuild b/net-proxy/haproxy/haproxy-1.6.9999.ebuild
index df81d1e500a9..be577151a050 100644
--- a/net-proxy/haproxy/haproxy-1.6.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-1.6.9999.ebuild
@@ -23,6 +23,7 @@ LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 IUSE="+crypt doc examples libressl slz net_ns +pcre pcre-jit ssl tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
 REQUIRED_USE="pcre-jit? ( pcre )
+	device-atlas? ( pcre )
 	?? ( slz zlib )"
 
 DEPEND="
diff --git a/net-proxy/haproxy/haproxy-1.7.0.ebuild b/net-proxy/haproxy/haproxy-1.7.0.ebuild
index df81d1e500a9..be577151a050 100644
--- a/net-proxy/haproxy/haproxy-1.7.0.ebuild
+++ b/net-proxy/haproxy/haproxy-1.7.0.ebuild
@@ -23,6 +23,7 @@ LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 IUSE="+crypt doc examples libressl slz net_ns +pcre pcre-jit ssl tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
 REQUIRED_USE="pcre-jit? ( pcre )
+	device-atlas? ( pcre )
 	?? ( slz zlib )"
 
 DEPEND="
diff --git a/net-proxy/haproxy/haproxy-1.7.9999.ebuild b/net-proxy/haproxy/haproxy-1.7.9999.ebuild
index df81d1e500a9..be577151a050 100644
--- a/net-proxy/haproxy/haproxy-1.7.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-1.7.9999.ebuild
@@ -23,6 +23,7 @@ LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 IUSE="+crypt doc examples libressl slz net_ns +pcre pcre-jit ssl tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
 REQUIRED_USE="pcre-jit? ( pcre )
+	device-atlas? ( pcre )
 	?? ( slz zlib )"
 
 DEPEND="
diff --git a/net-proxy/haproxy/metadata.xml b/net-proxy/haproxy/metadata.xml
index fe6d5f4f39e8..ddb31ac2bb8b 100644
--- a/net-proxy/haproxy/metadata.xml
+++ b/net-proxy/haproxy/metadata.xml
@@ -23,7 +23,7 @@ Its event-driven architecture allows it to easily handle thousands of simultaneo
 		<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>
-		<flag name="device-atlas">Device Detection using Device Atlas</flag>
+		<flag name="device-atlas">Use <pkg>dev-libs/device-atlas-api-c</pkg> library</flag>
 		<flag name="51degrees">Device Detection using 51 Degrees</flag>
 		<flag name="wurfl">Device Detection using WURFL</flag>
 	</use>