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-dns/bind/
Date: Wed, 30 Sep 2020 21:49:27
Message-Id: 1601502558.5b9f3e48eadc54ce3d63f3b147616d6442cf1cd0.robbat2@gentoo
1 commit: 5b9f3e48eadc54ce3d63f3b147616d6442cf1cd0
2 Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
3 AuthorDate: Wed Sep 30 21:48:51 2020 +0000
4 Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 30 21:49:18 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b9f3e48
7
8 net-dns/bind: compile-fix for GeoIP builds
9
10 Closes: https://bugs.gentoo.org/745759
11 Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
12
13 net-dns/bind/bind-9.16.6-r3.ebuild | 9 ++++++---
14 1 file changed, 6 insertions(+), 3 deletions(-)
15
16 diff --git a/net-dns/bind/bind-9.16.6-r3.ebuild b/net-dns/bind/bind-9.16.6-r3.ebuild
17 index ff2089ac70a..d23c253ecf1 100644
18 --- a/net-dns/bind/bind-9.16.6-r3.ebuild
19 +++ b/net-dns/bind/bind-9.16.6-r3.ebuild
20 @@ -152,11 +152,14 @@ bind_configure() {
21 # This is for users to start to migrate back to USE=geoip, rather than
22 # USE=geoip2
23 if use geoip ; then
24 - myeconfargs+=( $(use_with geoip maxminddb) )
25 + myeconfargs+=( $(use_with geoip maxminddb) --enable-geoip )
26 elif use geoip2 ; then
27 - myeconfargs+=( $(use_with geoip2 maxminddb) )
28 + # Added 2020/09/30
29 + # Remove USE=geoip2 support after 2020/03/01
30 + ewarn "USE=geoip2 is deprecated; update your USE flags!"
31 + myeconfargs+=( $(use_with geoip2 maxminddb) --enable-geoip )
32 else
33 - myeconfargs+=( --without-maxminddb )
34 + myeconfargs+=( --without-maxminddb --disable-geoip )
35 fi
36
37 # bug #158664