From 9eda58c87646a6ba100566dd26410032b9e009c4 Mon Sep 17 00:00:00 2001
From: Micha Glave <gentoo@migmedia.de>
Date: Wed, 16 Nov 2011 12:22:43 +0100
Subject: [PATCH] maradns-update 2.0.04

---
 net-dns/maradns/Manifest                          |  4 ++--
 ...aradns-2.0.03.ebuild => maradns-2.0.04.ebuild} | 15 +++++++++------
 2 files changed, 11 insertions(+), 8 deletions(-)
 rename net-dns/maradns/{maradns-2.0.03.ebuild => maradns-2.0.04.ebuild} (86%)

diff --git a/net-dns/maradns/Manifest b/net-dns/maradns/Manifest
index 0514b44..862934c 100644
--- a/net-dns/maradns/Manifest
+++ b/net-dns/maradns/Manifest
@@ -1,5 +1,5 @@
 AUX maradns.rc6 566 RMD160 38793b954ebdcc03fac9f4116255c52a2dc82e9f SHA1 2dc8823fa74a5d1c900275fbd13b4bcaea85aee4 SHA256 e6c3e2e1ea3b7ce164c8501bfa524cf572d42451bd56e193b3a4038ccaf73008
 AUX zoneserver.rc6 516 RMD160 b174116573ccf04ed74d93108169cd1c47258b6e SHA1 f11383b47eca3845cc5372df62aff590d4d0fe11 SHA256 2e35a8a85ab75a386b986da8bfafd3769814b1a032d10ccb3963e1ad22751b8c
-DIST maradns-2.0.03.tar.bz2 1013957 RMD160 889c52a2861ed5ec14f7be8548a4ca10b96e12a4 SHA1 147f7bd53ff14d4c94b1ca5600fc226748b0cc81 SHA256 f0ca018dfca4c5958a0bd7fa39f918dd9499b2da6c567fd9ffe4323c7d8fddcf
-EBUILD maradns-2.0.03.ebuild 2241 RMD160 0579899f0936e9a68e421bc5167ee41563015857 SHA1 dcb5588fd6f723ddc9afc54ed5656900c1dc7500 SHA256 8ab3f3872aae67f6890fe16a4c25863f3b24739ca3acc0469aee23c70d53632c
+DIST maradns-2.0.04.tar.bz2 1012201 RMD160 7c298055dced59cf3cd4f28b2085a868a0acaf88 SHA1 ab84bdd260aa9a94492bbba20099e9d88ffe39c3 SHA256 07c689566a6b0815403f32b7c11e8fa328cf8e507829b26d1ea47c1a8059a61b
+EBUILD maradns-2.0.04.ebuild 2325 RMD160 2712e50cb8801f8ff9536fbe6939553329d4ec4b SHA1 e81fc50bb9b6c5dc45024b4f19ac0087794188d6 SHA256 19f80dadb5c2392aa1bc92aeab346952b638afcdda4250b74f85f4ba5bc05f69
 MISC metadata.xml 316 RMD160 119799ab0c38870ffcc68ba65248fb0352f84dcc SHA1 4d53ecab3f4237e799ba1c44baaa097fcb86671f SHA256 34db6861bf8f606b478bff87cdaf6b0375e5aaf6a743d7039c95be653931c252
diff --git a/net-dns/maradns/maradns-2.0.03.ebuild b/net-dns/maradns/maradns-2.0.04.ebuild
similarity index 86%
rename from net-dns/maradns/maradns-2.0.03.ebuild
rename to net-dns/maradns/maradns-2.0.04.ebuild
index f8680b3..caccf24 100644
--- a/net-dns/maradns/maradns-2.0.03.ebuild
+++ b/net-dns/maradns/maradns-2.0.04.ebuild
@@ -8,7 +8,7 @@ inherit eutils toolchain-funcs
 DESCRIPTION="Proxy DNS server with permanent caching"
 HOMEPAGE="http://www.maradns.org/"
 SRC_URI="http://www.maradns.org/download/${PV%.*}/${PV}/${P}.tar.bz2"
-DEADWOOD="deadwood-3.0.03"
+DEADWOOD="deadwood-3.0.05"
 
 LICENSE="as-is"
 SLOT="0"
@@ -26,6 +26,7 @@ src_prepare() {
 		-e "s:make:\$(MAKE):g" \
 		-e "s:\$(CC):$(tc-getCC):g" \
 		build/Makefile.linux || die
+	sed -i -e "s:duende.c:duende-ng.c:g" tools/Makefile* || die
 	sed -e "/provide dns/d" "${FILESDIR}/maradns.rc6" > "${T}/maradns.rc6" || die
 	sed -e "s:maradns:Deadwood:g" "${FILESDIR}/maradns.rc6" > "${T}/deadwood.rc6" || die
 	sed -i \
@@ -38,7 +39,9 @@ src_configure() {
 
 	use ipv6 && myconf="${myconf} --ipv6"
 
-	./configure ${myconf} # || die
+	cd utf8 && make || die
+	cd ${S}
+	./configure ${myconf} || die
 }
 
 src_install() {
@@ -46,14 +49,14 @@ src_install() {
 
 	dosbin tcp/zoneserver || die
 
-	dobin tcp/getzone tcp/fetchzone tools/askmara tools/duende || die
+	dobin tcp/getzone tcp/fetchzone tools/askmara tools/askmara-tcp tools/duende \
+		tools/bind2csv2.py || die
 
 	doman doc/en/man/*.[1-9] || die
 
 	dodoc maradns.gpg.key || die
-	dodoc doc/en/{QuickStart,README,*.txt} || die
-#	dohtml doc/en/*.html || die
-#	dohtml -r doc/en/webpage || die
+	dodoc 0QuickStart || die
+	dodoc doc/en/{*.txt} || die
 	docinto examples; dodoc doc/en/examples/example_* || die
 
 	insinto /etc; newins doc/en/examples/example_mararc mararc || die