X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=net-dns%2Fdjbdns%2Fdjbdns-1.05-r24.ebuild;h=715edbc289450cc27bdb4a45ef6bf7e5b7e9ffd9;hb=db7a6cedf89179abe26ff77b7e976d851e92db56;hp=7527b77d5b9152bf5b206770cbf6b2ad9ee1fdeb;hpb=82e155413c34765a998832222a928336ca413516;p=mjo-overlay.git

diff --git a/net-dns/djbdns/djbdns-1.05-r24.ebuild b/net-dns/djbdns/djbdns-1.05-r24.ebuild
index 7527b77..715edbc 100644
--- a/net-dns/djbdns/djbdns-1.05-r24.ebuild
+++ b/net-dns/djbdns/djbdns-1.05-r24.ebuild
@@ -1,42 +1,39 @@
-# 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 $
-
-IUSE="doc ipv6 selinux static"
+# $Header: /var/cvsroot/gentoo-x86/net-dns/djbdns/djbdns-1.05-r24.ebuild,v 1.5 2012/03/24 09:26:18 hwoarang Exp $
 
+EAPI="2"
 inherit eutils flag-o-matic toolchain-funcs
 
 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"
+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'
-	elog 'of custom patches.'
+	elog 'Several patches have been dropped from this ebuild.'
+	elog 'Please place custom patches in,'
+	elog
+	elog '  /etc/portage/patches/net-dns/djbdns'
 	elog
 	elog 'Some of them can be found at http://tinydns.org/ or'
-	elog 'http://homepages.tesco.net/J.deBoynePollard/Softwares/djbdns/'
+	elog 'http://homepage.ntlworld.com/jonathan.deboynepollard/Softwares/djbdns/'
 	elog
 
 	epatch \
@@ -58,7 +55,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
@@ -70,16 +68,8 @@ src_unpack() {
 
 	epatch "${FILESDIR}/${PV}-errno.patch"
 
-	if [[ -n "${DJBDNS_PATCH_DIR}" && -d "${DJBDNS_PATCH_DIR}" ]]
-	then
-		echo
-		ewarn "You enabled custom patches from ${DJBDNS_PATCH_DIR}."
-		ewarn "Be warned that you won't get any support when using "
-		ewarn "this feature. You're on your own from now!"
-		echo
-		ebeep
-		cd "${S}" && epatch "${DJBDNS_PATCH_DIR}/"*
-	fi
+	cd "${S}"
+	epatch_user
 }
 
 src_compile() {
@@ -87,7 +77,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 +89,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