Gentoo Archives: gentoo-commits

From: "Patrick McLean (chutzpah)" <chutzpah@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-dns/dnsmasq: dnsmasq-2.75.ebuild ChangeLog dnsmasq-2.74.ebuild
Date: Thu, 30 Jul 2015 23:55:23
Message-Id: 20150730235517.56557111@oystercatcher.gentoo.org
1 chutzpah 15/07/30 23:55:17
2
3 Modified: ChangeLog
4 Added: dnsmasq-2.75.ebuild
5 Removed: dnsmasq-2.74.ebuild
6 Log:
7 Version bump, remove previous version.
8
9 (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0xE3F69979BB4B8928DA78E3D17CBF44EF)
10
11 Revision Changes Path
12 1.281 net-dns/dnsmasq/ChangeLog
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/dnsmasq/ChangeLog?rev=1.281&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/dnsmasq/ChangeLog?rev=1.281&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/dnsmasq/ChangeLog?r1=1.280&r2=1.281
17
18 Index: ChangeLog
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v
21 retrieving revision 1.280
22 retrieving revision 1.281
23 diff -u -r1.280 -r1.281
24 --- ChangeLog 28 Jul 2015 23:06:39 -0000 1.280
25 +++ ChangeLog 30 Jul 2015 23:55:17 -0000 1.281
26 @@ -1,6 +1,12 @@
27 # ChangeLog for net-dns/dnsmasq
28 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
29 -# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.280 2015/07/28 23:06:39 chutzpah Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.281 2015/07/30 23:55:17 chutzpah Exp $
31 +
32 +*dnsmasq-2.75 (30 Jul 2015)
33 +
34 + 30 Jul 2015; Patrick McLean <chutzpah@g.o> +dnsmasq-2.75.ebuild,
35 + -dnsmasq-2.74.ebuild:
36 + Version bump, remove previous version.
37
38 *dnsmasq-2.74 (28 Jul 2015)
39
40
41
42
43 1.1 net-dns/dnsmasq/dnsmasq-2.75.ebuild
44
45 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.75.ebuild?rev=1.1&view=markup
46 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.75.ebuild?rev=1.1&content-type=text/plain
47
48 Index: dnsmasq-2.75.ebuild
49 ===================================================================
50 # Copyright 1999-2015 Gentoo Foundation
51 # Distributed under the terms of the GNU General Public License v2
52 # $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.75.ebuild,v 1.1 2015/07/30 23:55:17 chutzpah Exp $
53
54 EAPI=5
55
56 inherit eutils toolchain-funcs flag-o-matic user systemd
57
58 DESCRIPTION="Small forwarding DNS server"
59 HOMEPAGE="http://www.thekelleys.org.uk/dnsmasq/doc.html"
60 SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${P}.tar.xz"
61
62 LICENSE="|| ( GPL-2 GPL-3 )"
63 SLOT="0"
64 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
65 IUSE="auth-dns conntrack dbus +dhcp dhcp-tools dnssec idn +inotify ipv6 lua nls script selinux static tftp"
66 DM_LINGUAS="de es fi fr id it no pl pt_BR ro"
67 for dm_lingua in ${DM_LINGUAS}; do
68 IUSE+=" linguas_${dm_lingua}"
69 done
70
71 CDEPEND="dbus? ( sys-apps/dbus )
72 idn? ( net-dns/libidn )
73 lua? (
74 || (
75 dev-lang/lua:0
76 dev-lang/lua:5.1
77 )
78 )
79 conntrack? ( net-libs/libnetfilter_conntrack )
80 nls? (
81 sys-devel/gettext
82 net-dns/libidn
83 )
84 "
85
86 DEPEND="${CDEPEND}
87 app-arch/xz-utils
88 dnssec? (
89 dev-libs/nettle[gmp]
90 static? (
91 dev-libs/nettle[static-libs(+)]
92 )
93 )
94 virtual/pkgconfig"
95
96 RDEPEND="${CDEPEND}
97 dnssec? (
98 !static? (
99 dev-libs/nettle[gmp]
100 )
101 )
102 selinux? ( sec-policy/selinux-dnsmasq )
103 "
104
105 REQUIRED_USE="dhcp-tools? ( dhcp )
106 lua? ( script )"
107
108 use_have() {
109 local useflag no_only uword
110 if [[ $1 == '-n' ]]; then
111 no_only=1
112 shift
113 fi
114 useflag="${1}"
115 shift
116
117 uword="${1:-${useflag}}"
118 shift
119
120 while [[ ${uword} ]]; do
121 uword=${uword^^*}
122
123 if ! use "${useflag}"; then
124 echo -n " -DNO_${uword}"
125 elif [[ -z "${no_only}" ]]; then
126 echo -n " -DHAVE_${uword}"
127 fi
128 uword="${1}"
129 shift
130 done
131 }
132
133 pkg_pretend() {
134 if use static; then
135 einfo "Only sys-libs/gmp and dev-libs/nettle are statically linked."
136 use dnssec || einfo "Thus, ${P}[!dnssec,static] makes no sense; the static USE flag is ignored."
137 fi
138 }
139
140 pkg_setup() {
141 enewgroup dnsmasq
142 enewuser dnsmasq -1 -1 /dev/null dnsmasq
143 }
144
145 src_prepare() {
146 sed -i -r 's:lua5.[0-9]+:lua:' Makefile
147 sed -i "s:%%PREFIX%%:${EPREFIX}/usr:" dnsmasq.conf.example
148 }
149
150 src_configure() {
151 COPTS="$(use_have -n auth-dns auth)"
152 COPTS+="$(use_have conntrack)"
153 COPTS+="$(use_have dbus)"
154 COPTS+="$(use_have idn)"
155 COPTS+="$(use_have -n inotify)"
156 COPTS+="$(use_have -n dhcp dhcp dhcp6)"
157 COPTS+="$(use_have -n ipv6 ipv6 dhcp6)"
158 COPTS+="$(use_have lua luascript)"
159 COPTS+="$(use_have -n script)"
160 COPTS+="$(use_have -n tftp)"
161 COPTS+="$(use_have dnssec)"
162 COPTS+="$(use_have static dnssec_static)"
163 }
164
165 src_compile() {
166 emake \
167 PREFIX=/usr \
168 MANDIR=/usr/share/man \
169 CC="$(tc-getCC)" \
170 CFLAGS="${CFLAGS}" \
171 LDFLAGS="${LDFLAGS}" \
172 COPTS="${COPTS}" \
173 CONFFILE="/etc/${PN}.conf" \
174 all$(use nls && echo "-i18n")
175
176 use dhcp-tools && emake -C contrib/wrt \
177 PREFIX=/usr \
178 MANDIR=/usr/share/man \
179 CC="$(tc-getCC)" \
180 CFLAGS="${CFLAGS}" \
181 LDFLAGS="${LDFLAGS}" \
182 all
183 }
184
185 src_install() {
186 local lingua puid
187 emake \
188 PREFIX=/usr \
189 MANDIR=/usr/share/man \
190 COPTS="${COPTS}" \
191 DESTDIR="${D}" \
192 install$(use nls && echo "-i18n")
193
194 for lingua in ${DM_LINGUAS}; do
195 use linguas_${lingua} || rm -rf "${D}"/usr/share/locale/${lingua}
196 done
197 [[ -d "${D}"/usr/share/locale/ ]] && rmdir --ignore-fail-on-non-empty "${D}"/usr/share/locale/
198
199 dodoc CHANGELOG CHANGELOG.archive FAQ dnsmasq.conf.example
200 dodoc -r logo
201
202 dodoc CHANGELOG FAQ
203 dohtml *.html
204
205 newinitd "${FILESDIR}"/dnsmasq-init-r2 ${PN}
206 newconfd "${FILESDIR}"/dnsmasq.confd-r1 ${PN}
207
208 insinto /etc
209 newins dnsmasq.conf.example dnsmasq.conf
210
211 insinto /usr/share/dnsmasq
212 doins trust-anchors.conf
213
214 if use dhcp; then
215 dodir /var/lib/misc
216 newinitd "${FILESDIR}"/dnsmasq-init-dhcp-r1 ${PN}
217 fi
218 if use dbus; then
219 insinto /etc/dbus-1/system.d
220 doins dbus/dnsmasq.conf
221 fi
222
223 if use dhcp-tools; then
224 dosbin contrib/wrt/{dhcp_release,dhcp_lease_time}
225 doman contrib/wrt/{dhcp_release,dhcp_lease_time}.1
226 fi
227
228 systemd_newunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service
229
230 }
231
232 pkg_preinst() {
233 # temporary workaround to (hopefully) prevent leases file from being removed
234 [[ -f /var/lib/misc/dnsmasq.leases ]] && cp /var/lib/misc/dnsmasq.leases "${T}"
235 }
236
237 pkg_postinst() {
238 # temporary workaround to (hopefully) prevent leases file from being removed
239 [[ -f "${T}"/dnsmasq.leases ]] && cp "${T}"/dnsmasq.leases /var/lib/misc/dnsmasq.leases
240 }