Remove sys-apps/apply-default-acl, I can wait for it to show up in portage.

[mjo-overlay.git] / net-dns / djbdns / djbdns-1.05-r24.ebuild

diff --git a/net-dns/djbdns/djbdns-1.05-r24.ebuild b/net-dns/djbdns/djbdns-1.05-r24.ebuild
index 0fd9cb7ebdf72a960add22f5b1824fedf4d630b7..f8f03c5b8398983e445e1a38fac6d717c72ce42e 100644 (file)
--- a/net-dns/djbdns/djbdns-1.05-r24.ebuild
+++ b/net-dns/djbdns/djbdns-1.05-r24.ebuild
@@ -1,35 +1,31 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/djbdns/djbdns-1.05-r23.ebuild,v 1.8 2011/01/29 23:36:52 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/djbdns/djbdns-1.05-r24.ebuild,v 1.6 2012/06/14 02:04:37 zmedico Exp $
 
-IUSE="doc ipv6 selinux static"
-
-inherit eutils flag-o-matic toolchain-funcs
+EAPI="2"
+inherit eutils flag-o-matic toolchain-funcs user
 
 DESCRIPTION="Excellent high-performance DNS services"
 HOMEPAGE="http://cr.yp.to/djbdns.html"
 IPV6_PATCH="test23"
 
-SRC_URI="
-       http://cr.yp.to/djbdns/${P}.tar.gz
-       ipv6? ( http://www.fefe.de/dns/${P}-${IPV6_PATCH}.diff.bz2 )
-"
+SRC_URI="http://cr.yp.to/djbdns/${P}.tar.gz
+       ipv6? ( http://www.fefe.de/dns/${P}-${IPV6_PATCH}.diff.bz2 )"
 
 SLOT="0"
 LICENSE="public-domain"
-KEYWORDS="alpha amd64 hppa ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc ipv6 selinux static"
 
-RDEPEND="
+DEPEND=""
+RDEPEND="${DEPEND}
        virtual/daemontools
        sys-apps/ucspi-tcp
        doc? ( app-doc/djbdns-man )
        selinux? ( sec-policy/selinux-djbdns )
 "
 
-src_unpack() {
-       unpack "${P}.tar.gz"
-       cd "${S}"
-
+src_prepare() {
        echo
        elog 'Several patches have been dropped from this djbdns ebuild revision.'
        elog 'Please use the DJBDNS_PATCH_DIR variable to specify a directory'
@@ -58,7 +54,8 @@ src_unpack() {
                # Fix CVE2008-4392
                epatch \
                        "${FILESDIR}/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-ipv6.patch" \
-                       "${FILESDIR}/CVE2008-4392_0002-dnscache-cache-soa-records-ipv6.patch"
+                       "${FILESDIR}/CVE2008-4392_0002-dnscache-cache-soa-records-ipv6.patch" \
+                       "${FILESDIR}/makefile-parallel.patch"
 
                cd "${S}-noipv6"
        fi
@@ -87,7 +84,8 @@ src_compile() {
        echo "$(tc-getCC) ${CFLAGS}" > conf-cc
        echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
        echo "/usr" > conf-home
-       emake -j1 || die "emake failed"
+       #emake -j1 || die "emake failed"
+       emake || die "emake failed"
 
        # If djbdns is compiled with IPv6 support, it breaks dnstrace.
        # Therefore we must compile dnstrace separately without IPv6
@@ -98,29 +96,32 @@ src_compile() {
                echo "$(tc-getCC) ${CFLAGS}" > conf-cc
                echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
                echo "/usr" > conf-home
-               emake -j1 dnstrace || die "emake failed"
+               #emake -j1 dnstrace || die "emake failed"
+               emake dnstrace || die "emake failed"
        fi
 }
 
 src_install() {
        insinto /etc
-       doins dnsroots.global
+       doins dnsroots.global || die
 
        into /usr
        dobin *-conf dnscache tinydns walldns rbldns pickdns axfrdns \
                *-get *-data *-edit dnsip dnsipq dnsname dnstxt dnsmx \
-               dnsfilter random-ip dnsqr dnsq dnstrace dnstracesort
+               dnsfilter random-ip dnsqr dnsq dnstrace dnstracesort || die
 
-       use ipv6 && dobin dnsip6 dnsip6q "${S}-noipv6/dnstrace"
+       if use ipv6; then
+               dobin dnsip6 dnsip6q "${S}-noipv6/dnstrace" || die
+       fi
 
-       dodoc CHANGES FILES README SYSDEPS TARGETS TODO VERSION
+       dodoc CHANGES FILES README SYSDEPS TARGETS TODO VERSION || die
 
-       dobin "${FILESDIR}/dnscache-setup"
-       dobin "${FILESDIR}/tinydns-setup"
-       newbin "${FILESDIR}/djbdns-setup-r17" djbdns-setup
+       dobin "${FILESDIR}/dnscache-setup" || die
+       dobin "${FILESDIR}/tinydns-setup" || die
+       dobin "${FILESDIR}/djbdns-setup" || die
 }
 
-pkg_setup() {
+pkg_preinst() {
        # The nofiles group is provided by baselayout
        enewuser dnscache -1 -1 -1 nofiles
        enewuser dnslog -1 -1 -1 nofiles