* cleanups, bug #108123 and 9.2.6_beta2

(Portage version: 2.0.53_rc7)

8 files changed, 15 insertions, 105 deletions

diff --git a/net-dns/bind/ChangeLog b/net-dns/bind/ChangeLog
index f2a3e36d271b..0aac9bd4993a 100644
--- a/net-dns/bind/ChangeLog
+++ b/net-dns/bind/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dns/bind
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.96 2005/11/09 09:25:52 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.97 2005/11/11 00:13:22 voxus Exp $
+
+*bind-9.3.2_beta2-r1 (11 Nov 2005)
+
+  11 Nov 2005; Konstantin Arkhipov <voxus@gentoo.org> -files/127,
+  -files/localhost, -files/named.conf-r1, -files/named.conf-r2,
+  -bind-9.3.2_beta2.ebuild, +bind-9.3.2_beta2-r1.ebuild:
+  Cleaned out unused files, bug #108123 fixed only in 9.3.2_beta2 for now.
 
 *bind-9.3.2_beta2 (09 Nov 2005)
 *bind-9.3.1-r7 (09 Nov 2005)
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index 9f02f3297dbc..b54cedc51de5 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -1,11 +1,10 @@
-MD5 08b8727a7fdd1a915968cf43028ffc67 ChangeLog 15955
+MD5 16e9e5d59be7ca5c6a91c72cc20fa910 ChangeLog 16218
 MD5 2c50194cee9e7484dc5ac78935fdf0d5 bind-9.2.5-r4.ebuild 8347
 MD5 109211a7fac00f530ce0d255763f24b2 bind-9.2.5-r6.ebuild 8376
 MD5 e1e5ea7060eedb1d883f5280b6758505 bind-9.2.5-r9.ebuild 8636
 MD5 75105df4c58ab96c51005ebc66ea71d3 bind-9.3.1-r7.ebuild 8423
-MD5 3d7609e35ca96acd75b4f3b777b9727a bind-9.3.2_beta2.ebuild 8518
+MD5 a493bdd0d88520d4e754dbaf6e7909b7 bind-9.3.2_beta2-r1.ebuild 8521
 MD5 42b5ed5adcee33cf40531d7955412b21 files/10bind.env 27
-MD5 51197afe8da37b1b453456de90ca4f25 files/127 227
 MD5 51197afe8da37b1b453456de90ca4f25 files/127.zone 227
 MD5 4346332cc9681502a3aedfd0a7a1ac41 files/bind-9.2.5-berkdb_fix.patch 537
 MD5 75d14cac80e71b4ac0662775064c06e2 files/bind-9.2.5-dlz-mysql.patch 11296
@@ -15,12 +14,11 @@ MD5 d47c8a742a2645377ba4d783907700dd files/digest-bind-9.2.5-r6 127
 MD5 d47c8a742a2645377ba4d783907700dd files/digest-bind-9.2.5-r9 127
 MD5 708e6dd2ce57583129d00b3d721bc3a4 files/digest-bind-9.3.1-r7 133
 MD5 addc10df4c379ce1a155b87c2d415e11 files/digest-bind-9.3.2_beta2 136
+MD5 addc10df4c379ce1a155b87c2d415e11 files/digest-bind-9.3.2_beta2-r1 136
 MD5 2bb12cfcd70284e72fbf9e70e5e2974d files/dyndns-samples.tbz2 22866
-MD5 ccfca63035b534556c3910270d40a4b9 files/localhost 412
 MD5 ccfca63035b534556c3910270d40a4b9 files/localhost.zone 412
+MD5 2b6e7c10f43941cdd147d5de0c9c02d6 files/localhost.zone-r1 419
 MD5 e83e7a76e253debfdd120311fda73fb6 files/named.ca 2518
-MD5 b3af799ce2505e78a14bb16868cf0593 files/named.conf-r1 758
-MD5 e9bb1e01cf0b7597e739e889499ddd7a files/named.conf-r2 768
 MD5 be5fd752bdbd59385f2a559d603098d5 files/named.conf-r3 1314
 MD5 d9bda421173f2a6e536f9b4f33ceca9a files/named.confd 319
 MD5 668f9697d07bbf60b2040ed0c835d7f3 files/named.confd-r1 392
diff --git a/net-dns/bind/bind-9.3.2_beta2.ebuild b/net-dns/bind/bind-9.3.2_beta2-r1.ebuild
index 7cba1ffdd0b3..b1d6f1de7205 100644
--- a/net-dns/bind/bind-9.3.2_beta2.ebuild
+++ b/net-dns/bind/bind-9.3.2_beta2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.3.2_beta2.ebuild,v 1.1 2005/11/09 09:25:52 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.3.2_beta2-r1.ebuild,v 1.1 2005/11/11 00:13:22 voxus Exp $
 
 inherit eutils libtool
 
@@ -173,7 +173,7 @@ src_install() {
 	insinto /etc/bind ; newins ${FILESDIR}/named.conf-r3 named.conf
 	# ftp://ftp.rs.internic.net/domain/named.ca:
 	insinto /var/bind ; doins ${FILESDIR}/named.ca
-	insinto /var/bind/pri ; doins ${FILESDIR}/{127,localhost}.zone
+	insinto /var/bind/pri ; doins ${FILESDIR}/{127,localhost-r1}.zone
 
 	cp ${FILESDIR}/named.init-r3 ${T}/named && doinitd ${T}/named
 	cp ${FILESDIR}/named.confd-r1 ${T}/named && doconfd ${T}/named
diff --git a/net-dns/bind/files/127 b/net-dns/bind/files/127
deleted file mode 100644
index eeb2af97c524..000000000000
--- a/net-dns/bind/files/127
+++ /dev/null
@@ -1,11 +0,0 @@
-$ORIGIN 127.in-addr.arpa.
-$TTL 1W
-@			1D IN SOA	localhost. root.localhost. (
-					2002081601	; serial
-					3H		; refresh
-					15M		; retry
-					1W		; expiry
-					1D )		; minimum
-
-			1D IN NS	localhost.
-*			1D IN PTR	localhost.
diff --git a/net-dns/bind/files/digest-bind-9.3.2_beta2 b/net-dns/bind/files/digest-bind-9.3.2_beta2-r1
index bf2d44cec878..bf2d44cec878 100644
--- a/net-dns/bind/files/digest-bind-9.3.2_beta2
+++ b/net-dns/bind/files/digest-bind-9.3.2_beta2-r1
diff --git a/net-dns/bind/files/localhost b/net-dns/bind/files/localhost.zone-r1
index 44dff11c69f3..aee7b92a3e56 100644
--- a/net-dns/bind/files/localhost
+++ b/net-dns/bind/files/localhost.zone-r1
@@ -5,5 +5,5 @@ $TTL 1W
                                       14400      ; Retry
                                       604800     ; Expire - 1 week
                                       86400 )    ; Minimum
-		IN      NS      ns
+		IN      NS      127.0.0.1
 localhost.	IN	A	127.0.0.1
diff --git a/net-dns/bind/files/named.conf-r1 b/net-dns/bind/files/named.conf-r1
deleted file mode 100644
index 39b53105373b..000000000000
--- a/net-dns/bind/files/named.conf-r1
+++ /dev/null
@@ -1,42 +0,0 @@
-options {
-	directory "/var/bind";
-
-	// uncomment the following lines to turn on DNS forwarding,
-	// and change the forwarding ip address(es) :
-	//forward first;
-	//forwarders {
-	//	123.123.123.123;
-	//	123.123.123.123;
-	//};
-
-	listen-on-v6 { none; };
-        listen-on { 127.0.0.1; };
-
-	// to allow only specific hosts to use the DNS server:
-	//allow-query {
-	//	127.0.0.1;
-	//};
-
-	// if you have problems and are behind a firewall:
-	//query-source address * port 53;
-	pid-file "/var/run/named/named.pid";
-};
-
-zone "." IN {
-	type hint;
-	file "named.ca";
-};
-
-zone "localhost" IN {
-	type master;
-	file "pri/localhost";
-	allow-update { none; };
-	notify no;
-};
-
-zone "127.in-addr.arpa" IN {
-	type master;
-	file "pri/127";
-	allow-update { none; };
-	notify no;
-};
diff --git a/net-dns/bind/files/named.conf-r2 b/net-dns/bind/files/named.conf-r2
deleted file mode 100644
index f9ae4cc98814..000000000000
--- a/net-dns/bind/files/named.conf-r2
+++ /dev/null
@@ -1,42 +0,0 @@
-options {
-	directory "/var/bind";
-
-	// uncomment the following lines to turn on DNS forwarding,
-	// and change the forwarding ip address(es) :
-	//forward first;
-	//forwarders {
-	//	123.123.123.123;
-	//	123.123.123.123;
-	//};
-
-	listen-on-v6 { none; };
-        listen-on { 127.0.0.1; };
-
-	// to allow only specific hosts to use the DNS server:
-	//allow-query {
-	//	127.0.0.1;
-	//};
-
-	// if you have problems and are behind a firewall:
-	//query-source address * port 53;
-	pid-file "/var/run/named/named.pid";
-};
-
-zone "." IN {
-	type hint;
-	file "named.ca";
-};
-
-zone "localhost" IN {
-	type master;
-	file "pri/localhost.zone";
-	allow-update { none; };
-	notify no;
-};
-
-zone "127.in-addr.arpa" IN {
-	type master;
-	file "pri/127.zone";
-	allow-update { none; };
-	notify no;
-};