Gentoo Archives: gentoo-commits

From: Christian Ruppert <idl0r@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-dns/bind/
Date: Mon, 28 May 2018 07:03:54
Message-Id: 1527491019.b64d3f26fad2d6d1597920dde1d4339b3dfd5353.idl0r@gentoo
1 commit: b64d3f26fad2d6d1597920dde1d4339b3dfd5353
2 Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
3 AuthorDate: Mon May 28 07:03:22 2018 +0000
4 Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
5 CommitDate: Mon May 28 07:03:39 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b64d3f26
7
8 net-dns/bind: Fix no more existent nslint causing build errors, bug 654206
9
10 Package-Manager: Portage-2.3.37, Repoman-2.3.9
11 RepoMan-Options: --force
12
13 net-dns/bind/bind-9.12.1_p2.ebuild | 28 +---------------------------
14 1 file changed, 1 insertion(+), 27 deletions(-)
15
16 diff --git a/net-dns/bind/bind-9.12.1_p2.ebuild b/net-dns/bind/bind-9.12.1_p2.ebuild
17 index c4deb022483..a8a7a130b53 100644
18 --- a/net-dns/bind/bind-9.12.1_p2.ebuild
19 +++ b/net-dns/bind/bind-9.12.1_p2.ebuild
20 @@ -24,8 +24,6 @@ SDB_LDAP_VER="1.1.0-fc14"
21
22 RRL_PV="${MY_PV}"
23
24 -NSLINT_DIR="contrib/nslint-3.0a2/"
25 -
26 # SDB-LDAP: http://bind9-ldap.bayour.com/
27
28 DESCRIPTION="BIND - Berkeley Internet Name Domain - Name Server"
29 @@ -41,7 +39,7 @@ SLOT="0"
30 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
31 # -berkdb by default re bug 602682
32 IUSE="-berkdb +caps dlz dnstap doc dnsrps fixed-rrset geoip gost gssapi idn ipv6
33 -json ldap libressl lmdb mysql nslint odbc postgres python rpz seccomp selinux ssl static-libs
34 +json ldap libressl lmdb mysql odbc postgres python rpz seccomp selinux ssl static-libs
35 +threads urandom xml +zlib"
36 # sdb-ldap - patch broken
37 # no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
38 @@ -127,10 +125,6 @@ src_prepare() {
39 # Disable tests for now, bug 406399
40 sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die
41
42 - if use nslint; then
43 - sed -i -e 's:/etc/named.conf:/etc/bind/named.conf:' ${NSLINT_DIR}/nslint.{c,8} || die
44 - fi
45 -
46 # bug #220361
47 rm aclocal.m4
48 rm -rf libtool.m4/
49 @@ -193,31 +187,11 @@ src_configure() {
50
51 # bug #151839
52 echo '#undef SO_BSDCOMPAT' >> config.h
53 -
54 - if use nslint; then
55 - cd $NSLINT_DIR
56 - econf
57 - fi
58 -}
59 -
60 -src_compile() {
61 - emake
62 -
63 - if use nslint; then
64 - emake -C $NSLINT_DIR CCOPT="${CFLAGS}"
65 - fi
66 }
67
68 src_install() {
69 emake DESTDIR="${D}" install
70
71 - if use nslint; then
72 - cd $NSLINT_DIR
73 - dobin nslint
74 - doman nslint.8
75 - cd "${S}"
76 - fi
77 -
78 dodoc CHANGES README
79
80 if use idn; then