X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=net-dns%2Fdjbdns%2Fdjbdns-1.05-r23.ebuild;h=a31db43cef9b33c0b5f74185b103068a05f93e43;hb=db7a6cedf89179abe26ff77b7e976d851e92db56;hp=a62772886f848e8784419f115f55d9ad8cfc60d1;hpb=13b41adeee20302f3b9a156cd5edd49403b90f11;p=mjo-overlay.git

diff --git a/net-dns/djbdns/djbdns-1.05-r23.ebuild b/net-dns/djbdns/djbdns-1.05-r23.ebuild
index a627728..a31db43 100644
--- a/net-dns/djbdns/djbdns-1.05-r23.ebuild
+++ b/net-dns/djbdns/djbdns-1.05-r23.ebuild
@@ -1,6 +1,6 @@
-# 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-r23.ebuild,v 1.9 2012/03/24 09:26:18 hwoarang Exp $
 
 IUSE="doc ipv6 selinux static"
 
@@ -31,12 +31,13 @@ src_unpack() {
 	cd "${S}"
 
 	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 \
@@ -49,7 +50,7 @@ src_unpack() {
 
 	if use ipv6; then
 		elog "At present dnstrace does NOT support IPv6. It will"\
-		     "be compiled without IPv6 support."
+			 "be compiled without IPv6 support."
 		cp -pR "${S}" "${S}-noipv6"
 		# Careful -- >=test21 of the IPv6 patch includes the errno patch
 		epatch "${DISTDIR}/${P}-${IPV6_PATCH}.diff.bz2"
@@ -69,16 +70,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() {
@@ -114,9 +107,9 @@ src_install() {
 
 	dodoc CHANGES FILES README SYSDEPS TARGETS TODO VERSION
 
-	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() {