chutzpah    14/04/24 18:18:22

  Modified:             ChangeLog
  Added:                dnsmasq-2.70.ebuild
  Removed:              dnsmasq-2.69.ebuild
  Log:
  Version bump, remove buggy older version.
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 
0xE3F69979BB4B8928DA78E3D17CBF44EF)

Revision  Changes    Path
1.250                net-dns/dnsmasq/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/dnsmasq/ChangeLog?rev=1.250&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/dnsmasq/ChangeLog?rev=1.250&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/dnsmasq/ChangeLog?r1=1.249&r2=1.250

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v
retrieving revision 1.249
retrieving revision 1.250
diff -u -r1.249 -r1.250
--- ChangeLog   10 Apr 2014 18:05:22 -0000      1.249
+++ ChangeLog   24 Apr 2014 18:18:22 -0000      1.250
@@ -1,6 +1,12 @@
 # ChangeLog for net-dns/dnsmasq
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.249 
2014/04/10 18:05:22 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.250 
2014/04/24 18:18:22 chutzpah Exp $
+
+*dnsmasq-2.70 (24 Apr 2014)
+
+  24 Apr 2014; Patrick McLean <chutz...@gentoo.org> -dnsmasq-2.69.ebuild,
+  +dnsmasq-2.70.ebuild:
+  Version bump, remove buggy older version.
 
 *dnsmasq-2.69 (10 Apr 2014)
 



1.1                  net-dns/dnsmasq/dnsmasq-2.70.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.70.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.70.ebuild?rev=1.1&content-type=text/plain

Index: dnsmasq-2.70.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.70.ebuild,v 1.1 
2014/04/24 18:18:22 chutzpah Exp $

EAPI=5

inherit eutils toolchain-funcs flag-o-matic user systemd

DESCRIPTION="Small forwarding DNS server"
HOMEPAGE="http://www.thekelleys.org.uk/dnsmasq/";
SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${P}.tar.xz";

LICENSE="|| ( GPL-2 GPL-3 )"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc 
~x86 ~sparc-fbsd ~x86-fbsd"
IUSE="auth-dns conntrack dbus +dhcp dhcp-tools dnssec idn ipv6 lua nls script 
selinux static tftp"
DM_LINGUAS="de es fi fr id it no pl pt_BR ro"
for dm_lingua in ${DM_LINGUAS}; do
        IUSE+=" linguas_${dm_lingua}"
done

CDEPEND="dbus? ( sys-apps/dbus )
                idn? ( net-dns/libidn )
                lua? ( dev-lang/lua )
                conntrack? ( !s390? ( net-libs/libnetfilter_conntrack ) )
                nls? (
                        sys-devel/gettext
                        net-dns/libidn
                )
                selinux? ( sec-policy/selinux-dnsmasq )"

DEPEND="${CDEPEND}
                app-arch/xz-utils
                dnssec? (
                        dev-libs/nettle[gmp]
                        static? (
                                dev-libs/nettle[static-libs(+)]
                        )
                )
                virtual/pkgconfig"

RDEPEND="${CDEPEND}
                dnssec? (
                        !static? (
                                dev-libs/nettle[gmp]
                        )
                )"

REQUIRED_USE="dhcp-tools? ( dhcp )
                          lua? ( script )
                          s390? ( !conntrack )"

use_have() {
        local NO_ONLY=""
        if [ $1 == '-n' ]; then
                NO_ONLY=1
                shift
        fi

        local UWORD=${2:-$1}
        UWORD=${UWORD^^*}

        if ! use ${1}; then
                echo " -DNO_${UWORD}"
        elif [ -z "${NO_ONLY}" ]; then
                echo " -DHAVE_${UWORD}"
        fi
}

pkg_pretend() {
        if use static; then
                einfo "Only sys-libs/gmp and dev-libs/nettle are statically 
linked."
                use dnssec || einfo "Thus, ${P}[!dnssec,static] makes no sense; 
the static USE flag is ignored."
        fi
}

pkg_setup() {
        enewgroup dnsmasq
        enewuser dnsmasq -1 -1 /dev/null dnsmasq
}

src_prepare() {
        sed -i -r 's:lua5.[0-9]+:lua:' Makefile
        sed -i "s:%%PREFIX%%:${EPREFIX}/usr:" dnsmasq.conf.example
}

src_configure() {
        COPTS="$(use_have -n auth-dns auth)"
        COPTS+="$(use_have conntrack)"
        COPTS+="$(use_have dbus)"
        COPTS+="$(use_have -n dhcp)"
        COPTS+="$(use_have idn)"
        COPTS+="$(use_have -n ipv6)"
        COPTS+="$(use_have lua luascript)"
        COPTS+="$(use_have -n script)"
        COPTS+="$(use_have -n tftp)"
        COPTS+="$(use ipv6 && use dhcp || echo " -DNO_DHCP6")"
        COPTS+="$(use_have dnssec)"
        COPTS+="$(use_have static dnssec_static)"
}

src_compile() {
        emake \
                PREFIX=/usr \
                CC="$(tc-getCC)" \
                CFLAGS="${CFLAGS}" \
                LDFLAGS="${LDFLAGS}" \
                COPTS="${COPTS}" \
                CONFFILE="/etc/${PN}.conf" \
                all$(use nls && echo "-i18n")

        use dhcp-tools && emake -C contrib/wrt \
                PREFIX=/usr \
                CC="$(tc-getCC)" \
                CFLAGS="${CFLAGS}" \
                LDFLAGS="${LDFLAGS}" \
                all
}

src_install() {
        emake \
                PREFIX=/usr \
                MANDIR=/usr/share/man \
                DESTDIR="${D}" \
                install$(use nls && echo "-i18n")

        local lingua
        for lingua in ${DM_LINGUAS}; do
                use linguas_${lingua} || rm -rf 
"${D}"/usr/share/locale/${lingua}
        done
        [[ -d "${D}"/usr/share/locale/ ]] && rmdir --ignore-fail-on-non-empty 
"${D}"/usr/share/locale/

        dodoc CHANGELOG CHANGELOG.archive FAQ
        dodoc -r logo

        dodoc CHANGELOG FAQ
        dohtml *.html

        newinitd "${FILESDIR}"/dnsmasq-init-r2 dnsmasq
        newconfd "${FILESDIR}"/dnsmasq.confd-r1 dnsmasq

        insinto /etc
        newins dnsmasq.conf.example dnsmasq.conf

        insinto /usr/share/dnsmasq
        doins trust-anchors.conf

        if use dbus; then
                insinto /etc/dbus-1/system.d
                doins dbus/dnsmasq.conf
        fi

        if use dhcp-tools; then
                dosbin contrib/wrt/{dhcp_release,dhcp_lease_time}
                doman contrib/wrt/{dhcp_release,dhcp_lease_time}.1
        fi

        systemd_newunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service
}




Reply via email to